summaryrefslogtreecommitdiff
path: root/diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-10-26 15:04:05 -0700
committerJunio C Hamano <gitster@pobox.com>2010-10-26 15:04:05 -0700
commitd7806967bd984c75d8abd7afea3fd4930ad0c3fb (patch)
treedc3d5a20c8e7c59186be8a007bf2349bcae9e567 /diff.c
parentd4c436975214d8f94d38f9be0ef709b4714fc821 (diff)
parentc3fced64981e3d2700d83c0a6661ac347df5121e (diff)
downloadgit-d7806967bd984c75d8abd7afea3fd4930ad0c3fb.tar.gz
Merge branch 'maint'
* maint: Fix copy-pasted comments related to tree diff handling.
Diffstat (limited to 'diff.c')
-rw-r--r--diff.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/diff.c b/diff.c
index 71efa8edd4..ba57bfab17 100644
--- a/diff.c
+++ b/diff.c
@@ -3532,7 +3532,7 @@ static void diff_flush_stat(struct diff_filepair *p, struct diff_options *o,
if ((DIFF_FILE_VALID(p->one) && S_ISDIR(p->one->mode)) ||
(DIFF_FILE_VALID(p->two) && S_ISDIR(p->two->mode)))
- return; /* no tree diffs in patch format */
+ return; /* no useful stat for tree diffs */
run_diffstat(p, o, diffstat);
}
@@ -3545,7 +3545,7 @@ static void diff_flush_checkdiff(struct diff_filepair *p,
if ((DIFF_FILE_VALID(p->one) && S_ISDIR(p->one->mode)) ||
(DIFF_FILE_VALID(p->two) && S_ISDIR(p->two->mode)))
- return; /* no tree diffs in patch format */
+ return; /* nothing to check in tree diffs */
run_checkdiff(p, o);
}