[PATCH 1/1] --color and --no-color git-log options don't need diffs to be computed.
Signed-off-by: Pierre Habouzit <madcoder@debian.org>
---
revision.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/revision.c b/revision.c
index 33d092c..0dee835 100644
--- a/revision.c
+++ b/revision.c
@@ -1209,8 +1209,9 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch
opts = diff_opt_parse(&revs->diffopt, argv+i, argc-i);
if (opts > 0) {
- if (strcmp(argv[i], "-z"))
- revs->diff = 1;
+ revs->diff = strcmp(argv[i], "-z")
+ && strcmp(argv[i], "--color")
+ && strcmp(argv[i], "--no-color");
i += opts - 1;
continue;
}
--
1.5.3.2.1110.g61a7cd-dirty
Pierre Habouzit <madcoder@debian.org>