Re: [PATCH v2 9/9] sha1_name: add support for @{publish} marks

From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Apr 10, 2014, 22:28 UTC
Message-ID: <53471b02305be_d696b12f099@nysa.notmuch>
In-Reply-To: <CALkWK0nU_Esy6QoQG-vv3nKE=P=gWDiFgRp4RKvq4DbxOntkaA@mail.gmail.com>

Ramkumar Ramachandra wrote:

Show 17 quoted lines

> Felipe Contreras wrote:
> > diff --git a/sha1_name.c b/sha1_name.c
> > index aa3f3e0..a36852d 100644
> > --- a/sha1_name.c
> > +++ b/sha1_name.c
> > @@ -415,9 +415,9 @@ static int ambiguous_path(const char *path, int len)
> >         return slash;
> >  }
> >
> > -static inline int upstream_mark(const char *string, int len)
> > +static inline int tracking_mark(const char *string, int len)
> >  {
> > -       const char *suffix[] = { "upstream", "u" };
> > +       const char *suffix[] = { "upstream", "u", "publish", "p" };
> 
> Oh, another thing: on some threads, people decided that "@{push}"
> would be a more apt name (+ alias @{u} to @{pull} for symmetry).

@{push} is the name I originally suggested, but it's weird to talk about "the push branch", so I decided on "the publish branch", which is more natural.

-- 
Felipe Contreras