kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

show-branch --topics: omit more uninteresting commits. 

When inspecting contents of topic branches for yet-to-be-merged
commits, a commit that is in the release/master branch is
uninteresting.  Previous round still showed them, especially,
the ones before a topic branch that was forked from the
release/master later than other topic branches.

Signed-off-by: Junio C Hamano <junkio@cox.net>
maint
Junio C Hamano 2006-03-03 14:34:40 -08:00
parent d51fac5310
commit f794c23466
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
show-branch.c
View File

@ -727,24 +727,16 @@ int main(int ac, char **av)
while (seen) { while (seen) {
struct commit *commit = pop_one_commit(&seen); struct commit *commit = pop_one_commit(&seen);
int this_flag = commit->object.flags; int this_flag = commit->object.flags;
int is_merge_point = ((this_flag & all_revs) == all_revs);


shown_merge_point |= ((this_flag & all_revs) == all_revs); shown_merge_point |= is_merge_point;


if (1 < num_rev) { if (1 < num_rev) {
int is_merge = !!(commit->parents && commit->parents->next); int is_merge = !!(commit->parents && commit->parents->next);
if (topics) { if (topics &&
int interesting = 0; !is_merge_point &&
for (i = 1; i < num_rev; i++) { (this_flag & (1u << REV_SHIFT)))
if ((this_flag & continue;
(1u << (i + REV_SHIFT)))) {
interesting = 1;
break;
}
}
if (!interesting)
continue;
}



for (i = 0; i < num_rev; i++) { for (i = 0; i < num_rev; i++) {
int mark; int mark;