global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-13 02:13:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into next

Browse Source 
* master:
  Fix copy-pasted comments related to tree diff handling.
This commit is contained in:
Junio C Hamano
2010-10-26 15:06:21 -07:00
parent ab1c9886b0 d7806967bd
commit cbe69e29b9
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
diff.c
View File

@@ -3551,7 +3551,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);
}
@@ -3564,7 +3564,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);
}