diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-10-26 15:04:05 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-10-26 15:04:05 -0700 |
| commit | d7806967bd984c75d8abd7afea3fd4930ad0c3fb (patch) | |
| tree | dc3d5a20c8e7c59186be8a007bf2349bcae9e567 | |
| parent | Sync with 1.7.3.2 (diff) | |
| parent | Fix copy-pasted comments related to tree diff handling. (diff) | |
| download | tgif-d7806967bd984c75d8abd7afea3fd4930ad0c3fb.tar.xz | |
Merge branch 'maint'
* maint:
Fix copy-pasted comments related to tree diff handling.
| -rw-r--r-- | diff.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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); } |