diff options
author | Elijah Newren <newren@gmail.com> | 2020-02-15 22:36:38 +0100 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-02-17 00:40:42 +0100 |
commit | 76340c8107ba8e658f9cc76d1d220bac2944d1f1 (patch) | |
tree | 4b550f1254a1f4f3e37da170c1cfa94c5494b0c7 /t/t6047-diff3-conflict-markers.sh | |
parent | rebase tests: mark tests specific to the am-backend with --am (diff) | |
download | git-76340c8107ba8e658f9cc76d1d220bac2944d1f1.tar.xz git-76340c8107ba8e658f9cc76d1d220bac2944d1f1.zip |
rebase tests: repeat some tests using the merge backend instead of am
In order to ensure the merge/interactive backend gets similar coverage
to the am one, add some tests for cases where previously only the am
backend was tested.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6047-diff3-conflict-markers.sh')
-rwxr-xr-x | t/t6047-diff3-conflict-markers.sh | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/t/t6047-diff3-conflict-markers.sh b/t/t6047-diff3-conflict-markers.sh index 860542aad0..d383ce8130 100755 --- a/t/t6047-diff3-conflict-markers.sh +++ b/t/t6047-diff3-conflict-markers.sh @@ -186,7 +186,7 @@ test_expect_success 'check multiple merge bases' ' ) ' -test_expect_success 'rebase describes fake ancestor base' ' +test_expect_success 'rebase --merge describes parent of commit being picked' ' test_create_repo rebase && ( cd rebase && @@ -194,7 +194,16 @@ test_expect_success 'rebase describes fake ancestor base' ' test_commit master file && git checkout -b side HEAD^ && test_commit side file && - test_must_fail git -c merge.conflictstyle=diff3 rebase master && + test_must_fail git -c merge.conflictstyle=diff3 rebase --merge master && + grep "||||||| parent of" file + ) +' + +test_expect_success 'rebase --am describes fake ancestor base' ' + ( + cd rebase && + git rebase --abort && + test_must_fail git -c merge.conflictstyle=diff3 rebase --am master && grep "||||||| constructed merge base" file ) ' |