Re: [PATCH v2 6/9] branch: display publish branch

From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Apr 18, 2014, 23:29 UTC
Message-ID: <5351b571421e4_3497cdf30c78@nysa.notmuch>
In-Reply-To: <20140415054356.GA4772@sigill.intra.peff.net>

Jeff King wrote:

Show 15 quoted lines

> On Sat, Apr 12, 2014 at 10:05:15AM -0500, Felipe Contreras wrote:
> 
> > As you can see; some branches are published, others are not. The ones that are
> > not published don't have a @{publish}, and `git branch -v` doesn't show them.
> > Why is that hard to understand?
> 
> Do you ever push the unpublished branches anywhere at all? If not, then
> you would not have a tracking branch. E.g., git _would_ push to remote
> "gh", branch "refs/heads/topic", but there is no remote tracking branch
> "refs/remotes/gh/topic", because you have never actually pushed there.
> So there is no @{publish} branch.
> 
> Or do you have some branches in a state where they are "pushed, but not
> published"? It wasn't clear to me from your example if your "pu" or
> "dev/remote/hg-extra" ever get pushed.

Sometimes I do push these branches, but I don't understand what you mean by "pushed state". When you push something no states are changed. Say I do:

 % git push tmp wip-feature
 % git push backup wip-feature

So I pushed a branch to two different repositories, the former one might not even exist any more. Who cares? No states have changed. The fact that this branch was pushed doesn't change anything about the nature of the branch.

> I do not use "git branch -v" myself,

Me neither (at least not the upstream version).

Show 6 quoted lines

> so I don't personally care that much how it behaves. But I do use a separate
> script that does the same thing, and I would want it to show the ahead/behind
> relationship between each branch and where it would be pushed to (and as I
> said, I define mine with refspecs). Right now it uses nasty hackery to guess
> at where things will be pushed, but ideally it would ask git via @{push} or
> some similar mechanism.

Yes, but you can push a branch to many locations, to which one should the script show the tracking information? IMO it should be the one location you explicitly configured, and in the case of "wip-feature" is "no location".

> If the former (you do not actually push them), then I think the semantics I
> am looking for and the ones you want would coincide. If not, then I think we
> are really talking about two different things.

I ask again what is so difficult about the notion that there are two kinds of branches?

A)

% git checkout ready-feature % git push tmp ready-feature % git push -p github ready-feature % git push backup ready-feature

B)

% git checkout wip-feature % git push tmp wip-feature % git push backup wip-feature

In a haste these branches might not look very different, but conceptually they are. One has a location where it is publicly visible, and where you wish to push regularly, the other one doesn't.

Whether you push a branch or not is not really important, it's whether or not the branch has a *special* place where you push to.

-- 
Felipe Contreras