diff options
| author |  Brad King <brad.king@kitware.com> | 2011-10-13 08:59:05 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2011-10-13 10:18:16 -0700 |
| commit | 80988783c8c417c5e914256b43ed3604cc8fa4c3 (patch) | |
| tree | e59001bc21004d07a0a9904d2703cf916b98f0af /sigchain.h | |
| parent | submodule: Demonstrate known breakage during recursive merge (diff) | |
| download | tgif-80988783c8c417c5e914256b43ed3604cc8fa4c3.tar.xz | |
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>
Diffstat (limited to 'sigchain.h')
0 files changed, 0 insertions, 0 deletions