提交 df373ea9 编写于 作者: J Junio C Hamano

show-branch -g: default to HEAD

Signed-off-by: NJunio C Hamano <junkio@cox.net>
上级 a9eefb3b
...@@ -662,13 +662,13 @@ int cmd_show_branch(int ac, const char **av, const char *prefix) ...@@ -662,13 +662,13 @@ int cmd_show_branch(int ac, const char **av, const char *prefix)
} }
ac--; av++; ac--; av++;
if (!!extra || !!reflog) { if (extra || reflog) {
/* "listing" mode is incompatible with /* "listing" mode is incompatible with
* independent nor merge-base modes. * independent nor merge-base modes.
*/ */
if (independent || merge_base) if (independent || merge_base)
usage(show_branch_usage); usage(show_branch_usage);
if (!!reflog && ((0 < extra) || all_heads || all_remotes)) if (reflog && ((0 < extra) || all_heads || all_remotes))
/* /*
* Asking for --more in reflog mode does not * Asking for --more in reflog mode does not
* make sense. --list is Ok. * make sense. --list is Ok.
...@@ -682,15 +682,22 @@ int cmd_show_branch(int ac, const char **av, const char *prefix) ...@@ -682,15 +682,22 @@ int cmd_show_branch(int ac, const char **av, const char *prefix)
if (ac + all_heads + all_remotes == 0) if (ac + all_heads + all_remotes == 0)
all_heads = 1; all_heads = 1;
if (all_heads + all_remotes)
snarf_refs(all_heads, all_remotes);
if (reflog) { if (reflog) {
unsigned char sha1[20]; unsigned char sha1[20];
char nth_desc[256]; char nth_desc[256];
char *ref; char *ref;
int base = 0; int base = 0;
if (ac == 0) {
static const char *fake_av[2];
fake_av[0] = "HEAD";
fake_av[1] = NULL;
av = fake_av;
ac = 1;
}
if (ac != 1) if (ac != 1)
die("--reflog option needs one branch name"); die("--reflog option needs one branch name");
if (MAX_REVS < reflog) if (MAX_REVS < reflog)
die("Only %d entries can be shown at one time.", die("Only %d entries can be shown at one time.",
MAX_REVS); MAX_REVS);
...@@ -735,6 +742,8 @@ int cmd_show_branch(int ac, const char **av, const char *prefix) ...@@ -735,6 +742,8 @@ int cmd_show_branch(int ac, const char **av, const char *prefix)
append_ref(nth_desc, sha1, 1); append_ref(nth_desc, sha1, 1);
} }
} }
else if (all_heads + all_remotes)
snarf_refs(all_heads, all_remotes);
else { else {
while (0 < ac) { while (0 < ac) {
append_one_rev(*av); append_one_rev(*av);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册