diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-04-29 11:08:18 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-04-29 16:50:21 -0700 |
| commit | 0c44c94309693d0582e91a6744edc2e8eba46ef8 (patch) | |
| tree | 478bfc7cd76c4c9432018ddc686eb121eb418c96 /t | |
| parent | git config: error when editing a repo config and not being in one (diff) | |
| download | git-0c44c94309693d0582e91a6744edc2e8eba46ef8.tar.gz git-0c44c94309693d0582e91a6744edc2e8eba46ef8.zip | |
merge-recursive: do not die on a conflicting submodule
We cannot represent the 3-way conflicted state in the work tree
for these entries, but it is normal not to have commit objects
for them in our repository. Just update the index and the life
will be good.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7405-submodule-merge.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t7405-submodule-merge.sh b/t/t7405-submodule-merge.sh index aa6c44ce4f..9a21f783d3 100755 --- a/t/t7405-submodule-merge.sh +++ b/t/t7405-submodule-merge.sh @@ -54,13 +54,13 @@ test_expect_success setup ' git merge -s ours a ' -test_expect_failure 'merging with modify/modify conflict' ' +test_expect_success 'merging with modify/modify conflict' ' git checkout -b test1 a && test_must_fail git merge b && test -f .git/MERGE_MSG && - git diff - + git diff && + test -n "$(git ls-files -u)" ' test_expect_success 'merging with a modify/modify conflict between merge bases' ' |