undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

branch --contains: default to HEAD

Browse Source 
We used to require the name of the commit to limit the branches shown to
the --contains option, but more recent --merged/--no-meregd defaults to
HEAD (and they do not allow arbitrary commit, which is a separate issue).

This teaches --contains to default to HEAD when no parameter is given.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2008-07-08 17:31:51 -07:00
parent 1cc6985ca7
commit e84fb2ff75
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
builtin-branch.c
View File

@ -438,13 +438,17 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
OPT_BOOLEAN( 0 , "color", &branch_use_color, "use colored output"), OPT_BOOLEAN( 0 , "color", &branch_use_color, "use colored output"),
OPT_SET_INT('r', NULL, &kinds, "act on remote-tracking branches", OPT_SET_INT('r', NULL, &kinds, "act on remote-tracking branches",
REF_REMOTE_BRANCH), REF_REMOTE_BRANCH),
OPT_CALLBACK(0, "contains", &with_commit, "commit", {
"print only branches that contain the commit", OPTION_CALLBACK, 0, "contains", &with_commit, "commit",
opt_parse_with_commit), "print only branches that contain the commit",
PARSE_OPT_LASTARG_DEFAULT,
opt_parse_with_commit, (intptr_t)"HEAD",
},
{ {
OPTION_CALLBACK, 0, "with", &with_commit, "commit", OPTION_CALLBACK, 0, "with", &with_commit, "commit",
"print only branches that contain the commit", "print only branches that contain the commit",
PARSE_OPT_HIDDEN, opt_parse_with_commit, PARSE_OPT_HIDDEN | PARSE_OPT_LASTARG_DEFAULT,
opt_parse_with_commit, (intptr_t) "HEAD",
}, },
OPT__ABBREV(&abbrev), OPT__ABBREV(&abbrev),