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

cook: some topics are tangled with each other

todo
Junio C Hamano 2010-12-08 15:36:07 -08:00
parent 83f8c7461e
commit 097a2385d4
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cook
View File

@ -50,7 +50,7 @@ sub describe_relation {
}

if (exists $topic_info->{'shares'}) {
push @desc, ("shares commits with " .
push @desc, ("is tangled with " .
phrase_these(@{$topic_info->{'shares'}}));
}

@ -97,14 +97,8 @@ sub topic_relation {
} elsif (!@right) {
forks_from($topic, $one, $two);
} else {
if (@left < @right) {
forks_from($topic, $two, $one, @left);
} elsif (@right < @left) {
forks_from($topic, $one, $two, @right);
} else {
push @{$topic->{$one}{'shares'}}, $two;
push @{$topic->{$two}{'shares'}}, $one;
}
push @{$topic->{$one}{'shares'}}, $two;
push @{$topic->{$two}{'shares'}}, $one;
}
}