X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=update;h=17d6cf20571f5c650722b712c31ab9a1260a9c69;hb=ccc7137e3181ded6d3084c8c471a3db6ec586c07;hp=e76a158cbe4de7d6365928f819bd5f34b2ab944b;hpb=dc4a02ec88276f27b58f2d866057d460a6c436ef;p=git-scripts.git diff --git a/update b/update index e76a158..17d6cf2 100755 --- 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 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 master fi && cd "$current" && exec git pull origin