diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-01-31 18:07:55 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-01-31 18:07:55 -0800 |
| commit | 29254142ddac335b33606c0036561f6df89f3d18 (patch) | |
| tree | c500d1008639df21a9bee792e074e0bbc228b396 /t | |
| parent | Merge branch 'jc/maint-split-diff-metainfo' (diff) | |
| parent | Fix submodule squashing into unrelated commit (diff) | |
| download | tgif-29254142ddac335b33606c0036561f6df89f3d18.tar.xz | |
Merge branch 'js/maint-rebase-i-submodule'
* js/maint-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 3592403af7..603b003edf 100755 --- a/t/t3404-rebase-interactive.sh +++ b/t/t3404-rebase-interactive.sh @@ -433,4 +433,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 |