merge-recursive: do not die on a conflicting submodule

gitster · gitster · commit 0c44c9430969 · 2009-04-29T16:50:21.000-07:00
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 &lt;gitster@pobox.com&gt;
diff --git a/merge-recursive.c b/merge-recursive.c
@@ -520,8 +520,12 @@ static void update_file_flags(struct merge_options *o,
 		unsigned long size;
 
 		if (S_ISGITLINK(mode))
-			die("cannot read object %s '%s': It is a submodule!",
-			    sha1_to_hex(sha), path);
+			/*
+			 * We may later decide to recursively descend into
+			 * the submodule directory and update its index
+			 * and/or work tree, but we do not do that now.
+			 */
+			goto update_index;
 
 		buf = read_sha1_file(sha, &type, &size);
 		if (!buf)
diff --git 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' '

Original file line number	Diff line number	Diff line change
`@@ -54,13 +54,13 @@ test_expect_success setup '`
`54`	`54`	`git merge -s ours a`
`55`	`55`	`'`
`56`	`56`
`57`		`-test_expect_failure 'merging with modify/modify conflict' '`
	`57`	`+test_expect_success 'merging with modify/modify conflict' '`
`58`	`58`
`59`	`59`	`git checkout -b test1 a &&`
`60`	`60`	`test_must_fail git merge b &&`
`61`	`61`	`test -f .git/MERGE_MSG &&`
`62`		`- git diff`
`63`		`-`
	`62`	`+ git diff &&`
	`63`	`+ test -n "$(git ls-files -u)"`
`64`	`64`	`'`
`65`	`65`
`66`	`66`	`test_expect_success 'merging with a modify/modify conflict between merge bases' '`