use mode of the tree in git-diff, if <tree>:<file> syntax is used

Signed-off-by: Martin Koegler <mkoegler@auto.tuwien.ac.at>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/builtin-diff.c b/builtin-diff.c
index 2ae60097b8cfddd873a38f3988185d9fde77f511..4ba4d18f871122e0585ead1d09deb728ff518174 100644 (file)
--- a/builtin-diff.c
+++ b/builtin-diff.c
@@ -13,13 +13,10 @@
 #include "log-tree.h"
 #include "builtin.h"
 
 #include "log-tree.h"
 #include "builtin.h"
 

-/* NEEDSWORK: struct object has place for name but we _do_
- * know mode when we extracted the blob out of a tree, which
- * we currently lose.
- */

 struct blobinfo {
        unsigned char sha1[20];
        const char *name;
 struct blobinfo {
        unsigned char sha1[20];
        const char *name;

+       unsigned mode;

 };
 
 static const char builtin_diff_usage[] =
 };
 
 static const char builtin_diff_usage[] =


@@ -70,8 +67,12 @@ static int builtin_diff_b_f(struct rev_info *revs,
                die("'%s': %s", path, strerror(errno));
        if (!(S_ISREG(st.st_mode) || S_ISLNK(st.st_mode)))
                die("'%s': not a regular file or symlink", path);
                die("'%s': %s", path, strerror(errno));
        if (!(S_ISREG(st.st_mode) || S_ISLNK(st.st_mode)))
                die("'%s': not a regular file or symlink", path);

+
+       if (blob[0].mode == S_IFINVALID)
+               blob[0].mode = canon_mode(st.st_mode);
+

        stuff_change(&revs->diffopt,
        stuff_change(&revs->diffopt,

-                    canon_mode(st.st_mode), canon_mode(st.st_mode),
+                    blob[0].mode, canon_mode(st.st_mode),

                     blob[0].sha1, null_sha1,
                     path, path);
        diffcore_std(&revs->diffopt);
                     blob[0].sha1, null_sha1,
                     path, path);
        diffcore_std(&revs->diffopt);


@@ -88,8 +89,14 @@ static int builtin_diff_blobs(struct rev_info *revs,
        if (argc > 1)
                usage(builtin_diff_usage);
 
        if (argc > 1)
                usage(builtin_diff_usage);
 

+       if (blob[0].mode == S_IFINVALID)
+               blob[0].mode = mode;
+
+       if (blob[1].mode == S_IFINVALID)
+               blob[1].mode = mode;
+

        stuff_change(&revs->diffopt,
        stuff_change(&revs->diffopt,

-                    mode, mode,
+                    blob[0].mode, blob[1].mode,

                     blob[0].sha1, blob[1].sha1,
                     blob[0].name, blob[1].name);
        diffcore_std(&revs->diffopt);
                     blob[0].sha1, blob[1].sha1,
                     blob[0].name, blob[1].name);
        diffcore_std(&revs->diffopt);


@@ -272,6 +279,7 @@ int cmd_diff(int argc, const char **argv, const char *prefix)
                                die("more than two blobs given: '%s'", name);
                        hashcpy(blob[blobs].sha1, obj->sha1);
                        blob[blobs].name = name;
                                die("more than two blobs given: '%s'", name);
                        hashcpy(blob[blobs].sha1, obj->sha1);
                        blob[blobs].name = name;

+                       blob[blobs].mode = list->mode;

                        blobs++;
                        continue;
 
                        blobs++;
                        continue;