kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'maint' 

* maint:
  Fix copy-pasted comments related to tree diff handling.
maint
Junio C Hamano 2010-10-26 15:04:05 -07:00
parent d4c4369752 c3fced6498
commit d7806967bd
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
diff.c
View File

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