From: Uwe Kleine-König Date: Thu, 28 Feb 2008 07:24:25 +0000 (+0100) Subject: rev-list: add --branches, --tags and --remotes X-Git-Tag: v1.5.5-rc0~118 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=a5aa930d506689df0f77dded8a3f5aa248b485ee;p=git.git rev-list: add --branches, --tags and --remotes These flags are already known to rev-parse and have the same meaning. This patch allows to run gitk as follows: gitk --branches --not --remotes to show only your local work. Signed-off-by: Uwe Kleine-König Signed-off-by: Junio C Hamano --- diff --git a/Documentation/git-rev-list.txt b/Documentation/git-rev-list.txt index a8d489f9f..d80cdf550 100644 --- a/Documentation/git-rev-list.txt +++ b/Documentation/git-rev-list.txt @@ -20,6 +20,9 @@ SYNOPSIS [ \--full-history ] [ \--not ] [ \--all ] + [ \--branches ] + [ \--tags ] + [ \--remotes ] [ \--stdin ] [ \--quiet ] [ \--topo-order ] diff --git a/builtin-rev-list.c b/builtin-rev-list.c index 6f7d5f821..6754e7f12 100644 --- a/builtin-rev-list.c +++ b/builtin-rev-list.c @@ -25,6 +25,9 @@ static const char rev_list_usage[] = " --no-merges\n" " --remove-empty\n" " --all\n" +" --branches\n" +" --tags\n" +" --remotes\n" " --stdin\n" " --quiet\n" " ordering output:\n" diff --git a/revision.c b/revision.c index 84fbdd3af..0eb6faa53 100644 --- a/revision.c +++ b/revision.c @@ -633,12 +633,13 @@ static int handle_one_ref(const char *path, const unsigned char *sha1, int flag, return 0; } -static void handle_all(struct rev_info *revs, unsigned flags) +static void handle_refs(struct rev_info *revs, unsigned flags, + int (*for_each)(each_ref_fn, void *)) { struct all_refs_cb cb; cb.all_revs = revs; cb.all_flags = flags; - for_each_ref(handle_one_ref, &cb); + for_each(handle_one_ref, &cb); } static void handle_one_reflog_commit(unsigned char *sha1, void *cb_data) @@ -1015,7 +1016,19 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch continue; } if (!strcmp(arg, "--all")) { - handle_all(revs, flags); + handle_refs(revs, flags, for_each_ref); + continue; + } + if (!strcmp(arg, "--branches")) { + handle_refs(revs, flags, for_each_branch_ref); + continue; + } + if (!strcmp(arg, "--tags")) { + handle_refs(revs, flags, for_each_tag_ref); + continue; + } + if (!strcmp(arg, "--remotes")) { + handle_refs(revs, flags, for_each_remote_ref); continue; } if (!strcmp(arg, "--first-parent")) {