diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-10-19 10:48:38 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-10-19 10:48:38 -0700 |
| commit | 2201cc8c977918c520e70093f4b74bbdf70afcc5 (patch) | |
| tree | fb02d2b778207f6d4e91940e1e568031b8cb9698 /merge-recursive.c | |
| parent | c31b87d111f6df359255979ea94e8648a51c3647 (diff) | |
| parent | 80988783c8c417c5e914256b43ed3604cc8fa4c3 (diff) | |
| download | git-2201cc8c977918c520e70093f4b74bbdf70afcc5.tar.gz | |
Merge branch 'bk/submodule-in-recursive-merge'
* bk/submodule-in-recursive-merge:
submodule: Search for merges only at end of recursive merge
submodule: Demonstrate known breakage during recursive merge
Diffstat (limited to 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index c34a4f148b..cc664c39b6 100644 --- 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)) { - 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); |