mirror of
https://github.com/moparisthebest/curl
synced 2024-12-22 16:18:48 -05:00
added last git commit output for c-ares too.
This commit is contained in:
parent
6ab2cae55e
commit
9c7a9f8329
@ -382,28 +382,36 @@ if ($git) {
|
|||||||
logit "skipping git pull (--nogitpull)";
|
logit "skipping git pull (--nogitpull)";
|
||||||
} else {
|
} else {
|
||||||
my $gitstat = 0;
|
my $gitstat = 0;
|
||||||
|
my @commits;
|
||||||
logit "run git pull in curl";
|
logit "run git pull in curl";
|
||||||
system("git pull 2>&1");
|
system("git pull 2>&1");
|
||||||
$gitstat += $?;
|
$gitstat += $?;
|
||||||
logit "failed to update from curl git ($?), continue anyway" if ($?);
|
logit "failed to update from curl git ($?), continue anyway" if ($?);
|
||||||
|
# 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:";
|
||||||
|
for (@commits) {
|
||||||
|
chomp ($_);
|
||||||
|
logit " $_";
|
||||||
|
}
|
||||||
if (-d "$CURLDIR/ares/.git") {
|
if (-d "$CURLDIR/ares/.git") {
|
||||||
chdir "$CURLDIR/ares";
|
chdir "$CURLDIR/ares";
|
||||||
logit "run git pull in ares";
|
logit "run git pull in ares";
|
||||||
system("git pull 2>&1");
|
system("git pull 2>&1");
|
||||||
$gitstat += $?;
|
$gitstat += $?;
|
||||||
logit "failed to update from ares git ($?), continue anyway" if ($?);
|
logit "failed to update from ares git ($?), continue anyway" if ($?);
|
||||||
|
# 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:";
|
||||||
|
for (@commits) {
|
||||||
|
chomp ($_);
|
||||||
|
logit " $_";
|
||||||
|
}
|
||||||
chdir $CURLDIR;
|
chdir $CURLDIR;
|
||||||
}
|
}
|
||||||
# Set timestamp to the UTC the git update took place.
|
# Set timestamp to the UTC the git update took place.
|
||||||
$timestamp = scalar(gmtime)." UTC" if (!$gitstat);
|
$timestamp = scalar(gmtime)." UTC" if (!$gitstat);
|
||||||
}
|
}
|
||||||
# get the last 5 commits for show (even if no pull was made)
|
|
||||||
my @commits=`git log --pretty=oneline --abbrev-commit -5`;
|
|
||||||
logit "The most recent git commits:";
|
|
||||||
for my $l (@commits) {
|
|
||||||
chomp ($l);
|
|
||||||
logit " $l";
|
|
||||||
}
|
|
||||||
|
|
||||||
if($nobuildconf) {
|
if($nobuildconf) {
|
||||||
logit "told to not run buildconf";
|
logit "told to not run buildconf";
|
||||||
|
Loading…
Reference in New Issue
Block a user