diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-03-20 14:29:10 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-03-20 14:29:10 -0700 |
| commit | 72c2de5c416baaaad16ab36a88b518d1aacf2a87 (patch) | |
| tree | 0b9e8573048353577d58d22971725cf52a0ad379 /t | |
| parent | 17e46ea6fea5273b51b424a8016f9da3412792d4 (diff) | |
| parent | 0e757e30c726d9d8ae82bd9989be3cff5d230288 (diff) | |
| download | git-72c2de5c416baaaad16ab36a88b518d1aacf2a87.tar.gz | |
Merge branch 'js/rebase-i-opt'
* js/rebase-i-opt:
rebase -i: avoid 'git reset' when possible
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3404-rebase-interactive.sh | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index 603b003edf..c32ff6682b 100755 --- a/t/t3404-rebase-interactive.sh +++ b/t/t3404-rebase-interactive.sh @@ -459,4 +459,15 @@ test_expect_success 'submodule rebase -i' ' FAKE_LINES="1 squash 2 3" git rebase -i A ' +test_expect_success 'avoid unnecessary reset' ' + git checkout master && + test-chmtime =123456789 file3 && + git update-index --refresh && + HEAD=$(git rev-parse HEAD) && + git rebase -i HEAD~4 && + test $HEAD = $(git rev-parse HEAD) && + MTIME=$(test-chmtime -v +0 file3 | sed 's/[^0-9].*$//') && + test 123456789 = $MTIME +' + test_done |