From: Junio C Hamano <gitster@pobox•com>
To: Jiang Xin <worldhello.net@gmail•com>
Cc: Matthieu Moy <Matthieu.Moy@grenoble-inp•fr>,
Git List <git@vger•kernel.org>
Subject: Re: [PATCH v6 2/3] branch: report invalid tracking branch as broken
Date: Thu, 15 Aug 2013 11:38:53 -0700 [thread overview]
Message-ID: <7vmwoire82.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <8db143908bc969bbe1d720479fb6214729f7b1ae.1376590264.git.worldhello.net@gmail.com> (Jiang Xin's message of "Fri, 16 Aug 2013 02:11:22 +0800")
Jiang Xin <worldhello.net@gmail•com> writes:
> If a branch has been set to track a upstream, but the upstream branch
> is missing or invalid, the tracking info is silently ignored in the
> output of some commands such as "git branch -vv" and "git status",
> as if there were no such tracking settings.
>
> Junio suggested broken upstream should be reported [1]. E.g.
>
> $ git branch -v -v
> master e67ac84 initial
> * topic 3fc0f2a [topicbase: broken] topic
I'd assume this is s/broken/gone/ to match what the rest of the log
message says?
> $ git status
> # On branch topic
> # Your branch is based on a broken ref 'topicbase'.
> # (use "git branch --unset-upstream" to fixup)
> ...
>
> $ git status -b -s
> ## topic...topicbase [broken]
> ...
>
> In order to do like that, we need to distinguish these three cases
> (i.e. no tracking, with configured but no longer valid tracking, and
> with tracking) in function stat_tracking_info(). So the refactored
> function stat_tracking_info() has three return values: -1 (with "gone"
> base), 0 (no base), and 1 (with base).
next prev parent reply other threads:[~2013-08-15 18:39 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-07 15:42 [RFC] status: show tracking branch even no difference Jiang Xin
2013-08-07 15:50 ` Matthieu Moy
2013-08-07 16:03 ` Jiang Xin
2013-08-08 5:40 ` [PATCH v2] status: always show tracking branch even no change Jiang Xin
2013-08-08 14:49 ` [PATCH v3] " Jiang Xin
2013-08-08 14:49 ` Jiang Xin
2013-08-09 21:18 ` Junio C Hamano
2013-08-10 15:05 ` Jiang Xin
2013-08-12 6:15 ` Junio C Hamano
2013-08-13 4:49 ` Jiang Xin
2013-08-13 4:53 ` [PATCH v5 1/2] branch: not report invalid tracking branch Jiang Xin
2013-08-14 15:21 ` Junio C Hamano
2013-08-15 2:14 ` Jiang Xin
2013-08-14 15:38 ` Junio C Hamano
2013-08-15 18:11 ` [PATCH v6 1/3] " Jiang Xin
2013-08-15 18:11 ` [PATCH v6 2/3] branch: report invalid tracking branch as broken Jiang Xin
2013-08-15 18:38 ` Junio C Hamano [this message]
2013-08-15 22:54 ` Junio C Hamano
2013-08-16 2:29 ` [PATCH v7 0/3] some enhancements for reporting branch tracking info Jiang Xin
[not found] ` <cover.1376620130.git.worldhello.net@gmail.com>
2013-08-16 2:29 ` [PATCH v7 1/3] branch: not report invalid tracking branch Jiang Xin
2013-08-16 2:29 ` [PATCH v7 2/3] branch: mark missing tracking branch as gone Jiang Xin
2013-08-21 7:37 ` Matthieu Moy
2013-08-22 0:00 ` Jiang Xin
2013-08-16 2:29 ` [PATCH v7 3/3] status: always show tracking branch even no change Jiang Xin
2013-08-18 19:51 ` [PATCH v7 0/3] some enhancements for reporting branch tracking info Junio C Hamano
2013-08-19 0:38 ` Jiang Xin
2013-08-26 7:02 ` [PATCH v8 0/2] " Jiang Xin
2013-08-26 7:02 ` [PATCH v8 1/2] branch: report invalid tracking branch as gone Jiang Xin
2013-08-26 7:02 ` [PATCH v8 2/2] status: always show tracking branch even no change Jiang Xin
2013-08-26 7:47 ` Jeremy Rosen
2013-08-26 8:04 ` Jiang Xin
2013-08-26 16:08 ` Junio C Hamano
2013-08-26 7:21 ` [PATCH v8 0/2] some enhancements for reporting branch tracking info Junio C Hamano
2013-08-15 18:11 ` [PATCH v6 3/3] status: always show tracking branch even no change Jiang Xin
2013-08-15 22:56 ` Junio C Hamano
2013-08-13 4:53 ` [PATCH v5 2/2] " Jiang Xin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vmwoire82.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox$(echo .)com \
--cc=Matthieu.Moy@grenoble-inp$(echo .)fr \
--cc=git@vger$(echo .)kernel.org \
--cc=worldhello.net@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox