Re: What's cooking in git.git (Sep 2013, #01; Tue, 3)

From: Junio C Hamano <gitster@pobox.com>
Date: Sep 6, 2013, 16:28 UTC
Message-ID: <xmqqr4d1zzh7.fsf@gitster.dls.corp.google.com>
In-Reply-To: <CANYiYbGHKDENMCnWaRtb_=HmpenxWA95H-bfHdWM8f6098sT6g@mail.gmail.com>

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

Show 14 quoted lines

> 2013/9/4 Junio C Hamano <gitster@pobox.com>:
>> * jx/branch-vv-always-compare-with-upstream (2013-08-26) 2 commits
>>  - status: always show tracking branch even no change
>>  - branch: report invalid tracking branch as gone
>>
>>  "git branch -v -v" (and "git status") did not distinguish among a
>>  branch that does not build on any other branch, a branch that is in
>>  sync with the branch it builds on, and a branch that is configured
>>  to build on some other branch that no longer exists.
>>
>>  Am I waiting for another reroll?
>
> No more reroll if no more votes for “absent" vs "gone", and
> "in sync with" vs "up-to-date with".

I re-read the thread and the way I read both of these choices is that they were merely "this other word is also possible, may be better, but may be not." and not meant as strong recommendations.

Since that seems to be the only remaining issue, let's unchock and merge the topic to 'next'.

Thanks.

Show 17 quoted lines

> Currently, we choose "gone”
> and "up-to-date with", such as:
>
>         $ git branch -v -v
>           master    e67ac84 initial
>         * topic     3fc0f2a [topicbase: gone] topic
>
>         $ git status
>         # On branch topic
>         # Your branch is based on 'topicbase', but the upstream is gone.
>         #   (use "git branch --unset-upstream" to fixup)
>         ...
>
>         $ git status
>         # On branch feature1
>         # Your branch is up-to-date with 'github/feature1'.
>         ...