[PATCH 00/11] rebase: dereference tags
- From
- Phillip Wood via GitGitGadget <gitgitgadget@gmail.com>
- Date
- Sep 8, 2021, 09:49 UTC
- Message-ID
- <pull.1033.git.1631094563.gitgitgadget@gmail.com>
Aborting a rebase stated with git rebase <upstream> <tag-object> should checkout the commit pointed to by . Instead it gives
error: update_ref failed for ref 'HEAD': cannot update ref 'HEAD': trying to write non-commit object 710d743b2b9892457fdcc3970f397e6ec07447e0 to branch 'HEAD'
The fix for that is in the last patch, the rest of the patches are cleanups to t3407 and builtin/rebase.c
Phillip Wood (11): t3407: run tests in $TEST_DIRECTORY t3407: use test_commit t3407: use test_cmp_rev t3407: rename a variable t3407: use test_path_is_missing t3407: strengthen rebase --abort tests t3407: rework rebase --quit tests rebase: remove redundant strbuf rebase: use our standard error return value rebase: use lookup_commit_reference_by_name() rebase: dereference tags
builtin/rebase.c | 67 ++++++++++++------------- t/t3407-rebase-abort.sh | 105 ++++++++++++++++++---------------------- 2 files changed, 76 insertions(+), 96 deletions(-)
base-commit: 225bc32a989d7a22fa6addafd4ce7dcd04675dbf Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1033%2Fphillipwood%2Fwip%2Frebase-handle-tags-v1 Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1033/phillipwood/wip/rebase-handle-tags-v1 Pull-Request: https://github.com/gitgitgadget/git/pull/1033
-- gitgitgadget