Merge branch 'jc/diff' into next
authorJunio C Hamano <junkio@cox.net>
Tue, 16 May 2006 02:06:06 +0000 (19:06 -0700)
committerJunio C Hamano <junkio@cox.net>
Tue, 16 May 2006 02:06:06 +0000 (19:06 -0700)
* jc/diff:
  builtin-diff: fix comparison between two blobs.

1  2 
builtin-diff.c

diff --combined builtin-diff.c
@@@ -132,7 -132,9 +132,9 @@@ static int builtin_diff_blobs(struct re
                              int argc, const char **argv,
                              struct blobinfo *blob)
  {
-       /* Blobs */
+       /* Blobs: the arguments are reversed when setup_revisions()
+        * picked them up.
+        */
        unsigned mode = canon_mode(S_IFREG | 0644);
  
        while (1 < argc) {
        }
        stuff_change(&revs->diffopt,
                     mode, mode,
-                    blob[0].sha1, blob[1].sha1,
-                    blob[1].name, blob[1].name);
+                    blob[1].sha1, blob[0].sha1,
+                    blob[0].name, blob[0].name);
        diffcore_std(&revs->diffopt);
        diff_flush(&revs->diffopt);
        return 0;
@@@ -231,7 -233,7 +233,7 @@@ static int builtin_diff_combined(struc
        return 0;
  }
  
 -static void add_head(struct rev_info *revs)
 +void add_head(struct rev_info *revs)
  {
        unsigned char sha1[20];
        struct object *obj;