| Message ID | pull.669.v2.git.1594401593.gitgitgadget@gmail.com (mailing list archive) |
|---|---|
| Headers | show |
| Series | Preliminary fixes for reftable support | expand |
"Han-Wen Nienhuys via GitGitGadget" <gitgitgadget@gmail.com> writes: > These are assorted small fixes split out from the reftable topic. Will replace. I'll retitle the 3/4 and 4/4 to bisect: treat BISECT_HEAD as a pseudo ref reflgo: cleanse messages in the refs.c layer while queuing. Thanks. > 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
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