X-Git-Url: https://git.phdru.name/?p=git-scripts.git;a=blobdiff_plain;f=pull-usrlocalsrc;h=f3ce96b671e39e175692c897fa509fe82c7ef307;hp=04f856df5e00ce2e44beb5b17e0e03916dfddb8e;hb=HEAD;hpb=47b2ea5de8376314dcfe11daec772834e80a33b4

diff --git a/pull-usrlocalsrc b/pull-usrlocalsrc
index 04f856d..c7159ad 100755
--- a/pull-usrlocalsrc
+++ b/pull-usrlocalsrc
@@ -1,9 +1,18 @@
 #! /bin/sh
 
+has_remote() {
+   git remote show "$1" >/dev/null 2>&1
+}
+
 prog_dir="`dirname \"$0\"`" &&
 
 cat "$prog_dir"/locate-all.list | grep -F /usr/local/src |
 while read d; do
    echo "----- $d -----"; cd "$d" &&
-   git remote | xargs -I'{}' git pull '{}' master || exit 1
+   if has_remote upstream && has_remote origin; then
+      { git pull upstream master || git pull upstream main:master; } &&
+         git push origin master || exit 1
+   elif has_remote origin; then
+      git pull origin master || git pull origin main:master || exit 1
+   fi
 done