Re: [PATCH v3] status: always show tracking branch even no change

From: Junio C Hamano <gitster@pobox.com>
Date: Aug 9, 2013, 21:18 UTC
Message-ID: <7vob964l6v.fsf@alter.siamese.dyndns.org>
In-Reply-To: <0affa278c225273a2d3fdcf8f55b61e26d322f1e.1375972599.git.worldhello.net@gmail.com>

Jiang Xin <worldhello.net@gmail.com> writes:

Show 27 quoted lines

> If the current branch has an upstream branch, and there are changes
> between the current branch and its upstream, some commands (such as
> "git status", "git status -bs", and "git checkout") will report their
> relationship. E.g.
>
>     $ git status
>     # On branch master
>     # Your branch is ahead of 'origin/master' by 1 commit.
>     #   (use "git push" to publish your local commits)
>     #
>     ...
>
>     $ git status -bs
>     ## master...origin/master [ahead 1]
>     ...
>
>     $ git checkout master
>     Already on 'master'
>     Your branch is ahead of 'origin/master' by 1 commit.
>       (use "git push" to publish your local commits)
>
> But if there is no difference between the current branch and its
> upstream, the relationship will not be reported, and it's hard to
> tell whether the current branch has a tracking branch or not. And
> what's worse, when the 'push.default' config variable is set to
> `matching`, it's hard to tell whether the current branch has already
> been pushed out or not at all [1].

That description of the problem you are trying to solve makes (sort of) sense.

Show 13 quoted lines

> So always show the remote tracking branch in the output of "git status"
> and other commands will help users to see where the current branch
> will push to and pull from. E.g.
>
>     $ git status
>     # On branch master
>     # Your branch is identical to 'origin/master'.
>     #
>     ...
>
>     $ git status -bs
>     ## master...origin/master
>     ...

Hmmph.

I do not know if this will help any case you described above, even though this might help some other cases. The added output is to always show the current branch and its upstream, but the thing is, the original issue in $gmane/198703 was *not* that the current branch was pushed and up to date. It was that there was no current branch to be pushed. The same thing would happen if you are on a local branch that is not set to be pushed to the other side (e.g. the configuration is set to "matching" and there is no such branch on the other end).

"Your branch is identical to" will be given only if your branch is set to be pushed out, no? For the user to tell what is going on, the user has to notice the lack of this extra line in the output, and noticing the lack of anything is much unlikely.