diff options
Diffstat (limited to 'diff-no-index.c')
| -rw-r--r-- | diff-no-index.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/diff-no-index.c b/diff-no-index.c index 4771cf02aa..3a8965672c 100644 --- a/diff-no-index.c +++ b/diff-no-index.c @@ -8,13 +8,10 @@ #include "abspath.h" #include "color.h" #include "commit.h" -#include "blob.h" -#include "tag.h" #include "diff.h" #include "diffcore.h" #include "gettext.h" #include "revision.h" -#include "log-tree.h" #include "parse-options.h" #include "string-list.h" #include "dir.h" @@ -232,6 +229,7 @@ static int queue_diff(struct diff_options *o, if (o->flags.reverse_diff) { SWAP(mode1, mode2); SWAP(name1, name2); + SWAP(special1, special2); } d1 = noindex_filespec(name1, mode1, special1); @@ -364,7 +362,7 @@ int diff_no_index(struct rev_info *revs, * The return code for --no-index imitates diff(1): * 0 = no changes, 1 = changes, else error */ - ret = diff_result_code(&revs->diffopt, 0); + ret = diff_result_code(&revs->diffopt); out: for (i = 0; i < ARRAY_SIZE(to_free); i++) |