novarobot
/
webperl-for
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build.pl shouldn't ask for pull if local is newer

Browse Source
master
Hauke D 7 years ago
parent 1c9a0c9dbf
commit 0f67a1cbfa
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File

6
build/build.pl
Unescape Escape View File

@ -124,7 +124,11 @@ GITSTUFF: {
my $myhead = git 'log', '-1', '--format=%h', $C{PERL_BRANCH}, {chomp=>1,show_cmd=>$VERBOSE}; my $myhead = git 'log', '-1', '--format=%h', $C{PERL_BRANCH}, {chomp=>1,show_cmd=>$VERBOSE};
my $remhead = git 'log', '-1', '--format=%h', 'origin/'.$C{PERL_BRANCH}, {chomp=>1,show_cmd=>$VERBOSE}; my $remhead = git 'log', '-1', '--format=%h', 'origin/'.$C{PERL_BRANCH}, {chomp=>1,show_cmd=>$VERBOSE};
say STDERR "# Local branch is at $myhead, remote is $remhead"; say STDERR "# Local branch is at $myhead, remote is $remhead";
if ($myhead ne $remhead) { #TODO Later: This should also check which git commit is newer! if ($myhead ne $remhead) {
git 'merge-base', '--is-ancestor', $remhead, $myhead, {allow_exit=>[0,1]};
if ($?==0) {
say STDERR "# However, it looks like $myhead is newer than $remhead, won't ask for update";
last GITSTUFF }
if (prompt("Would you like to update? WARNING: Unsaved local changes may be lost! [Yn]","y")=~/^\s*y/i) { if (prompt("Would you like to update? WARNING: Unsaved local changes may be lost! [Yn]","y")=~/^\s*y/i) {
eval { eval {
if ($C{CLOBBER_BRANCH}) { if ($C{CLOBBER_BRANCH}) {

Write Preview
Loading…
Cancel
Save