Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Fix copy-pasted comments related to tree diff handling.
author
Yann Dirson
<ydirson@altern.org>
Sun, 24 Oct 2010 21:03:10 +0000
(23:03 +0200)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 25 Oct 2010 07:21:56 +0000
(
00:21
-0700)
Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff.c
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
8a90438
)
diff --git
a/diff.c
b/diff.c
index 0e2e872e0bb6b82d08e4dc6415afe875ccccc367..340d878f02b0daa3b26cf5eb3bf71bdda1437ce2 100644
(file)
--- a/
diff.c
+++ b/
diff.c
@@
-3527,7
+3527,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)))
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);
}
run_diffstat(p, o, diffstat);
}
@@
-3540,7
+3540,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)))
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
thing to check in tree diffs
*/
run_checkdiff(p, o);
}
run_checkdiff(p, o);
}