development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-07-16 18:48:26 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Merge branch 'mh/show-branch-topic'

Browse source 
"git show-branch --topics HEAD" (with no other arguments) did not
do anything interesting.  Instead, contrast the given revision
against all the local branches by default.

* mh/show-branch-topic:
  show-branch: show all local heads when only giving one rev along --topics
This commit is contained in:
Junio C Hamano 2015-05-05 21:00:25 -07:00
parent 8ff1ddd717 539d09c3b4
commit b02a94d663
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
builtin/show-branch.c
View file

@ -718,7 +718,7 @@ int cmd_show_branch(int ac, const char **av, const char *prefix)
}
/* If nothing is specified, show all branches by default */
if (ac + all_heads + all_remotes == 0)
if (ac <= topics && all_heads + all_remotes == 0)
all_heads = 1;
if (reflog) {
@ -785,13 +785,13 @@ int cmd_show_branch(int ac, const char **av, const char *prefix)
}
free(ref);
}
else if (all_heads + all_remotes)
snarf_refs(all_heads, all_remotes);
else {
while (0 < ac) {
append_one_rev(*av);
ac--; av++;
}
if (all_heads + all_remotes)
snarf_refs(all_heads, all_remotes);
}
head_p = resolve_ref_unsafe("HEAD", RESOLVE_REF_READING,