From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 26 Oct 2010 22:04:05 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.4-rc0~172
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/d7806967bd984c75d8abd7afea3fd4930ad0c3fb?hp=d4c436975214d8f94d38f9be0ef709b4714fc821

Merge branch 'maint'

* maint:
Fix copy-pasted comments related to tree diff handling.
---

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);
 }