diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-03-12 21:45:02 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-03-12 21:45:02 -0700 |
| commit | 54e7e7891b75741ba745e783dd5c5f488f377438 (patch) | |
| tree | 61a78c7f536a73b6cfaafee7595fc35680a9826e /t | |
| parent | daf713dd497ef04855ccecf90ad9aafb17769681 (diff) | |
| parent | 94c88edef7a69299e12248b910752f1fc26f12d6 (diff) | |
| download | git-54e7e7891b75741ba745e783dd5c5f488f377438.tar.gz git-54e7e7891b75741ba745e783dd5c5f488f377438.tar.xz | |
Merge branch 'js/maint-1.6.1-rebase-i-submodule' into maint-1.6.1
* js/maint-1.6.1-rebase-i-submodule:
Fix submodule squashing into unrelated commit
rebase -i squashes submodule changes into unrelated commit
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3404-rebase-interactive.sh | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index 2cc8e7abe..4becc5513 100755 --- a/t/t3404-rebase-interactive.sh +++ b/t/t3404-rebase-interactive.sh @@ -462,4 +462,30 @@ test_expect_success 'do "noop" when there is nothing to cherry-pick' ' ' +test_expect_success 'submodule rebase setup' ' + git checkout A && + mkdir sub && + ( + cd sub && git init && >elif && + git add elif && git commit -m "submodule initial" + ) && + echo 1 >file1 && + git add file1 sub + test_tick && + git commit -m "One" && + echo 2 >file1 && + test_tick && + git commit -a -m "Two" && + ( + cd sub && echo 3 >elif && + git commit -a -m "submodule second" + ) && + test_tick && + git commit -a -m "Three changes submodule" +' + +test_expect_success 'submodule rebase -i' ' + FAKE_LINES="1 squash 2 3" git rebase -i A +' + test_done |