summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimo Hirvonen <tihirvon@gmail.com>2006-06-24 17:25:08 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-06-26 21:58:41 (GMT)
commit0e677e1a6b0d1c0e848ed19d18dda1c3c797c75e (patch)
treee20976d765fe298c34daa3f009fd0b67973201de
parentc9b5ef998a3027d9f11b0820bb13896096833ccb (diff)
downloadgit-0e677e1a6b0d1c0e848ed19d18dda1c3c797c75e.zip
git-0e677e1a6b0d1c0e848ed19d18dda1c3c797c75e.tar.gz
git-0e677e1a6b0d1c0e848ed19d18dda1c3c797c75e.tar.bz2
DIFF_FORMAT_RAW is not default anymore
diff_setup() used to initialize output_format to DIFF_FORMAT_RAW. Now the default is 0 (no output) so don't compare against DIFF_FORMAT_RAW to see if any diff format command line flags were given. Signed-off-by: Timo Hirvonen <tihirvon@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
-rw-r--r--builtin-log.c5
-rw-r--r--revision.c3
2 files changed, 2 insertions, 6 deletions
diff --git a/builtin-log.c b/builtin-log.c
index c1bf9d4..4e5273a 100644
--- a/builtin-log.c
+++ b/builtin-log.c
@@ -24,11 +24,8 @@ static int cmd_log_wc(int argc, const char **argv, char **envp,
rev->verbose_header = 1;
argc = setup_revisions(argc, argv, rev, "HEAD");
if (rev->always_show_header) {
- if (rev->diffopt.pickaxe || rev->diffopt.filter) {
+ if (rev->diffopt.pickaxe || rev->diffopt.filter)
rev->always_show_header = 0;
- if (rev->diffopt.output_format == DIFF_FORMAT_RAW)
- rev->diffopt.output_format = DIFF_FORMAT_NO_OUTPUT;
- }
}
if (argc > 1)
diff --git a/revision.c b/revision.c
index b963f2a..ae4ca82 100644
--- a/revision.c
+++ b/revision.c
@@ -851,8 +851,7 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch
}
if (revs->combine_merges) {
revs->ignore_merges = 0;
- if (revs->dense_combined_merges &&
- (revs->diffopt.output_format != DIFF_FORMAT_DIFFSTAT))
+ if (revs->dense_combined_merges && !revs->diffopt.output_format)
revs->diffopt.output_format = DIFF_FORMAT_PATCH;
}
revs->diffopt.abbrev = revs->abbrev;