diff options
author | Junio C Hamano <gitster@pobox.com> | 2011-04-15 13:25:50 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-04-15 13:27:04 -0700 |
commit | ed44fd045a8a4bcf7f30a47e4fc6aba761faaf78 (patch) | |
tree | ccc8afe7eb85ec89347047f8e3fb5ff7f4c2f6a6 /builtin/fsck.c | |
parent | e0d48279d5a96bc02edac72c1d28fc38aed37c15 (diff) | |
parent | 4d8b32a2e1758236c4c1b714f179892e3bce982c (diff) | |
download | git-ed44fd045a8a4bcf7f30a47e4fc6aba761faaf78.tar.gz git-ed44fd045a8a4bcf7f30a47e4fc6aba761faaf78.tar.xz |
Merge v1.7.5-rc2 into jn/format-patch-doc
This is to sync with the recent updates in Documentation/SubmittingPatches
and Documentation/format-patch.txt
Diffstat (limited to 'builtin/fsck.c')
-rw-r--r-- | builtin/fsck.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/builtin/fsck.c b/builtin/fsck.c index 795aba087..5ae0366bc 100644 --- a/builtin/fsck.c +++ b/builtin/fsck.c @@ -140,11 +140,10 @@ static int traverse_reachable(void) int result = 0; while (pending.nr) { struct object_array_entry *entry; - struct object *obj, *parent; + struct object *obj; entry = pending.objects + --pending.nr; obj = entry->item; - parent = (struct object *) entry->name; result |= traverse_one_object(obj); } return !!result; |