For some inexplicable reason, "git diff" would call "diff_setup_done()"
iff we hadn't given an explicit output format.
That makes no sense, since much of what diff_setup_done() does is exactly
about checking the output format!
This just moves the call to "diff_setup_done()" out of the conditional,
and to where we've actually done all of the diffopt changes.
Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
---
builtin-diff.c | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/builtin-diff.c b/builtin-diff.c
index f77352b..cb4743b 100644
--- a/builtin-diff.c
+++ b/builtin-diff.c
@@ -252,13 +252,12 @@ int cmd_diff(int argc, const char **argv, const char *prefix)
argc = 0;
else
argc = setup_revisions(argc, argv, &rev, NULL);
- if (!rev.diffopt.output_format) {
+ if (!rev.diffopt.output_format)
rev.diffopt.output_format = DIFF_FORMAT_PATCH;
- if (diff_setup_done(&rev.diffopt) < 0)
- die("diff_setup_done failed");
- }
rev.diffopt.allow_external = 1;
rev.diffopt.recursive = 1;
+ if (diff_setup_done(&rev.diffopt) < 0)
+ die("diff_setup_done failed");
/* If the user asked for our exit code then don't start a
* pager or we would end up reporting its exit code instead.
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
