diff options
author | Junio C Hamano <gitster@pobox.com> | 2021-10-06 13:40:11 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2021-10-06 13:40:11 -0700 |
commit | 7cebe73dbd34f68b4c97b43f3d338031fd5e3831 (patch) | |
tree | bb05054c2427926b95b82bf79d4b1bf26efaf20e /trace.h | |
parent | Merge branch 'jt/add-submodule-odb-clean-up' (diff) | |
parent | rebase: dereference tags (diff) | |
download | tgif-7cebe73dbd34f68b4c97b43f3d338031fd5e3831.tar.xz |
Merge branch 'pw/rebase-of-a-tag-fix'
"git rebase <upstream> <tag>" failed when aborted in the middle, as
it mistakenly tried to write the tag object instead of peeling it
to HEAD.
* pw/rebase-of-a-tag-fix:
rebase: dereference tags
rebase: use lookup_commit_reference_by_name()
rebase: use our standard error return value
t3407: rework rebase --quit tests
t3407: strengthen rebase --abort tests
t3407: use test_path_is_missing
t3407: rename a variable
t3407: use test_cmp_rev
t3407: use test_commit
t3407: run tests in $TEST_DIRECTORY
Diffstat (limited to 'trace.h')
0 files changed, 0 insertions, 0 deletions