[PATCH] Fix copy-pasted comments related to tree diff handling.
From: Yann Dirson <hidden>
Date: 2016-06-15 22:49:52
Subsystem:
the rest · Maintainer:
Linus Torvalds
--- diff.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/diff.c b/diff.c
index 71efa8e..ba57bfa 100644
--- a/diff.c
+++ b/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)) || (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); }
--
1.7.2.3