undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Signed-off-by: Martin Koegler <mkoegler@auto.tuwien.ac.at>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Martin Koegler 2007-04-22 18:44:00 +02:00 committed by Junio C Hamano
parent bb6c2fba41
commit 01618a3ab1
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
builtin-diff.c
View File

@ -13,13 +13,10 @@
#include "log-tree.h" #include "log-tree.h"
#include "builtin.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 { struct blobinfo {
unsigned char sha1[20]; unsigned char sha1[20];
const char *name; 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)); die("'%s': %s", path, strerror(errno));
if (!(S_ISREG(st.st_mode) || S_ISLNK(st.st_mode))) if (!(S_ISREG(st.st_mode) || S_ISLNK(st.st_mode)))
die("'%s': not a regular file or symlink", path); 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, blob[0].sha1, null_sha1,
path, path); path, path);
diffcore_std(&revs->diffopt); diffcore_std(&revs->diffopt);
@ -88,8 +89,14 @@ static int builtin_diff_blobs(struct rev_info *revs,
if (argc > 1) if (argc > 1)
usage(builtin_diff_usage); 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].sha1, blob[1].sha1,
blob[0].name, blob[1].name); blob[0].name, blob[1].name);
diffcore_std(&revs->diffopt); 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); die("more than two blobs given: '%s'", name);
hashcpy(blob[blobs].sha1, obj->sha1); hashcpy(blob[blobs].sha1, obj->sha1);
blob[blobs].name = name; blob[blobs].name = name;
blob[blobs].mode = list->mode;
blobs++; blobs++;
continue; continue;