summaryrefslogtreecommitdiff
path: root/sha1_file.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-06-11 13:31:19 -0700
committerJunio C Hamano <gitster@pobox.com>2013-06-11 13:31:19 -0700
commitcf6de2968c7d4fdfb80885f1223f9fd8535ff2b7 (patch)
tree37ab6dd9dca47374c8c43c69b33daa8c47662aaf /sha1_file.c
parentf4c52a05277f8f5901f7663f6ab339271b814872 (diff)
parentdbea72a8c05d12c7dfd6a35376e62b21d5a655b5 (diff)
downloadgit-cf6de2968c7d4fdfb80885f1223f9fd8535ff2b7.tar.gz
Merge branch 'tr/sha1-file-silence-loose-object-info-under-prune-race'
* tr/sha1-file-silence-loose-object-info-under-prune-race: sha1_file: silence sha1_loose_object_info
Diffstat (limited to 'sha1_file.c')
-rw-r--r--sha1_file.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sha1_file.c b/sha1_file.c
index b114cc922d..5c08701ae8 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -2348,7 +2348,7 @@ static int sha1_loose_object_info(const unsigned char *sha1, unsigned long *size
map = map_sha1_file(sha1, &mapsize);
if (!map)
- return error("unable to find %s", sha1_to_hex(sha1));
+ return -1;
if (unpack_sha1_header(&stream, map, mapsize, hdr, sizeof(hdr)) < 0)
status = error("unable to unpack %s header",
sha1_to_hex(sha1));