X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;ds=sidebyside;f=setup.sh;h=da3e9bde524c231dd235db7befd895062c324088;hb=ca85c784acf029235757ca7e9a42e4764831fca4;hp=8bb651c8f83c50ebf0a4b621b072e730484b4d61;hpb=55dee6c2ef0b12f154d4d4cb2be1a2df882bcf3d;p=config%2Fdotfiles.git diff --git a/setup.sh b/setup.sh index 8bb651c..da3e9bd 100755 --- a/setup.sh +++ b/setup.sh @@ -28,6 +28,12 @@ function git_remote_init_update() { echo "Adding remote '$2' to '$1'." git remote add -t master "$2" "$3/$1" git fetch "$2" > /dev/null + # Remove the remote and abort if the fetch was unsuccessful. + if [ "$?" -ne "0" ]; then + git remote rm "$2" + exit 1 + fi + # Pushing to the remote pushes only the master branch in remotes named # the hostname of this machine. This makes it easy to see where # changes came from. @@ -38,9 +44,10 @@ function git_remote_init_update() { fi # Merge with remote master if the repository was just created, otherwise - # the repository starts empty. + # the repository starts empty. Also run gc to compress the new repository. if [ $new = yes ]; then git merge "$2/master" + git gc > /dev/null fi # Go back to the starting directory.