From: Daniel Stenberg <daniel@haxx.se>
Date: Sat, 27 Mar 2010 17:57:24 +0000 (+0100)
Subject: make sure git pull is actually done!
X-Git-Tag: curl-7_20_1~44
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d4fbf2c3f086d7aca7f8d759d09110545625349e;p=thirdparty%2Fcurl.git

make sure git pull is actually done!
---

diff --git a/tests/testcurl.pl b/tests/testcurl.pl
index 6d9d694ca8..b48c2842e0 100755
--- a/tests/testcurl.pl
+++ b/tests/testcurl.pl
@@ -371,32 +371,30 @@ if (-d $build) {
 # get in the curl source tree root
 chdir $CURLDIR;
 
-# Do the git thing, or not...
-if ($git) {
-
-  my $cvsstat;
-
-  sub gitpull() {
+sub gitpull() {
     # update quietly to the latest git
     if($nogitpull) {
         logit "Skipping git pull (--nogitpull)";
         return 1;
     }
     else {
-
         logit "run git pull";
         system("git pull 2>&1");
     }
 
-    $cvsstat=$?;
+    my $stat=$?;
 
-    # return !RETURNVALUE so that errors return 0 while goodness
-    # returns 1
-    return !$cvsstat;
-  }
+    return $stat;
+}
+
+# Do the git thing, or not...
+if ($git) {
+
+  my $cvsstat = gitpull();
 
   if ($cvsstat != 0) {
-    mydie "failed to update from git ($cvsstat), exiting";
+    # update failure is not lethal
+    logit "failed to update from git ($cvsstat), continue anyway";
   }
   elsif (!$nogitpull) {
     # Set timestamp to the UTC the git update took place.