| commit | bb3f45838b859c8b17a53a24579a304333868cc8 | |
| author | John Keeping <john@keeping.me.uk> | |
| Thu, 9 Jan 2014 19:47:34 +0000 (9 19:47 +0000) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 9 Jan 2014 23:05:26 +0000 (9 15:05 -0800) | ||
| tree | c8f5a088eb941d1c92a288cde504e52b2504e9d3 | treesnapshot (tar.gz zip) |
| parent | ad8261d21221d27638c75f47b39892db6f7972f6 | commitdiff |
rebase: fix fork-point with zero arguments
When no arguments are specified, $switch_to is empty so we end up
passing the empty string to "git merge-base --fork-point", which causes
an error. git-rebase carries on at this point, but in fact we have
failed to apply the fork-point operation.
It turns out that the test in t3400 that was meant to test this didn't
actually need the fork-point behaviour, so enhance it to make sure that
the fork-point is applied correctly. The modified test fails without
the change to git-rebase.sh in this patch.
Reported-by: Andreas Krey <a.krey@gmx.de>
Signed-off-by: John Keeping <john@keeping.me.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
When no arguments are specified, $switch_to is empty so we end up
passing the empty string to "git merge-base --fork-point", which causes
an error. git-rebase carries on at this point, but in fact we have
failed to apply the fork-point operation.
It turns out that the test in t3400 that was meant to test this didn't
actually need the fork-point behaviour, so enhance it to make sure that
the fork-point is applied correctly. The modified test fails without
the change to git-rebase.sh in this patch.
Reported-by: Andreas Krey <a.krey@gmx.de>
Signed-off-by: John Keeping <john@keeping.me.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| git-rebase.sh | diffblobblamehistory | |
| t/t3400-rebase.sh | diffblobblamehistory |