From 729ec9e23a13a0610a19a24901d0ab5e2bc44a12 Mon Sep 17 00:00:00 2001 From: Martin von Zweigbergk Date: Sun, 21 Nov 2010 12:11:21 +0100 Subject: rebase --abort: do not update branch ref If a non-interactive rebase of a ref fails at commit X and is aborted by the user, the ref will be updated twice. First to point at X (with the reflog message "rebase finished: $head_name onto $onto"), and then back to $orig_head. It should not be updated at all. Signed-off-by: Martin von Zweigbergk Signed-off-by: Junio C Hamano --- t/t3407-rebase-abort.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 't/t3407-rebase-abort.sh') diff --git a/t/t3407-rebase-abort.sh b/t/t3407-rebase-abort.sh index fbb3f2e0df..e573dc845b 100755 --- a/t/t3407-rebase-abort.sh +++ b/t/t3407-rebase-abort.sh @@ -72,6 +72,18 @@ testrebase() { test $(git rev-parse to-rebase) = $(git rev-parse pre-rebase) && test ! -d "$dotest" ' + + test_expect_success "rebase$type --abort does not update reflog" ' + cd "$work_dir" && + # Clean up the state from the previous one + git reset --hard pre-rebase && + git reflog show to-rebase > reflog_before && + test_must_fail git rebase$type master && + git rebase --abort && + git reflog show to-rebase > reflog_after && + test_cmp reflog_before reflog_after && + rm reflog_before reflog_after + ' } testrebase "" .git/rebase-apply -- cgit v1.2.1