| commit | 9f21e97ddccf114a6919cf4b8cf57c2838328f36 | |
| author | Nanako Shiraishi <nanako3@lavabit.com> | |
| Thu, 7 Jan 2010 11:05:02 +0000 (7 20:05 +0900) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 7 Jan 2010 19:14:39 +0000 (7 11:14 -0800) | ||
| tree | 6096cbd783e73d10ca772012fef8289bce72f22c | treesnapshot (tar.gz zip) |
| parent | 61dfa1bb6710690e53fa20bc3ddd1f5fbe8c1d22 | commitdiff |
rebase: fix --onto A...B parsing and add tests
The previous patch didn't parse "rebase --onto A...B" correctly when A
isn't an empty string. It also tried to be careful to notice a case in
which there are more than one merge bases, but forgot to give --all option
to merge-base, making the test pointless.
Fix these problems and add a test script to verify. Improvements to the
script to parse A...B syntax was taken from review comments by Johannes
Schindelin.
Signed-off-by: しらいし ななこ <nanako3@lavabit.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
The previous patch didn't parse "rebase --onto A...B" correctly when A
isn't an empty string. It also tried to be careful to notice a case in
which there are more than one merge bases, but forgot to give --all option
to merge-base, making the test pointless.
Fix these problems and add a test script to verify. Improvements to the
script to parse A...B syntax was taken from review comments by Johannes
Schindelin.
Signed-off-by: しらいし ななこ <nanako3@lavabit.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| git-rebase.sh | diffblobblamehistory | |
| t/t3415-rebase-onto-threedots.sh | [new file with mode: 0755] | blob |