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

diff --git a/pull-usrlocalsrc b/pull-usrlocalsrc
index f8654c0..f3ce96b 100755
--- a/pull-usrlocalsrc
+++ b/pull-usrlocalsrc
@@ -1,9 +1,17 @@
 #! /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 true; do
-   read d || exit 0
-   echo "----- $d -----"; cd "$d" && git pull --all || exit 1
+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
+   fi
 done