diff options
| author |  John Keeping <john@keeping.me.uk> | 2014-01-09 19:47:34 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2014-01-09 15:05:26 -0800 |
| commit | bb3f45838b859c8b17a53a24579a304333868cc8 (patch) | |
| tree | c8f5a088eb941d1c92a288cde504e52b2504e9d3 /contrib/buildsystems/Generators/QMake.pm | |
| parent | rebase: use reflog to find common base with upstream (diff) | |
| download | tgif-bb3f45838b859c8b17a53a24579a304333868cc8.tar.xz | |
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>
Diffstat (limited to 'contrib/buildsystems/Generators/QMake.pm')
0 files changed, 0 insertions, 0 deletions