Sync with 1.8.4.3

diff --git a/builtin/diff.c b/builtin/diff.c
index 2fb8c5dc0b6fdc97beb82f4dc3802a8f0dad8211..adb93a9efa5ed9b97a08224e46f6fbaf680343e6 100644 (file)
--- a/builtin/diff.c
+++ b/builtin/diff.c
@@ -169,7 +169,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;