X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=pull-usrlocalsrc;h=ef9167b7f70561a8ac522b1400adda822c7cae33;hb=eb7ee6a3daea11e94dd6395ab22d5097401841ae;hp=f3ce96b671e39e175692c897fa509fe82c7ef307;hpb=b65933557c112aa3d14b4664d70b7260e836e64e;p=git-scripts.git

diff --git a/pull-usrlocalsrc b/pull-usrlocalsrc
index f3ce96b..ef9167b 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
-   else
-      git remote | xargs -I% git pull % 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
    fi
 done