fixup! fast-export: do not refer to non-existing marks

dscho · dscho · commit eb5624e7fa89 · 2016-01-05T15:02:07.000+01:00
diff --git a/builtin/fast-export.c b/builtin/fast-export.c
@@ -856,7 +856,7 @@ static void handle_reset(const char *name, struct object *object)
 		       get_object_mark(object));
 	else
 		printf("reset %s\nfrom %s\n\n", name,
-		       sha1_to_hex(object->sha1));
+		       oid_to_hex(&object->oid));
 }
 
 static void handle_tags_and_duplicates(void)

Original file line number	Diff line number	Diff line change
`@@ -856,7 +856,7 @@ static void handle_reset(const char name, struct object object)`
`856`	`856`	`get_object_mark(object));`
`857`	`857`	`else`
`858`	`858`	`printf("reset %s\nfrom %s\n\n", name,`
`859`		`- sha1_to_hex(object->sha1));`
	`859`	`+ oid_to_hex(&object->oid));`
`860`	`860`	`}`
`861`	`861`
`862`	`862`	`static void handle_tags_and_duplicates(void)`