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

diff-cache: handle modified new files correctly

Browse Source 
Junio pointed out that diff-cache didn't handle the case of a new file
that was different from its index entry correctly. It needs to check
the working copy the same way the modified file case did.
This commit is contained in:
Linus Torvalds 2005-04-27 09:41:15 -07:00
parent 91f192a909
commit c9cddabe99
1 changed files with 44 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
diff-cache.c
View File

@ -6,42 +6,68 @@ static int generate_patch = 0;
static int line_termination = '\n'; static int line_termination = '\n';
/* A file entry went away or appeared */ /* A file entry went away or appeared */
static void show_file(const char *prefix, struct cache_entry *ce) static void show_file(const char *prefix, struct cache_entry *ce, unsigned char *sha1, unsigned int mode)
{ {
if (generate_patch) if (generate_patch)
diff_addremove(prefix[0], ntohl(ce->ce_mode), diff_addremove(prefix[0], ntohl(mode), sha1, ce->name, NULL);
ce->sha1, ce->name, NULL);
else else
printf("%s%06o\tblob\t%s\t%s%c", prefix, ntohl(ce->ce_mode), printf("%s%06o\tblob\t%s\t%s%c", prefix, ntohl(mode),
sha1_to_hex(ce->sha1), ce->name, sha1_to_hex(sha1), ce->name, line_termination);
line_termination);
} }
static int show_modified(struct cache_entry *old, struct cache_entry *new) static int get_stat_data(struct cache_entry *ce, unsigned char **sha1p, unsigned int *modep)
{ {
unsigned int mode = ntohl(new->ce_mode), oldmode; unsigned char *sha1 = ce->sha1;
unsigned char *sha1 = new->sha1; unsigned int mode = ce->ce_mode;
unsigned char old_sha1_hex[60];
if (!cached_only) { if (!cached_only) {
static unsigned char no_sha1[20]; static unsigned char no_sha1[20];
int changed; int changed;
struct stat st; struct stat st;
if (stat(new->name, &st) < 0) { if (stat(ce->name, &st) < 0)
show_file("-", old);
return -1; return -1;
} changed = cache_match_stat(ce, &st);
changed = cache_match_stat(new, &st);
if (changed) { if (changed) {
mode = st.st_mode; mode = create_ce_mode(st.st_mode);
sha1 = no_sha1; sha1 = no_sha1;
} }
} }
oldmode = ntohl(old->ce_mode); *sha1p = sha1;
*modep = mode;
return 0;
}
static int show_new_file(struct cache_entry *new)
{
unsigned char *sha1;
unsigned int mode;
/* New file in the index: it might actually be different in the working copy */
if (get_stat_data(new, &sha1, &mode) < 0)
return -1;
show_file("+", new, sha1, mode);
}
static int show_modified(struct cache_entry *old, struct cache_entry *new)
{
unsigned int mode, oldmode;
unsigned char *sha1;
unsigned char old_sha1_hex[60];
if (get_stat_data(new, &sha1, &mode) < 0) {
show_file("-", old, old->sha1, old->ce_mode);
return -1;
}
oldmode = old->ce_mode;
if (mode == oldmode && !memcmp(sha1, old->sha1, 20)) if (mode == oldmode && !memcmp(sha1, old->sha1, 20))
return 0; return 0;
mode = ntohl(mode);
oldmode = ntohl(oldmode);
if (generate_patch) if (generate_patch)
diff_change(oldmode, mode, diff_change(oldmode, mode,
old->sha1, sha1, old->name, NULL); old->sha1, sha1, old->name, NULL);
@ -64,7 +90,7 @@ static int diff_cache(struct cache_entry **ac, int entries)
case 0: case 0:
/* No stage 1 entry? That means it's a new file */ /* No stage 1 entry? That means it's a new file */
if (!same) { if (!same) {
show_file("+", ce); show_new_file(ce);
break; break;
} }
/* Show difference between old and new */ /* Show difference between old and new */
@ -73,7 +99,7 @@ static int diff_cache(struct cache_entry **ac, int entries)
case 1: case 1:
/* No stage 3 (merge) entry? That means it's been deleted */ /* No stage 3 (merge) entry? That means it's been deleted */
if (!same) { if (!same) {
show_file("-", ce); show_file("-", ce, ce->sha1, ce->ce_mode);
break; break;
} }
/* Otherwise we fall through to the "unmerged" case */ /* Otherwise we fall through to the "unmerged" case */