Merge branch 'maint'

gitster · gitster · commit d7806967bd98 · 2010-10-26T15:04:05.000-07:00
* maint:
  Fix copy-pasted comments related to tree diff handling.
diff --git 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);
 }

Original file line number	Diff line number	Diff line change
`@@ -3532,7 +3532,7 @@ static void diff_flush_stat(struct diff_filepair p, struct diff_options o,`
`3532`	`3532`
`3533`	`3533`	`if ((DIFF_FILE_VALID(p->one) && S_ISDIR(p->one->mode)) \|\|`
`3534`	`3534`	`(DIFF_FILE_VALID(p->two) && S_ISDIR(p->two->mode)))`
`3535`		`- return; /* no tree diffs in patch format */`
	`3535`	`+ return; /* no useful stat for tree diffs */`
`3536`	`3536`
`3537`	`3537`	`run_diffstat(p, o, diffstat);`
`3538`	`3538`	`}`
`@@ -3545,7 +3545,7 @@ static void diff_flush_checkdiff(struct diff_filepair *p,`
`3545`	`3545`
`3546`	`3546`	`if ((DIFF_FILE_VALID(p->one) && S_ISDIR(p->one->mode)) \|\|`
`3547`	`3547`	`(DIFF_FILE_VALID(p->two) && S_ISDIR(p->two->mode)))`
`3548`		`- return; /* no tree diffs in patch format */`
	`3548`	`+ return; /* nothing to check in tree diffs */`
`3549`	`3549`
`3550`	`3550`	`run_checkdiff(p, o);`
`3551`	`3551`	`}`