diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-06-11 20:31:19 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-06-11 20:31:19 (GMT) |
| commit | cf6de2968c7d4fdfb80885f1223f9fd8535ff2b7 (patch) | |
| tree | 37ab6dd9dca47374c8c43c69b33daa8c47662aaf /sha1_file.c | |
| parent | f4c52a05277f8f5901f7663f6ab339271b814872 (diff) | |
| parent | dbea72a8c05d12c7dfd6a35376e62b21d5a655b5 (diff) | |
| download | git-cf6de2968c7d4fdfb80885f1223f9fd8535ff2b7.zip git-cf6de2968c7d4fdfb80885f1223f9fd8535ff2b7.tar.gz git-cf6de2968c7d4fdfb80885f1223f9fd8535ff2b7.tar.bz2 | |
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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sha1_file.c b/sha1_file.c index b114cc9..5c08701 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)); |