Subject: Re: [PATCH 13/13] Build in merge

From: Jakub Narebski <[email-masked]>
Date: Sun, 29 Jun 2008 10:11:13 +0200

Junio C Hamano wrote:
> Miklos Vajna <[email-masked]> writes:

>> +             if (!remote_head)
>> +                     die("%s - not something we can merge", argv[0]);
>> +             update_ref("initial pull", "HEAD", remote_head->sha1, NULL, 0,
>> +                             DIE_ON_ERR);
>> +             reset_hard(remote_head->sha1, 0);
>> +             return 0;
> 
> Makes one wonder reset_hard() (aka "read-tree --reset -u HEAD") ever fail
> and return here (iow, without calling die()).  The answer is luckily no
> in this case, but it is somewhat unnerving to reviewers.

Do we have some guidelines on how to mark such non-returning calls,
or how to mark unreachable code (splint, formerly lclint, uses for
this /*@ unreachable @*/ annotation)?
-- 
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git