mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-19 22:16:21 +02:00
Code

Show all merge-base candidates from show-branch --merge-base 

This would make things easier to use for Octopus.

Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano 2005-09-08 12:15:52 -07:00
parent 35ef3a4c63
commit 2f0f8b71ee
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/git-show-branch.txt
View File

@ -33,8 +33,8 @@ OPTIONS
--merge-base::
Instead of showing the commit list, just act like the
'git-merge-base' command except that it can accept more
than two heads.
'git-merge-base -a' command, except that it can accept
more than two heads.
OUTPUT

8
show-branch.c
View File

@ -4,7 +4,7 @@
#include "refs.h"
static const char show_branch_usage[] =
"git-show-branch [--all] [--heads] [--tags] [--more=count] [<refs>...]";
"git-show-branch [--all] [--heads] [--tags] [--more=count] [--merge-base] [<refs>...]";
#define UNINTERESTING 01
@ -291,6 +291,7 @@ static int show_merge_base(struct commit_list *seen, int num_rev)
{
int all_mask = ((1u << (REV_SHIFT + num_rev)) - 1);
int all_revs = all_mask & ~((1u << REV_SHIFT) - 1);
int exit_status = 1;
while (seen) {
struct commit *commit = pop_one_commit(&seen);
@ -298,10 +299,11 @@ static int show_merge_base(struct commit_list *seen, int num_rev)
if (!(flags & UNINTERESTING) &&
((flags & all_revs) == all_revs)) {
puts(sha1_to_hex(commit->object.sha1));
return 0;
exit_status = 0;
commit->object.flags |= UNINTERESTING;
}
}
return 1;
return exit_status;
}
int main(int ac, char **av)