submodule: Search for merges only at end of recursive merge

The submodule merge search is not useful during virtual merges because
the results cannot be used automatically.  Furthermore any suggestions
made by the search may apply to commits different than HEAD:sub and
MERGE_HEAD:sub, thus confusing the user.  Skip searching for submodule
merges during a virtual merge such as that between B and C while merging
the heads of:

B---BC
/ \ /
A   X
\ / \
C---CB

Run the search only when the recursion level is zero (!o->call_depth).
This fixes known breakage tested in t7405-submodule-merge.

Signed-off-by: Brad King <brad.king@kitware.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/merge-recursive.c b/merge-recursive.c
index c34a4f148b65cf81f28e2aed6c35e141e175b324..cc664c39b66b0bb499dec13a22880a6096423fa6 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -946,8 +946,10 @@ static struct merge_file_info merge_file_1(struct merge_options *o,
                        free(result_buf.ptr);
                        result.clean = (merge_status == 0);
                } else if (S_ISGITLINK(a->mode)) {
                        free(result_buf.ptr);
                        result.clean = (merge_status == 0);
                } else if (S_ISGITLINK(a->mode)) {

-                       result.clean = merge_submodule(result.sha, one->path, one->sha1,
-                                                      a->sha1, b->sha1);
+                       result.clean = merge_submodule(result.sha,
+                                                      one->path, one->sha1,
+                                                      a->sha1, b->sha1,
+                                                      !o->call_depth);

                } else if (S_ISLNK(a->mode)) {
                        hashcpy(result.sha, a->sha1);
 
                } else if (S_ISLNK(a->mode)) {
                        hashcpy(result.sha, a->sha1);
 

diff --git a/submodule.c b/submodule.c
index 0b709bc2914335853e7525076f5e1d026d5dd779..0fd10a0fdbf5d1af10819dea808b43f6b13b98a8 100644 (file)
--- a/submodule.c
+++ b/submodule.c
@@ -794,7 +794,7 @@ static void print_commit(struct commit *commit)
 
 int merge_submodule(unsigned char result[20], const char *path,
                    const unsigned char base[20], const unsigned char a[20],
 
 int merge_submodule(unsigned char result[20], const char *path,
                    const unsigned char base[20], const unsigned char a[20],

-                   const unsigned char b[20])
+                   const unsigned char b[20], int search)

 {
        struct commit *commit_base, *commit_a, *commit_b;
        int parent_count;
 {
        struct commit *commit_base, *commit_a, *commit_b;
        int parent_count;


@@ -849,6 +849,10 @@ int merge_submodule(unsigned char result[20], const char *path,
         * user needs to confirm the resolution.
         */
 
         * user needs to confirm the resolution.
         */
 

+       /* Skip the search if makes no sense to the calling context.  */
+       if (!search)
+               return 0;
+

        /* find commit which merges them */
        parent_count = find_first_merges(&merges, path, commit_a, commit_b);
        switch (parent_count) {
        /* find commit which merges them */
        parent_count = find_first_merges(&merges, path, commit_a, commit_b);
        switch (parent_count) {

diff --git a/submodule.h b/submodule.h
index 799c22d6c6a459756983420960bc099da20336b3..80e04f3c8cfe9a49865ef54f61efaa3bc67dca5c 100644 (file)
--- a/submodule.h
+++ b/submodule.h
@@ -28,7 +28,7 @@ int fetch_populated_submodules(int num_options, const char **options,
                               int quiet);
 unsigned is_submodule_modified(const char *path, int ignore_untracked);
 int merge_submodule(unsigned char result[20], const char *path, const unsigned char base[20],
                               int quiet);
 unsigned is_submodule_modified(const char *path, int ignore_untracked);
 int merge_submodule(unsigned char result[20], const char *path, const unsigned char base[20],

-                   const unsigned char a[20], const unsigned char b[20]);
+                   const unsigned char a[20], const unsigned char b[20], int search);

 int check_submodule_needs_pushing(unsigned char new_sha1[20], const char *remotes_name);
 
 #endif
 int check_submodule_needs_pushing(unsigned char new_sha1[20], const char *remotes_name);
 
 #endif

diff --git a/t/t7405-submodule-merge.sh b/t/t7405-submodule-merge.sh
index 14da2e365437598fbf7284d3d7098b5595856b23..0d5b42a25bbe79d3fb7b09ce4bf5107ee55928e5 100755 (executable)
--- a/t/t7405-submodule-merge.sh
+++ b/t/t7405-submodule-merge.sh
@@ -269,7 +269,7 @@ test_expect_success 'setup for recursive merge with submodule' '
 '
 
 # merge should leave submodule unmerged in index
 '
 
 # merge should leave submodule unmerged in index

-test_expect_failure 'recursive merge with submodule' '
+test_expect_success 'recursive merge with submodule' '

        (cd merge-recursive &&
         test_must_fail git merge top-bc &&
         echo "160000 $(git rev-parse top-cb:sub) 2     sub" > expect2 &&
        (cd merge-recursive &&
         test_must_fail git merge top-bc &&
         echo "160000 $(git rev-parse top-cb:sub) 2     sub" > expect2 &&