Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
merge-recursive: Fix rename/rename(1to2) resolution for virtual merge base
[gitweb.git]
/
fsck.c
diff --git
a/fsck.c
b/fsck.c
index 6f266c1ea4b8df503c211170741fa5b490a6a02a..60bd4bbf6a2206e2b1991093ea5d84be7f338f73 100644
(file)
--- a/
fsck.c
+++ b/
fsck.c
@@
-349,7
+349,7
@@
int fsck_error_function(struct object *obj, int type, const char *fmt, ...)
va_list ap;
struct strbuf sb = STRBUF_INIT;
- strbuf_addf(&sb, "object %s:",
obj->sha1?sha1_to_hex(obj->sha1):"(null)"
);
+ strbuf_addf(&sb, "object %s:",
sha1_to_hex(obj->sha1)
);
va_start(ap, fmt);
strbuf_vaddf(&sb, fmt, ap);