diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-12-14 07:35:44 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-12-14 07:35:44 -0800 |
| commit | 37ad7ca7dbb0bef2b902f6bc7d3346ddff1667a5 (patch) | |
| tree | 22fec01c1e15f007c681b68cc217688e1002f5f3 /t | |
| parent | e0cbf12bf7d8b46292774ac91db8757d60b0f4df (diff) | |
| parent | 729ec9e23a13a0610a19a24901d0ab5e2bc44a12 (diff) | |
| download | git-37ad7ca7dbb0bef2b902f6bc7d3346ddff1667a5.tar.gz git-37ad7ca7dbb0bef2b902f6bc7d3346ddff1667a5.tar.xz | |
Merge branch 'mz/rebase-abort-reflog-fix' into maint
* mz/rebase-abort-reflog-fix:
rebase --abort: do not update branch ref
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3407-rebase-abort.sh | 12 |
1 files changed, 12 insertions, 0 deletions
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 |