Browse Source

Make sure we barf on ref^{type} failure.

Martin Langhoff noticed that ref^0 barfed correctly when we did not
have the commit in a broken repository, but ref^{commit} didn't.

Signed-off-by: Junio C Hamano <junkio@cox.net>
maint
Junio C Hamano 20 years ago
parent
commit
6e1c6c103c
  1. 4
      sha1_name.c

4
sha1_name.c

@ -323,6 +323,8 @@ static int peel_onion(const char *name, int len, unsigned char *sha1) @@ -323,6 +323,8 @@ static int peel_onion(const char *name, int len, unsigned char *sha1)
return -1;
if (!type_string) {
o = deref_tag(o);
if (!o || (!o->parsed && !parse_object(o->sha1)))
return -1;
memcpy(sha1, o->sha1, 20);
}
else {
@ -332,7 +334,7 @@ static int peel_onion(const char *name, int len, unsigned char *sha1) @@ -332,7 +334,7 @@ static int peel_onion(const char *name, int len, unsigned char *sha1)
*/

while (1) {
if (!o)
if (!o || (!o->parsed && !parse_object(o->sha1)))
return -1;
if (o->type == type_string) {
memcpy(sha1, o->sha1, 20);

Loading…
Cancel
Save