From: "Han-Wen Nienhuys via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Han-Wen Nienhuys <hanwenn@gmail.com>
Subject: [PATCH v2 0/4] Preliminary fixes for reftable support
Date: Fri, 10 Jul 2020 17:19:49 +0000 [thread overview]
Message-ID: <pull.669.v2.git.1594401593.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.669.git.1593518738.gitgitgadget@gmail.com>
These are assorted small fixes split out from the reftable topic.
Han-Wen Nienhuys (3):
lib-t6000.sh: write tag using git-update-ref
t3432: use git-reflog to inspect the reflog for HEAD
Treat BISECT_HEAD as a pseudo ref
Junio C Hamano (1):
Cleanse reflog messages in the refs.c layer
builtin/bisect--helper.c | 3 +-
git-bisect.sh | 4 +--
refs.c | 50 ++++++++++++++++++++++++++++------
refs/files-backend.c | 2 +-
refs/refs-internal.h | 6 ----
t/lib-t6000.sh | 5 ++--
t/t3432-rebase-fast-forward.sh | 7 +++--
7 files changed, 51 insertions(+), 26 deletions(-)
base-commit: bd42bbe1a46c0fe486fc33e82969275e27e4dc19
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-669%2Fhanwen%2Fpreliminaries-v2
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-669/hanwen/preliminaries-v2
Pull-Request: https://github.com/gitgitgadget/git/pull/669
Range-diff vs v1:
1: b7b2ad8e79 = 1: 0f244ed6cb lib-t6000.sh: write tag using git-update-ref
2: f238d1d7f8 ! 2: 123d246edf t3432: use git-reflog to inspect the reflog for HEAD
@@ t/t3432-rebase-fast-forward.sh: test_rebase_same_head_ () {
oldhead=\$(git rev-parse HEAD) &&
test_when_finished 'git reset --hard \$oldhead' &&
- cp .git/logs/HEAD expect &&
-+ git reflog HEAD > expect &&
++ git reflog HEAD >expect &&
git rebase$flag $* >stdout &&
-+ git reflog HEAD > actual &&
++ git reflog HEAD >actual &&
if test $what = work
then
old=\$(wc -l <expect) &&
3: 8a62cc2668 < -: ---------- checkout: add '\n' to reflog message
4: 2b7eb58c15 = 3: d4007c2a5b Treat BISECT_HEAD as a pseudo ref
-: ---------- > 4: 6ca5b99c8d Cleanse reflog messages in the refs.c layer
--
gitgitgadget
next prev parent reply other threads:[~2020-07-10 17:19 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-30 12:05 [PATCH 0/4] Preliminary fixes for reftable support Han-Wen Nienhuys via GitGitGadget
2020-06-30 12:05 ` [PATCH 1/4] lib-t6000.sh: write tag using git-update-ref Han-Wen Nienhuys via GitGitGadget
2020-06-30 12:05 ` [PATCH 2/4] t3432: use git-reflog to inspect the reflog for HEAD Han-Wen Nienhuys via GitGitGadget
2020-06-30 12:05 ` [PATCH 3/4] checkout: add '\n' to reflog message Han-Wen Nienhuys via GitGitGadget
2020-06-30 12:05 ` [PATCH 4/4] Treat BISECT_HEAD as a pseudo ref Han-Wen Nienhuys via GitGitGadget
2020-07-07 4:40 ` [PATCH 0/4] Preliminary fixes for reftable support Junio C Hamano
2020-07-10 17:19 ` Han-Wen Nienhuys via GitGitGadget [this message]
2020-07-10 17:19 ` [PATCH v2 1/4] lib-t6000.sh: write tag using git-update-ref Han-Wen Nienhuys via GitGitGadget
2020-07-10 17:19 ` [PATCH v2 2/4] t3432: use git-reflog to inspect the reflog for HEAD Han-Wen Nienhuys via GitGitGadget
2020-07-10 17:19 ` [PATCH v2 3/4] Treat BISECT_HEAD as a pseudo ref Han-Wen Nienhuys via GitGitGadget
2020-07-10 17:19 ` [PATCH v2 4/4] Cleanse reflog messages in the refs.c layer Junio C Hamano via GitGitGadget
2020-07-10 21:06 ` Junio C Hamano
2020-07-10 20:57 ` [PATCH v2 0/4] Preliminary fixes for reftable support Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=pull.669.v2.git.1594401593.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=git@vger.kernel.org \
--cc=hanwenn@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.