[PATCH 2/2] branch: reorganize verbose options
- From
Felipe Contreras <felipe.contreras@gmail.com>
- Date
- Aug 30, 2013, 22:59 UTC
- Message-ID
- <1377903583-3550-3-git-send-email-felipe.contreras@gmail.com>
- In-Reply-To
- <1377903583-3550-1-git-send-email-felipe.contreras@gmail.com>
Showing the upstream tracking branch is more important than how many commits are ahead/behind, so now 'git branch -v' shows the upstream, but not the tracking info, and 'git branch -vv' shows all information (as before).
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> --- builtin/branch.c | 22 ++++++++++------------ t/t6040-tracking-info.sh | 8 ++++---- 2 files changed, 14 insertions(+), 16 deletions(-)
diff --git a/builtin/branch.c b/builtin/branch.c index ac17b18..baa1d31 100644 --- a/builtin/branch.c +++ b/builtin/branch.c @@ -417,15 +417,15 @@ static int ref_cmp(const void *r1, const void *r2) } static void fill_tracking_info(struct strbuf *stat, const char *branch_name, - int show_upstream_ref) + int show_tracking) { int ours, theirs; char *ref = NULL; struct branch *branch = branch_get(branch_name); struct strbuf fancy = STRBUF_INIT; - if (!stat_tracking_info(branch, &ours, &theirs)) { - if (!branch || !branch->merge || !branch->merge[0]->dst || !show_upstream_ref) + if (!show_tracking || !stat_tracking_info(branch, &ours, &theirs)) { + if (!branch || !branch->merge || !branch->merge[0]->dst) return; ref = shorten_unambiguous_ref(branch->merge[0]->dst, 0); if (want_color(branch_use_color)) @@ -437,15 +437,13 @@ static void fill_tracking_info(struct strbuf *stat, const char *branch_name, return; } - if (show_upstream_ref) { - ref = shorten_unambiguous_ref(branch->merge[0]->dst, 0); - if (want_color(branch_use_color)) - strbuf_addf(&fancy, "%s%s%s", - branch_get_color(BRANCH_COLOR_UPSTREAM), - ref, branch_get_color(BRANCH_COLOR_RESET)); - else - strbuf_addstr(&fancy, ref); - } + ref = shorten_unambiguous_ref(branch->merge[0]->dst, 0); + if (want_color(branch_use_color)) + strbuf_addf(&fancy, "%s%s%s", + branch_get_color(BRANCH_COLOR_UPSTREAM), + ref, branch_get_color(BRANCH_COLOR_RESET)); + else + strbuf_addstr(&fancy, ref); if (!ours) { if (ref) diff --git a/t/t6040-tracking-info.sh b/t/t6040-tracking-info.sh index ec2b516..86e80eb 100755 --- a/t/t6040-tracking-info.sh +++ b/t/t6040-tracking-info.sh @@ -36,10 +36,10 @@ test_expect_success setup ' script='s/^..\(b.\)[ 0-9a-f]*\[\([^]]*\)\].*/\1 \2/p' cat >expect <<\EOF -b1 ahead 1, behind 1 -b2 ahead 1, behind 1 -b3 behind 1 -b4 ahead 2 +b1 origin/master +b2 origin/master +b3 origin/master +b4 origin/master EOF test_expect_success 'branch -v' '
-- 1.8.4-fc