pull-usrlocalsrc: pull from source, push to origin

[git-scripts.git] / update

diff --git a/update b/update
index e76a158cbe4de7d6365928f819bd5f34b2ab944b..fd10a24b725bd744ab58db2f5282a70e05641b2e 100755 (executable)
--- a/update
+++ b/update
@@ -5,14 +5,14 @@ origin="`git config --get --path remote.origin.url`"
 
 if [ -n "$origin" ]; then
    if [ -n "$current" ]; then
-      echo "UNKNOWN ERROR (both origin and current)" >&2
+      echo "Config error (both origin and current)" >&2
       exit 1
    else
-      cd "$origin" || exit 1
+      cd "$origin" &&
       exec ./update
    fi
 elif [ -z "$current" ]; then
-   echo "UNKNOWN ERROR (neither origin nor current)" >&2
+   echo "Wrong directory error (neither origin nor current)" >&2
    exit 1
 fi
 
@@ -20,7 +20,7 @@ git pull --ff-only current master &&
 
 web="`git config --get --path remote.web.url`" &&
 if [ -n "$web" ]; then
-   git push web &&
+   git push web
 fi &&
 
 cd "$current" && exec git pull origin