@matheusbsbs / matheus-bagliano / commits / d320a5437f
Fork 0

show-branch --topics

This adds a new flag, --topics, to help managing topic branches. When you have topic branches forked some time ago from your primary line of development, show-branch would show many "uninteresting" things that happend on the primary line of development when trying to see what are still not merged from the topic branches. With this flag, the first ref given to show-branch is taken as the primary branch, and the rest are taken as the topic branches. Output from the command is modified so that commits only on the primary branch are not shown. In other words, $ git show-branch --topics master topic1 topic2 ... shows an (almost) equivalent of $ git rev-list ^master topic1 topic2 ... The major differences are that (1) you can tell which commits are on which branch, and (2) the commit at the fork point is shown. Signed-off-by: Junio C Hamano <junkio@cox.net>

Junio C Hamano committed Mar 2, 2006 at 17:14 UTC d320a5437f8304cf9ea3ee1898e49d643e005738
1 file changed +18 -1
show-branch.c
+18 -1
@@ -5,7 +5,7 @@
5 #include "refs.h"
6
7 static const char show_branch_usage[] =
8 -"git-show-branch [--current] [--all] [--heads] [--tags] [--topo-order] [--more=count | --list | --independent | --merge-base ] [<refs>...]";
8 +"git-show-branch [--current] [--all] [--heads] [--tags] [--topo-order] [--more=count | --list | --independent | --merge-base ] [--topics] [<refs>...]";
9
10 static int default_num = 0;
11 static int default_alloc = 0;
@@ -547,6 +547,7 @@ int main(int ac, char **av)
547 int shown_merge_point = 0;
548 int with_current_branch = 0;
549 int head_at = -1;
550 + int topics = 0;
551
552 setup_git_directory();
553 git_config(git_show_branch_config);
@@ -587,6 +588,8 @@ int main(int ac, char **av)
588 independent = 1;
589 else if (!strcmp(arg, "--topo-order"))
590 lifo = 1;
591 + else if (!strcmp(arg, "--topics"))
592 + topics = 1;
593 else if (!strcmp(arg, "--date-order"))
594 lifo = 0;
595 else
@@ -729,6 +732,20 @@ int main(int ac, char **av)
732
733 if (1 < num_rev) {
734 int is_merge = !!(commit->parents && commit->parents->next);
735 + if (topics) {
736 + int interesting = 0;
737 + for (i = 1; i < num_rev; i++) {
738 + if ((this_flag &
739 + (1u << (i + REV_SHIFT)))) {
740 + interesting = 1;
741 + break;
742 + }
743 + }
744 + if (!interesting)
745 + continue;
746 + }
747 +
748 +
749 for (i = 0; i < num_rev; i++) {
750 int mark;
751 if (!(this_flag & (1u << (i + REV_SHIFT))))