X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft3407-rebase-abort.sh;h=e573dc845b3d72004b2a96f344528c68977c52e1;hb=28368e9f0bced688e4baf3b02b1bfcb6580909c4;hp=fbb3f2e0dfcf1a0673dbd2022a4ed843990fce52;hpb=7bdaf0bd1cffde9b3d14762f67f22991e8e17ef6;p=git.git diff --git a/t/t3407-rebase-abort.sh b/t/t3407-rebase-abort.sh index fbb3f2e0d..e573dc845 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