summaryrefslogtreecommitdiff
path: root/builtin-diff-stages.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-stages.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-stages.c')
-rw-r--r--builtin-diff-stages.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/builtin-diff-stages.c b/builtin-diff-stages.c
index 7c157ca..30931fe 100644
--- a/builtin-diff-stages.c
+++ b/builtin-diff-stages.c
@@ -85,6 +85,9 @@ int cmd_diff_stages(int ac, const char **av, char **envp)
ac--; av++;
}
+ if (!diff_options.output_format)
+ diff_options.output_format = DIFF_FORMAT_RAW;
+
if (ac < 3 ||
sscanf(av[1], "%d", &stage1) != 1 ||
! (0 <= stage1 && stage1 <= 3) ||