summaryrefslogtreecommitdiff
path: root/diff.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-08-18 19:47:18 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-08-18 19:47:18 (GMT)
commitbd3a97a27a97485b130802d497214be312b737f9 (patch)
tree803a7822503dc81a00e54724f3dbe9f5963dec13 /diff.h
parent6b5005c88b3a0c360249deb8ca8b92201abaa824 (diff)
parent65113121a50cd765033d51204213c817832c59cf (diff)
downloadgit-bd3a97a27a97485b130802d497214be312b737f9.zip
git-bd3a97a27a97485b130802d497214be312b737f9.tar.gz
git-bd3a97a27a97485b130802d497214be312b737f9.tar.bz2
Merge branch 'jc/maint-follow-rename-fix'
* jc/maint-follow-rename-fix: log: test for regression introduced in v1.7.2-rc0~103^2~2 diff --follow: do call diffcore_std() as necessary diff --follow: do not waste cycles while recursing
Diffstat (limited to 'diff.h')
-rw-r--r--diff.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/diff.h b/diff.h
index 53ad345..d43da9d 100644
--- a/diff.h
+++ b/diff.h
@@ -127,6 +127,9 @@ struct diff_options {
/* this is set by diffcore for DIFF_FORMAT_PATCH */
int found_changes;
+ /* to support internal diff recursion by --follow hack*/
+ int found_follow;
+
FILE *file;
int close_file;