X-Git-Url: https://git.phdru.name/?p=git-scripts.git;a=blobdiff_plain;f=pull-usrlocalsrc;h=f3ce96b671e39e175692c897fa509fe82c7ef307;hp=1413803bf598da1d04b88d1777ab870b29401156;hb=HEAD;hpb=c6fb90506269530c506ff4130271e86eb2b88a13 diff --git a/pull-usrlocalsrc b/pull-usrlocalsrc index 1413803..c7159ad 100755 --- a/pull-usrlocalsrc +++ b/pull-usrlocalsrc @@ -10,8 +10,9 @@ cat "$prog_dir"/locate-all.list | grep -F /usr/local/src | while read d; do echo "----- $d -----"; cd "$d" && if has_remote upstream && has_remote origin; then - git pull upstream master && git push origin master || exit 1 + { git pull upstream master || git pull upstream main:master; } && + git push origin master || exit 1 elif has_remote origin; then - git pull origin master || exit 1 + git pull origin master || git pull origin main:master || exit 1 fi done