From: Jiang Xin <worldhello.net@gmail.com>
To: Torstein Hegge <hegge@resisty.net>
Cc: Git List <git@vger.kernel.org>,
Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>,
Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH] branch: fix --verbose output column alignment
Date: Fri, 15 Nov 2013 09:45:16 +0800 [thread overview]
Message-ID: <CANYiYbGPo4jZ5HShivK3Qk58pBaZAEnr71AML+9K4_Yzzkm+qQ@mail.gmail.com> (raw)
In-Reply-To: <1384453081-7679-1-git-send-email-hegge@resisty.net>
2013/11/15 Torstein Hegge <hegge@resisty.net>:
> Commit f2e0873 (branch: report invalid tracking branch as gone) removed
> an early return from fill_tracking_info() in the path taken when 'git
> branch -v' lists a branch in sync with its upstream. This resulted in an
> unconditionally added space in front of the subject line:
>
> $ git branch -v
> * master f5eb3da commit pushed to upstream
> topic f935eb6 unpublished topic
Thank you for catching this. Confirmed that the output of "git branch -v"
is not aligned well. This example may be more clear ;-)
$ git branch -v
branch1 f0ec0da [ahead 1, behind 2] divert from upstream
branch2 f5eb3da commit pushed to upstream
branch3 f935eb6 unpublished topic
>
> Instead, only add the trailing space if a decoration have been added.
>
> To catch this kind of whitespace breakage in the tests, be a bit less
> smart when filtering the output through sed.
>
> Signed-off-by: Torstein Hegge <hegge@resisty.net>
> ---
> builtin/branch.c | 8 +++++++-
> t/t6040-tracking-info.sh | 24 +++++++++++++-----------
> 2 files changed, 20 insertions(+), 12 deletions(-)
>
> diff --git a/builtin/branch.c b/builtin/branch.c
> index 0bb0e93..636a16e 100644
> --- a/builtin/branch.c
> +++ b/builtin/branch.c
> @@ -424,6 +424,7 @@ static void fill_tracking_info(struct strbuf *stat, const char *branch_name,
> struct branch *branch = branch_get(branch_name);
> struct strbuf fancy = STRBUF_INIT;
> int upstream_is_gone = 0;
> + int added_decoration = 1;
>
> switch (stat_tracking_info(branch, &ours, &theirs)) {
> case 0:
> @@ -451,9 +452,13 @@ static void fill_tracking_info(struct strbuf *stat, const char *branch_name,
> if (upstream_is_gone) {
> if (show_upstream_ref)
> strbuf_addf(stat, _("[%s: gone]"), fancy.buf);
> + else
> + added_decoration = 0;
> } else if (!ours && !theirs) {
> if (show_upstream_ref)
> strbuf_addf(stat, _("[%s]"), fancy.buf);
> + else
> + added_decoration = 0;
> } else if (!ours) {
> if (show_upstream_ref)
> strbuf_addf(stat, _("[%s: behind %d]"), fancy.buf, theirs);
> @@ -474,7 +479,8 @@ static void fill_tracking_info(struct strbuf *stat, const char *branch_name,
> ours, theirs);
> }
> strbuf_release(&fancy);
> - strbuf_addch(stat, ' ');
> + if (added_decoration)
> + strbuf_addch(stat, ' ');
> free(ref);
> }
>
How about add "strbuf_addch(stat, ' ');" to each condition directly, like this:
if (upstream_is_gone) {
if (show_upstream_ref) {
strbuf_addf(stat, _("[%s: gone]"), fancy.buf);
strbuf_addch(stat, ' ');
}
} else if (!ours && !theirs) {
if (show_upstream_ref) {
strbuf_addf(stat, _("[%s]"), fancy.buf);
strbuf_addch(stat, ' ');
}
} else if (!ours) {
if (show_upstream_ref)
strbuf_addf(stat, _("[%s: behind %d]"),
fancy.buf, theirs);
else
strbuf_addf(stat, _("[behind %d]"), theirs);
strbuf_addch(stat, ' ');
} else if (!theirs) {
if (show_upstream_ref)
strbuf_addf(stat, _("[%s: ahead %d]"), fancy.buf, ours);
else
strbuf_addf(stat, _("[ahead %d]"), ours);
strbuf_addch(stat, ' ');
} else {
if (show_upstream_ref)
strbuf_addf(stat, _("[%s: ahead %d, behind %d]"),
fancy.buf, ours, theirs);
else
strbuf_addf(stat, _("[ahead %d, behind %d]"),
ours, theirs);
strbuf_addch(stat, ' ');
}
strbuf_release(&fancy);
free(ref);
--
Jiang Xin
next prev parent reply other threads:[~2013-11-15 1:45 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-14 18:18 [PATCH] branch: fix --verbose output column alignment Torstein Hegge
2013-11-15 1:45 ` Jiang Xin [this message]
2013-11-18 19:27 ` Junio C Hamano
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CANYiYbGPo4jZ5HShivK3Qk58pBaZAEnr71AML+9K4_Yzzkm+qQ@mail.gmail.com \
--to=worldhello.net@gmail.com \
--cc=Matthieu.Moy@grenoble-inp.fr \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=hegge@resisty.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).