Use "git merge" instead of "git pull ."

diff --git a/builtin/fsck.c b/builtin/fsck.c
index bb9a2cd44722dc27d54aa5451278a10f512becb8..9909b6d519f0a7d3d3b53313e7886c9482d98ba5 100644 (file)
--- a/builtin/fsck.c
+++ b/builtin/fsck.c
@@ -112,7 +112,7 @@ static int mark_object(struct object *obj, int type, void *data)
                return 1;
        }
 
-       add_object_array(obj, (void *) parent, &pending);
+       add_object_array(obj, NULL, &pending);
        return 0;
 }