X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=diff-no-index.c;h=42c1dd8ad3b0633767bf577975a895722f882565;hb=a162e78df082d4f885bda2e51067d9788a7f65e4;hp=598687b50ac7b88ca0860faf1670d03047bb3603;hpb=f23336f5c15eb90df3275076181d10746479be5b;p=git.git diff --git a/diff-no-index.c b/diff-no-index.c index 598687b50..42c1dd8ad 100644 --- a/diff-no-index.c +++ b/diff-no-index.c @@ -205,8 +205,6 @@ void diff_no_index(struct rev_info *revs, no_index ? "--no-index" : "[--no-index]"); diff_setup(&revs->diffopt); - if (!revs->diffopt.output_format) - revs->diffopt.output_format = DIFF_FORMAT_PATCH; for (i = 1; i < argc - 2; ) { int j; if (!strcmp(argv[i], "--no-index")) @@ -252,6 +250,8 @@ void diff_no_index(struct rev_info *revs, revs->diffopt.paths = argv + argc - 2; revs->diffopt.nr_paths = 2; revs->diffopt.skip_stat_unmatch = 1; + if (!revs->diffopt.output_format) + revs->diffopt.output_format = DIFF_FORMAT_PATCH; DIFF_OPT_SET(&revs->diffopt, EXIT_WITH_STATUS); DIFF_OPT_SET(&revs->diffopt, NO_INDEX);