mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
branch --contains: default to HEAD
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:
parent
1cc6985ca7
commit
e84fb2ff75
|
@ -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_SET_INT('r', NULL, &kinds, "act on remote-tracking branches",
|
||||
REF_REMOTE_BRANCH),
|
||||
OPT_CALLBACK(0, "contains", &with_commit, "commit",
|
||||
"print only branches that contain the commit",
|
||||
opt_parse_with_commit),
|
||||
{
|
||||
OPTION_CALLBACK, 0, "contains", &with_commit, "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",
|
||||
"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),
|
||||
|
||||
|
|
Loading…
Reference in a new issue