X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=show-branch.c;h=452e63f78682c44d52f1391a74077036b786f3b5;hb=d5dddccaa0c61c67340efca36237dfa06eccef1c;hp=5a86ae2f9ed3159d082158c04bea51c39cb4477f;hpb=ee072260dbff6914c24d956bcc2d46882831f1a0;p=git.git

diff --git a/show-branch.c b/show-branch.c
index 5a86ae2f..452e63f7 100644
--- a/show-branch.c
+++ b/show-branch.c
@@ -5,7 +5,7 @@
 #include "refs.h"
 
 static const char show_branch_usage[] =
-"git-show-branch [--current] [--all] [--heads] [--tags] [--topo-order] [--more=count | --list | --independent | --merge-base ] [<refs>...]";
+"git-show-branch [--current] [--all] [--heads] [--tags] [--topo-order] [--more=count | --list | --independent | --merge-base ] [--topics] [<refs>...]";
 
 static int default_num = 0;
 static int default_alloc = 0;
@@ -547,6 +547,7 @@ int main(int ac, char **av)
 	int shown_merge_point = 0;
 	int with_current_branch = 0;
 	int head_at = -1;
+	int topics = 0;
 
 	setup_git_directory();
 	git_config(git_show_branch_config);
@@ -587,6 +588,8 @@ int main(int ac, char **av)
 			independent = 1;
 		else if (!strcmp(arg, "--topo-order"))
 			lifo = 1;
+		else if (!strcmp(arg, "--topics"))
+			topics = 1;
 		else if (!strcmp(arg, "--date-order"))
 			lifo = 0;
 		else
@@ -729,6 +732,20 @@ int main(int ac, char **av)
 
 		if (1 < num_rev) {
 			int is_merge = !!(commit->parents && commit->parents->next);
+			if (topics) {
+				int interesting = 0;
+				for (i = 1; i < num_rev; i++) {
+					if ((this_flag &
+					     (1u << (i + REV_SHIFT)))) {
+						interesting = 1;
+						break;
+					}
+				}
+				if (!interesting)
+					continue;
+			}
+
+
 			for (i = 0; i < num_rev; i++) {
 				int mark;
 				if (!(this_flag & (1u << (i + REV_SHIFT))))