Merge branch 'nd/magic-pathspec' into maint

[~andy/git] / builtin / diff.c

diff --git a/builtin/diff.c b/builtin/diff.c
index 2af254222593883e9ea0b7288e016dd0aba7102f..fe0cc7f1b5b1451f267b1d9e24a6e40cd6e55325 100644 (file)
--- a/builtin/diff.c
+++ b/builtin/diff.c
@@ -172,7 +172,7 @@ static int builtin_diff_tree(struct rev_info *revs,
        if (ent1->item->flags & UNINTERESTING)
                swap = 1;
        sha1[swap] = ent0->item->sha1;
-       sha1[1-swap] = ent1->item->sha1;
+       sha1[1 - swap] = ent1->item->sha1;
        diff_tree_sha1(sha1[0], sha1[1], "", &revs->diffopt);
        log_tree_diff_flush(revs);
        return 0;