summaryrefslogtreecommitdiff
path: root/builtin/branch.c
diff options
context:
space:
mode:
authorTorstein Hegge <hegge@resisty.net>2013-11-14 18:18:01 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-11-18 19:24:08 (GMT)
commit6b364d48f2e72d6c37115e6aa4fe769a523dd1d4 (patch)
treea93d71d4dc4482700970cc9f42fb9f6cad80e170 /builtin/branch.c
parentf223459bec106bbe211a01321e48c050a9cad25e (diff)
downloadgit-6b364d48f2e72d6c37115e6aa4fe769a523dd1d4.zip
git-6b364d48f2e72d6c37115e6aa4fe769a523dd1d4.tar.gz
git-6b364d48f2e72d6c37115e6aa4fe769a523dd1d4.tar.bz2
branch: fix --verbose output column alignment
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 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> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/branch.c')
-rw-r--r--builtin/branch.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/builtin/branch.c b/builtin/branch.c
index 0539fda..a8f59ef 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);
}