X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin%2Fdiff-tree.c;h=be6417d166abf428d379a70b9d67f894da4641d1;hb=27c67292019e8d49c5b5e3ce73c59c03c08b2ada;hp=0d2a3e9fa2023cc673f1f6d9e17d3deeca1c7e9d;hpb=bac9c06ba093d9254cb2ab3eed074722a3e635a6;p=git.git

diff --git a/builtin/diff-tree.c b/builtin/diff-tree.c
index 0d2a3e9fa..be6417d16 100644
--- a/builtin/diff-tree.c
+++ b/builtin/diff-tree.c
@@ -163,6 +163,9 @@ int cmd_diff_tree(int argc, const char **argv, const char *prefix)
 	}
 
 	if (read_stdin) {
+		int saved_nrl = 0;
+		int saved_dcctc = 0;
+
 		if (opt->diffopt.detect_rename)
 			opt->diffopt.setup |= (DIFF_SETUP_USE_SIZE_CACHE |
 					       DIFF_SETUP_USE_CACHE);
@@ -173,9 +176,16 @@ int cmd_diff_tree(int argc, const char **argv, const char *prefix)
 				fputs(line, stdout);
 				fflush(stdout);
 			}
-			else
+			else {
 				diff_tree_stdin(line);
+				if (saved_nrl < opt->diffopt.needed_rename_limit)
+					saved_nrl = opt->diffopt.needed_rename_limit;
+				if (opt->diffopt.degraded_cc_to_c)
+					saved_dcctc = 1;
+			}
 		}
+		opt->diffopt.degraded_cc_to_c = saved_dcctc;
+		opt->diffopt.needed_rename_limit = saved_nrl;
 	}
 
 	return diff_result_code(&opt->diffopt, 0);