From 097a2385d4a5dd4d1b89345fc4ae6698e08052f2 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 8 Dec 2010 15:36:07 -0800 Subject: [PATCH] cook: some topics are tangled with each other --- cook | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/cook b/cook index 41d88af668..2cb1343afc 100755 --- a/cook +++ b/cook @@ -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; } } -- 2.47.3