Re: [PATCHv2 10/10] branch: Fix display of remote branches in refs/peers/*

2013-05-12 Thread Johan Herland
On Mon, May 13, 2013 at 7:19 AM, Eric Sunshine wrote: > On Sat, May 11, 2013 at 12:21 PM, Johan Herland wrote: >> +* When displaying more then just remote-tracking branches, make the > s/then/than/ Thanks, will fix. ...Johan -- Johan Herland, www.herland.net -- To unsubscribe from th

Re: [PATCHv2 10/10] branch: Fix display of remote branches in refs/peers/*

2013-05-12 Thread Eric Sunshine
On Sat, May 11, 2013 at 12:21 PM, Johan Herland wrote: > diff --git a/builtin/branch.c b/builtin/branch.c > index 4480be2..9a6bce8 100644 > --- a/builtin/branch.c > +++ b/builtin/branch.c > @@ -328,74 +326,80 @@ static int append_ref(const char *refname, const > unsigned char *sha1, int flags, >

[PATCHv2 10/10] branch: Fix display of remote branches in refs/peers/*

2013-05-11 Thread Johan Herland
The current branch display code assumes all remote-tracking branches live inside refs/remotes/*, and that their appropriate shorthand names can be retrieved by simply stripping off the "refs/remotes/" prefix. When we add remote-tracking branches in refs/peers/$remote/heads/*, the code must not onl