On 2009.07.23 22:13:43 -0700, Junio C Hamano wrote:
> Johannes Schindelin <johannes.schindelin@xxxxxx> writes:
>
> > diff --git a/commit.c b/commit.c
> > index a47fb4d..ef8e911 100644
> > --- a/commit.c
> > +++ b/commit.c
> > @@ -262,7 +262,7 @@ int parse_commit_buffer(struct commit *item, void *buffer, unsigned long size)
> > bufptr[47] != '\n')
> > return error("bad parents in commit %s", sha1_to_hex(item->object.sha1));
> > bufptr += 48;
> > - if (graft)
> > + if (graft && (graft->nr_parent < 0 || grafts_replace_parents))
> > continue;
>
> Hmm, what is this "if it is negative" check for? I did not see it
> mentioned in the proposed commit log message.
That's for the special grafts for shallow clones. They override the
other grafts, and are identified by the negative nr_parent value. Those
have to stay in effect as the original parents aren't present in the
repo.
Björn
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html