path: root/merge-recursive.h
diff options
authorJunio C Hamano <>2018-09-04 21:31:38 (GMT)
committerJunio C Hamano <>2018-09-04 21:31:38 (GMT)
commitca676b9bd354e846ac207e7879760719826517ce (patch)
treede33f48393a62396f73111655a41ae77f6be63c9 /merge-recursive.h
parent064e0b2d4ca76b0c438545a4d2170e589327e31f (diff)
parent6aba117d5cf7128e7bc942888263552fe927e13f (diff)
Merge branch 'en/directory-renames-nothanks'
Recent addition of "directory rename" heuristics to the merge-recursive backend makes the command susceptible to false positives and false negatives. In the context of "git am -3", which does not know about surrounding unmodified paths and thus cannot inform the merge machinery about the full trees involved, this risk is particularly severe. As such, the heuristic is disabled for "git am -3" to keep the machinery "more stupid but predictable". * en/directory-renames-nothanks: am: avoid directory rename detection when calling recursive merge machinery merge-recursive: add ability to turn off directory rename detection t3401: add another directory rename testcase for rebase and am
Diffstat (limited to 'merge-recursive.h')
1 files changed, 1 insertions, 0 deletions
diff --git a/merge-recursive.h b/merge-recursive.h
index 0c46a5a..e6a0828 100644
--- a/merge-recursive.h
+++ b/merge-recursive.h
@@ -20,6 +20,7 @@ struct merge_options {
unsigned renormalize : 1;
long xdl_opts;
int verbosity;
+ int detect_directory_renames;
int diff_detect_rename;
int merge_detect_rename;
int diff_rename_limit;