From 8a0e7f5c13b0abdccb8445939cebd5f55d8a1916 Mon Sep 17 00:00:00 2001 From: "Heiko Schlittermann (HS12-RIPE)" Date: Sun, 6 Nov 2016 00:09:37 +0100 Subject: [PATCH] Re-exec after auto update --- run_branches | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/run_branches b/run_branches index 20f3790..bf377fb 100755 --- a/run_branches +++ b/run_branches @@ -34,6 +34,11 @@ if ($0 =~ /(.*)\.pl$/) { # Most of the client code assumes that our working directory # is the client code directory. +my %CALLED = ( + cwd => cwd(), + argv0 => $0, + argv => [@ARGV], # get a copy! +); chdir $RealBin or die "$0: Can't chdir to '$RealBin': $!\n"; say "Changed working directory to '$RealBin'" if -t; @@ -75,10 +80,13 @@ require $buildconf; # Check if auto-update is wanted and possible if (not exists $EximBuild::Conf{auto_update} or $EximBuild::Conf{auto_update}) { + my $remote = $EximBuild::Conf{auto_update} // 'origin'; + die "$0: auto-update not possible: need write permissions in @{[cwd]}\n" if not -w '.'; + # http://stackoverflow.com/questions/3258243/check-if-pull-needed-in-git - system('git remote update') == 0 or die $? >> 8; + system("git fetch $remote") == 0 or die $? >> 8; my ($upstream, $local, $base) = qx'git rev-parse ...@{upstream}'; die $? >> 8 if $?; $base =~ s/^\^//; @@ -86,8 +94,14 @@ if (not exists $EximBuild::Conf{auto_update} or $EximBuild::Conf{auto_update}) die "$0: the merge base is not local anymore. Refusing to `git pull`\n" if $base ne $local; + say "Doing git pull ..." if $verbose; + # if we're the merge base, the ff-only should workkkkkk - system 'git pull --ff-only' + system 'git pull --ff-only' == 0 or die $? >> 8; + say "$0: re-execute after update"; + chdir $CALLED{cwd} or die "$0: Can't chdir to $CALLED{cwd}: $!\n"; + exec $CALLED{argv0}, @{$CALLED{argv}}; + die "Can't re-exec\n"; } } -- 2.30.2