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

2014-04-10 Thread Felipe Contreras
Ramkumar Ramachandra wrote: > 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; > > } > > > > -stati

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

2014-04-10 Thread Felipe Contreras
Ramkumar Ramachandra wrote: > Felipe Contreras wrote: > > @@ -1068,23 +1069,35 @@ static const char *get_upstream_branch(const char > > *name_buf, int len) > > */ > > if (!branch) > > die(_("HEAD does not point to a branch")); > > - if (!branch->merge || !bra

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

2014-04-10 Thread Ramkumar Ramachandra
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, i

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

2014-04-10 Thread Ramkumar Ramachandra
Felipe Contreras wrote: > @@ -1068,23 +1069,35 @@ static const char *get_upstream_branch(const char > *name_buf, int len) > */ > if (!branch) > die(_("HEAD does not point to a branch")); > - if (!branch->merge || !branch->merge[0]->dst) { > - if

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

2014-04-10 Thread Felipe Contreras
Signed-off-by: Felipe Contreras --- Documentation/revisions.txt | 4 sha1_name.c | 49 - t/t1508-at-combinations.sh | 5 + 3 files changed, 40 insertions(+), 18 deletions(-) diff --git a/Documentation/revisions.txt b/Documen