X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fgit.git;a=blobdiff_plain;f=merge-recursive.c;h=6b812d67e3ecd54ece21c2465ede3e28d6fba325;hp=12300131fc12b15fbc9514e90ca45d76113d7267;hb=0253e126a271f10dc1f1fc630193a4026ec8a7ee;hpb=d163b6ae6b6e670494f8547a29eea3ad1e477e82

diff --git a/merge-recursive.c b/merge-recursive.c
index 12300131fc..6b812d67e3 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -2863,7 +2863,8 @@ static int detect_and_process_renames(struct merge_options *opt,
 	head_pairs = get_diffpairs(opt, common, head);
 	merge_pairs = get_diffpairs(opt, common, merge);
 
-	if (opt->detect_directory_renames) {
+	if ((opt->detect_directory_renames == 2) ||
+	    (opt->detect_directory_renames == 1 && !opt->call_depth)) {
 		dir_re_head = get_directory_renames(head_pairs);
 		dir_re_merge = get_directory_renames(merge_pairs);