Browse Source

Merge branch 'maint'

* maint:
  Fix copy-pasted comments related to tree diff handling.
maint
Junio C Hamano 14 years ago
parent
commit
d7806967bd
  1. 4
      diff.c

4
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)) || if ((DIFF_FILE_VALID(p->one) && S_ISDIR(p->one->mode)) ||
(DIFF_FILE_VALID(p->two) && S_ISDIR(p->two->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); 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)) || if ((DIFF_FILE_VALID(p->one) && S_ISDIR(p->one->mode)) ||
(DIFF_FILE_VALID(p->two) && S_ISDIR(p->two->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); run_checkdiff(p, o);
} }

Loading…
Cancel
Save