Skip to contentSkip to conversation

show tracking branches with their associated branch names

RFC/PATCH Santhosh Kumar Mani 3 participants 5 messages Jun 15, 2016

lore
Share & tools
lore
#0 lore raw

The "git branch" command, by default, displays the local branches. There is no visual distinction made between the tracking branches and normal local branches. This patch enables the "git branch" to display tracking info for tracking branches:

Before this patch:

  $ git branch
  * master
    local

After this patch:

  $ git branch
  * master [origin/master]
    local
---
 builtin/branch.c |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 deletions(-)
builtin/branch.c +1 -0
index e1e486e..4841416 100644
@@ -373,6 +373,19 @@ static int ref_cmp(const void *r1, const void *r2)
 	return strcmp(c1->name, c2->name);
 }
 
+static int get_tracking_branch_name(struct strbuf *name, const char

*branch_name)
+{
+ struct branch *branch = branch_get(branch_name);
+
+ if (branch && branch->merge && branch->merge[0]->dst) {
+ strbuf_addf(name, " [%s]",
+ shorten_unambiguous_ref(branch->merge[0]->dst, 0));
+ return 1;
+ }
+
+ return 0;
+}
+
static void fill_tracking_info(struct strbuf *stat, const char
*branch_name,
int show_upstream_ref)
{
@@ -475,6 +488,9 @@ static void print_ref_item(struct ref_item *item, int maxwidth, int verbose,
else if (verbose)
/* " f7c0c00 [ahead 58, behind 197] vcs-svn: drop obj_pool.h" */ add_verbose_info(&out, item, verbose, abbrev);
+ else if (get_tracking_branch_name(&out, item->name))
+ ;
+
printf("%s\n", out.buf);
strbuf_release(&name);
strbuf_release(&out);

Signature · 1 line
1.7.0.4
#1 lore raw

Op 10-12-2011 8:40, Santhosh Kumar Mani schreef:

Quoted 6 lines

The "git branch" command, by default, displays the local branches. There is no visual distinction made between the tracking branches and normal local branches. This patch enables the "git branch" to display tracking info for tracking branches:

Before this patch:

Quoted 10 lines
   $ git branch
   * master
     local

After this patch:

   $ git branch
   * master [origin/master]
     local

Did you try "git branch -vv" ?

Vincent

#2 lore raw
Quoted 11 lines · Vincent van Ravesteijn

Op 10-12-2011 8:40, Santhosh Kumar Mani schreef:

Quoted 10 lines

The "git branch" command, by default, displays the local branches. There is no visual distinction made between the tracking branches and normal local branches. This patch enables the "git branch" to display tracking info for tracking branches:

Before this patch:

   $ git branch
   * master
     local
Quoted 8 lines
Quoted 6 lines

After this patch:

   $ git branch
   * master [origin/master]
     local

Did you try "git branch -vv" ?

Yes. I did. It is too verbose as it meant to be.

This patch distinguishes between the tracking and non-tracking local branches.

I use a lot of tracking branches and they track different branches. I tend find this feature useful to know which branch tracks what.

Of course, I could get this information in different ways. But it makes sense to have this information displayed by default.

Quoted 1 line

Vincent

Regards,
Santhosh.

#3 lore raw
Quoted 2 lines · Santhosh Kumar Mani

Of course, I could get this information in different ways. But it makes sense to have this information displayed by default.

It makes sense to make the various information available, but it does not mean it makes sense to add it by default for everybody at all. Given that against all common sense, many newbie web-tips and third-party documents suggest "git branch | sed -ne 's/^\* //p'" as a way to find the current branch in scripts, I am sure such a change will cause trouble to many while only helping a few.

I wouldn't mind a new option --verbose-format=... that takes various formatting letters similar to how --pretty=format:... does, though.

author
#4 lore raw
Quoted 8 lines · Junio C Hamano

It makes sense to make the various information available, but it does not mean it makes sense to add it by default for everybody at all. Given that against all common sense, many newbie web-tips and third-party documents suggest "git branch | sed -ne 's/^\* //p'" as a way to find the current branch in scripts, I am sure such a change will cause trouble to many while only helping a few.

You certainly have a point.

Quoted 3 lines

I wouldn't mind a new option --verbose-format=... that takes various formatting letters similar to how --pretty=format:... does, though.

I will explore this option and see if it is worth the trouble. Probably I can accomplish this locally with an alias.

~Santhosh.