diff options
| author | Karthik Nayak <karthik.188@gmail.com> | 2015-09-23 23:41:13 +0530 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-09-25 08:54:54 -0700 |
| commit | aa3bc55e408d4daab52239d6b80f7d4bb87f6de7 (patch) | |
| tree | dba5ad427c731161a7925a3f03dc8d0ecaadab08 /builtin/branch.c | |
| parent | aedcb7dc75e5c260f20bebe14925f3ac4841b03d (diff) | |
| download | git-aa3bc55e408d4daab52239d6b80f7d4bb87f6de7.tar.gz | |
branch: add '--points-at' option
Add the '--points-at' option provided by 'ref-filter'. The option lets
the user to list only branches which points at the given object.
Add documentation and tests for the same.
Mentored-by: Christian Couder <christian.couder@gmail.com>
Mentored-by: Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Signed-off-by: Karthik Nayak <karthik.188@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/branch.c')
| -rw-r--r-- | builtin/branch.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/builtin/branch.c b/builtin/branch.c index b83116a609..b7a60f41e7 100644 --- a/builtin/branch.c +++ b/builtin/branch.c @@ -26,6 +26,7 @@ static const char * const builtin_branch_usage[] = { N_("git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"), N_("git branch [<options>] [-r] (-d | -D) <branch-name>..."), N_("git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"), + N_("git branch [<options>] [-r | -a] [--points-at]"), NULL }; @@ -646,6 +647,10 @@ int cmd_branch(int argc, const char **argv, const char *prefix) OPT_COLUMN(0, "column", &colopts, N_("list branches in columns")), OPT_CALLBACK(0 , "sort", sorting_tail, N_("key"), N_("field name to sort on"), &parse_opt_ref_sorting), + { + OPTION_CALLBACK, 0, "points-at", &filter.points_at, N_("object"), + N_("print only branches of the object"), 0, parse_opt_object_name + }, OPT_END(), }; @@ -674,7 +679,7 @@ int cmd_branch(int argc, const char **argv, const char *prefix) if (!delete && !rename && !edit_description && !new_upstream && !unset_upstream && argc == 0) list = 1; - if (filter.with_commit || filter.merge != REF_FILTER_MERGED_NONE) + if (filter.with_commit || filter.merge != REF_FILTER_MERGED_NONE || filter.points_at.nr) list = 1; if (!!delete + !!rename + !!new_upstream + |