Commit 190bb785 authored by Marc Hoersken's avatar Marc Hoersken
Browse files

testcurl.pl: always show the last 5 commits even with --nogitpull

parent 5c0eae13

tests/testcurl.pl

+35 −21
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
#                            | (__| |_| |  _ <| |___

#                             \___|\___/|_| \_\_____|

#

# Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.

# Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al.

#

# This software is licensed as described in the file COPYING, which

# you should have received as part of this distribution. The terms
@@ -400,16 +400,22 @@ chdir $CURLDIR; 


# Do the git thing, or not...

if ($git) {

  my $gitstat = 0;

  my @commits;



  # update quietly to the latest git

  if($nogitpull) {

    logit "skipping git pull (--nogitpull)";

  } else {

    my $gitstat = 0;

    my @commits;

    logit "run git pull in curl";

    system("git pull 2>&1");

    $gitstat += $?;

    logit "failed to update from curl git ($?), continue anyway" if ($?);



    # Set timestamp to the UTC the git update took place.

    $timestamp = scalar(gmtime)." UTC" if (!$gitstat);

  }



  # get the last 5 commits for show (even if no pull was made)

  @commits=`git log --pretty=oneline --abbrev-commit -5`;

  logit "The most recent curl git commits:";
@@ -417,12 +423,22 @@ if ($git) { 
    chomp ($_);

    logit "  $_";

  }



  if (-d "ares/.git") {

    chdir "ares";



    if($nogitpull) {

      logit "skipping git pull (--nogitpull) in ares";

    } else {

      logit "run git pull in ares";

      system("git pull 2>&1");

      $gitstat += $?;

      logit "failed to update from ares git ($?), continue anyway" if ($?);



      # Set timestamp to the UTC the git update took place.

      $timestamp = scalar(gmtime)." UTC" if (!$gitstat);

    }



    # get the last 5 commits for show (even if no pull was made)

    @commits=`git log --pretty=oneline --abbrev-commit -5`;

    logit "The most recent ares git commits:";
@@ -430,11 +446,9 @@ if ($git) { 
      chomp ($_);

      logit "  $_";

    }



    chdir "$pwd/$CURLDIR";

  }

    # Set timestamp to the UTC the git update took place.

    $timestamp = scalar(gmtime)." UTC" if (!$gitstat);

  }



  if($nobuildconf) {

    logit "told to not run buildconf";