diff options
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2009-01-27 11:42:31 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-01-28 22:54:58 (GMT) |
| commit | 94c88edef7a69299e12248b910752f1fc26f12d6 (patch) | |
| tree | a6c9940ce036280e0e5a0db16f32c7d0c164041e /t/t3404-rebase-interactive.sh | |
| parent | 967476966513564e9c28847f7a974b8af5093493 (diff) | |
| download | git-94c88edef7a69299e12248b910752f1fc26f12d6.zip git-94c88edef7a69299e12248b910752f1fc26f12d6.tar.gz git-94c88edef7a69299e12248b910752f1fc26f12d6.tar.bz2 | |
Fix submodule squashing into unrelated commit
Actually, I think the issue is pretty independent of submodules; when
"git commit" gets an empty parameter, it misinterprets it as a file.
So avoid passing an empty parameter to "git commit".
Actually, this is a nice cleanup, as MSG_FILE and EDIT_COMMIT were mutually
exclusive; use one variable instead
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3404-rebase-interactive.sh')
| -rwxr-xr-x | t/t3404-rebase-interactive.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index 6ffb9ad..4becc55 100755 --- a/t/t3404-rebase-interactive.sh +++ b/t/t3404-rebase-interactive.sh @@ -484,7 +484,7 @@ test_expect_success 'submodule rebase setup' ' git commit -a -m "Three changes submodule" ' -test_expect_failure 'submodule rebase -i' ' +test_expect_success 'submodule rebase -i' ' FAKE_LINES="1 squash 2 3" git rebase -i A ' |