| commit | 03c4829347e26c844e589c61567a77a77c0658a9 | |
| author | Johannes Sixt <j6t@kdbg.org> | |
| Mon, 15 Dec 2008 10:05:30 +0000 (15 11:05 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 21 Dec 2008 09:08:37 +0000 (21 01:08 -0800) | ||
| tree | 710bb9fe8949675c82c5f90050fabea72026112c | treesnapshot (tar.gz zip) |
| parent | 5832d1a9da78273652c213d8e1535c09dd7dc079 | commitdiff |
Show a failure of rebase -p if the merge had a conflict
This extends t3409-rebase-preserve-merges by a case where the merge that
is rebased has a conflict. Therefore, the rebase stops and expects that
the user resolves the conflict. However, currently rebase --continue
fails because .git/rebase-merge/author-script is missing.
The test script had allocated two identical clones, but only one of them
(clone2) was used. Now we use both as indicated in the comment. Also,
two instances of && was missing in the setup part.
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This extends t3409-rebase-preserve-merges by a case where the merge that
is rebased has a conflict. Therefore, the rebase stops and expects that
the user resolves the conflict. However, currently rebase --continue
fails because .git/rebase-merge/author-script is missing.
The test script had allocated two identical clones, but only one of them
(clone2) was used. Now we use both as indicated in the comment. Also,
two instances of && was missing in the setup part.
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| t/t3409-rebase-preserve-merges.sh | diffblobblamehistory |