diff options
| author | Timo Hirvonen <tihirvon@gmail.com> | 2006-06-24 21:24:14 +0400 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-06-27 01:58:40 +0400 |
| commit | c9b5ef998a3027d9f11b0820bb13896096833ccb (patch) | |
| tree | e37c30116512362697c9e670b654b4c013477c7a /builtin-diff-stages.c | |
| parent | a610786f4bc282410d348aba97316115a57740a0 (diff) | |
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.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/builtin-diff-stages.c b/builtin-diff-stages.c index 7c157ca889..30931fe049 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) || |