Work around curl-gnutls not liking to be reinitialized

[thirdparty/git.git] / git-cvsserver.perl

diff --git a/git-cvsserver.perl b/git-cvsserver.perl
index ecded3b9cba9e18117f7372af37e9b56203a6fcf..afe3d0b7fe4d643688e672f62844cc86ec64fab5 100755 (executable)
--- a/git-cvsserver.perl
+++ b/git-cvsserver.perl
@@ -2543,8 +2543,15 @@ sub update
                     if ($parent eq $lastpicked) {
                         next;
                     }
-                    my $base = safe_pipe_capture('git-merge-base',
+                   my $base = eval {
+                           safe_pipe_capture('git-merge-base',
                                                 $lastpicked, $parent);
+                   };
+                   # The two branches may not be related at all,
+                   # in which case merge base simply fails to find
+                   # any, but that's Ok.
+                   next if ($@);
+
                     chomp $base;
                     if ($base) {
                         my @merged;