summaryrefslogtreecommitdiff
path: root/builtin/diff.c
diff options
context:
space:
mode:
authorMichael Haggerty <mhagger@alum.mit.edu>2013-05-25 09:08:05 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-05-28 16:25:00 (GMT)
commit026f09e79689f99f573b8399443e8c4ffa84a794 (patch)
tree33cb87ea9fdf2ec36713acefb8f3c6d19db57933 /builtin/diff.c
parent33055fa823eff9f4fddb858856f9b9a8d85316fc (diff)
downloadgit-026f09e79689f99f573b8399443e8c4ffa84a794.zip
git-026f09e79689f99f573b8399443e8c4ffa84a794.tar.gz
git-026f09e79689f99f573b8399443e8c4ffa84a794.tar.bz2
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>
Diffstat (limited to 'builtin/diff.c')
-rw-r--r--builtin/diff.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/builtin/diff.c b/builtin/diff.c
index 661fdde..84243d9 100644
--- a/builtin/diff.c
+++ b/builtin/diff.c
@@ -339,9 +339,9 @@ int cmd_diff(int argc, const char **argv, const char *prefix)
}
for (i = 0; i < rev.pending.nr; i++) {
- struct object_array_entry *list = rev.pending.objects+i;
- struct object *obj = list->item;
- const char *name = list->name;
+ struct object_array_entry *entry = &rev.pending.objects[i];
+ struct object *obj = entry->item;
+ const char *name = entry->name;
int flags = (obj->flags & UNINTERESTING);
if (!obj->parsed)
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);
hashcpy(blob[blobs].sha1, obj->sha1);
blob[blobs].name = name;
- blob[blobs].mode = list->mode;
+ blob[blobs].mode = entry->mode;
blobs++;
continue;