git-branch: add support for --merged and --no-merged
These options filter the output from git branch to only include branches whose tip is either merged or not merged into HEAD. The use-case for these options is when working with integration of branches from many remotes: `git branch --no-merged -a` will show a nice list of merge candidates while `git branch --merged -a` will show the progress of your integration work. Also, a plain `git branch --merged` is a quick way to find local branches which you might want to delete. Signed-off-by: Lars Hjemli <hjemli@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Lars Hjemli committed
Apr 17, 2008 at 22:24 UTC
e8b404c27e98a8d1b0e123fe80ce19efbdbf73d7
2 files changed
+18
-2
Documentation/git-branch.txt
+3
-1
@@ -8,7 +8,7 @@ git-branch - List, create, or delete branches
8
SYNOPSIS
9
--------
10
[verse]
11
-'git-branch' [--color | --no-color] [-r | -a]
11
+'git-branch' [--color | --no-color] [-r | -a] [--merged | --no-merged]
12
[-v [--abbrev=<length> | --no-abbrev]]
13
[--contains <commit>]
14
'git-branch' [--track | --no-track] [-l] [-f] <branchname> [<start-point>]
@@ -24,6 +24,8 @@ and option `-a` shows both.
24
With `--contains <commit>`, shows only the branches that
25
contains the named commit (in other words, the branches whose
26
tip commits are descendant of the named commit).
27
+With `--merged`, only branches merged into HEAD will be listed, and
28
+with `--no-merged` only branches not merged into HEAD will be listed.
29
30
In its second form, a new branch named <branchname> will be created.
31
It will start out with a head equal to the one given as <start-point>.
builtin-branch.c
+15
-1
@@ -15,7 +15,7 @@
15
#include "branch.h"
16
17
static const char * const builtin_branch_usage[] = {
18
- "git-branch [options] [-r | -a]",
18
+ "git-branch [options] [-r | -a] [--merged | --no-merged]",
19
"git-branch [options] [-l] [-f] <branchname> [<start-point>]",
20
"git-branch [options] [-r] (-d | -D) <branchname>",
21
"git-branch [options] (-m | -M) [<oldbranch>] <newbranch>",
@@ -46,6 +46,8 @@ enum color_branch {
46
COLOR_BRANCH_CURRENT = 4,
47
};
48
49
+static int mergefilter = -1;
50
+
51
static int parse_branch_color_slot(const char *var, int ofs)
52
{
53
if (!strcasecmp(var+ofs, "plain"))
@@ -210,6 +212,7 @@ static int append_ref(const char *refname, const unsigned char *sha1, int flags,
212
struct ref_item *newitem;
213
int kind = REF_UNKNOWN_TYPE;
214
int len;
215
+ static struct commit_list branch;
216
217
/* Detect kind */
218
if (!prefixcmp(refname, "refs/heads/")) {
@@ -231,6 +234,16 @@ static int append_ref(const char *refname, const unsigned char *sha1, int flags,
234
if ((kind & ref_list->kinds) == 0)
235
return 0;
236
237
+ if (mergefilter > -1) {
238
+ branch.item = lookup_commit_reference_gently(sha1, 1);
239
+ if (!branch.item)
240
+ die("Unable to lookup tip of branch %s", refname);
241
+ if (mergefilter == 0 && has_commit(head_sha1, &branch))
242
+ return 0;
243
+ if (mergefilter == 1 && !has_commit(head_sha1, &branch))
244
+ return 0;
245
+ }
246
+
247
/* Resize buffer */
248
if (ref_list->index >= ref_list->alloc) {
249
ref_list->alloc = alloc_nr(ref_list->alloc);
@@ -444,6 +457,7 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
457
OPT_BIT('M', NULL, &rename, "move/rename a branch, even if target exists", 2),
458
OPT_BOOLEAN('l', NULL, &reflog, "create the branch's reflog"),
459
OPT_BOOLEAN('f', NULL, &force_create, "force creation (when already exists)"),
460
+ OPT_SET_INT(0, "merged", &mergefilter, "list only merged branches", 1),
461
OPT_END(),
462
};
463