Merge branch 'sp/smart-http-failure'

[git.git] / upload-pack.c

diff --git a/upload-pack.c b/upload-pack.c
index 6420918abea3a9a33ad967d263153e4548daab29..470cffd7c14a9f28010423a44327084219598a35 100644 (file)
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -84,22 +84,11 @@ static void show_commit(struct commit *commit, void *data)
        commit->buffer = NULL;
 }
 
-static void show_object(struct object *obj, const struct name_path *path, const char *component)
+static void show_object(struct object *obj,
+                       const struct name_path *path, const char *component,
+                       void *cb_data)
 {
-       /* An object with name "foo\n0000000..." can be used to
-        * confuse downstream git-pack-objects very badly.
-        */
-       const char *name = path_name(path, component);
-       const char *ep = strchr(name, '\n');
-       if (ep) {
-               fprintf(pack_pipe, "%s %.*s\n", sha1_to_hex(obj->sha1),
-                      (int) (ep - name),
-                      name);
-       }
-       else
-               fprintf(pack_pipe, "%s %s\n",
-                               sha1_to_hex(obj->sha1), name);
-       free((char *)name);
+       show_object_with_name(pack_pipe, obj, path, component);
 }
 
 static void show_edge(struct commit *commit)
@@ -533,6 +522,8 @@ static void check_non_tip(void)
        namebuf[41] = '\n';
        for (i = get_max_object_index(); 0 < i; ) {
                o = get_indexed_object(--i);
+               if (!o)
+                       continue;
                if (!(o->flags & OUR_REF))
                        continue;
                memcpy(namebuf + 1, sha1_to_hex(o->sha1), 40);