Commit d4fbf2c3 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

make sure git pull is actually done!

parent 2b0c2ac4

tests/testcurl.pl

+11 −13
Original line number Diff line number Diff line
@@ -371,11 +371,6 @@ if (-d $build) { 
# get in the curl source tree root

chdir $CURLDIR;



# Do the git thing, or not...

if ($git) {



  my $cvsstat;



sub gitpull() {

    # update quietly to the latest git

    if($nogitpull) {
@@ -383,20 +378,23 @@ if ($git) { 
        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.