summaryrefslogtreecommitdiff
path: root/builtin-diff-files.c
diff options
context:
space:
mode:
authorTimo Hirvonen <tihirvon@gmail.com>2006-06-24 17:24:14 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-06-26 21:58:40 (GMT)
commitc9b5ef998a3027d9f11b0820bb13896096833ccb (patch)
treee37c30116512362697c9e670b654b4c013477c7a /builtin-diff-files.c
parenta610786f4bc282410d348aba97316115a57740a0 (diff)
downloadgit-c9b5ef998a3027d9f11b0820bb13896096833ccb.zip
git-c9b5ef998a3027d9f11b0820bb13896096833ccb.tar.gz
git-c9b5ef998a3027d9f11b0820bb13896096833ccb.tar.bz2
Set default diff output format after parsing command line
Initialize output_format to 0 instead of DIFF_FORMAT_RAW so that we can see later if any command line options changed it. Default value is set only if output format was not specified. Signed-off-by: Timo Hirvonen <tihirvon@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'builtin-diff-files.c')
-rw-r--r--builtin-diff-files.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/builtin-diff-files.c b/builtin-diff-files.c
index 5afc1d7..a655eea 100644
--- a/builtin-diff-files.c
+++ b/builtin-diff-files.c
@@ -36,6 +36,9 @@ int cmd_diff_files(int argc, const char **argv, char **envp)
usage(diff_files_usage);
argv++; argc--;
}
+ if (!rev.diffopt.output_format)
+ rev.diffopt.output_format = DIFF_FORMAT_RAW;
+
/*
* Make sure there are NO revision (i.e. pending object) parameter,
* rev.max_count is reasonable (0 <= n <= 3),