X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=upload-pack.c;h=470cffd7c14a9f28010423a44327084219598a35;hb=dbdc07fcbe3a951df8a3869b42edb6fffd466486;hp=8739bfacdfd4e01e16a614dd419388fa93a904b6;hpb=110c511dbeff65f7ae92216cf1d976a9093d911f;p=git.git

diff --git a/upload-pack.c b/upload-pack.c
index 8739bfacd..470cffd7c 100644
--- 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)