cmd_diff(): rename local variable "list" -> "entry"
It's not a list, it's an array entry. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
33055fa823
commit
026f09e796
@ -339,9 +339,9 @@ int cmd_diff(int argc, const char **argv, const char *prefix)
|
|||||||
}
|
}
|
||||||
|
|
||||||
for (i = 0; i < rev.pending.nr; i++) {
|
for (i = 0; i < rev.pending.nr; i++) {
|
||||||
struct object_array_entry *list = rev.pending.objects+i;
|
struct object_array_entry *entry = &rev.pending.objects[i];
|
||||||
struct object *obj = list->item;
|
struct object *obj = entry->item;
|
||||||
const char *name = list->name;
|
const char *name = entry->name;
|
||||||
int flags = (obj->flags & UNINTERESTING);
|
int flags = (obj->flags & UNINTERESTING);
|
||||||
if (!obj->parsed)
|
if (!obj->parsed)
|
||||||
obj = parse_object(obj->sha1);
|
obj = parse_object(obj->sha1);
|
||||||
@ -360,7 +360,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;
|
blob[blobs].mode = entry->mode;
|
||||||
blobs++;
|
blobs++;
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user