]> git.ipfire.org Git - thirdparty/git.git/commitdiff
cook: some topics are tangled with each other
authorJunio C Hamano <gitster@pobox.com>
Wed, 8 Dec 2010 23:36:07 +0000 (15:36 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 8 Dec 2010 23:36:07 +0000 (15:36 -0800)
cook

diff --git a/cook b/cook
index 41d88af668e293add031d603f213a786e453f65d..2cb1343afc4b4ce871eb3252805774710b345ae5 100755 (executable)
--- 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;
        }
 }