Make fetch/pull scripts terminate cleanly on errors
Don't continue with a merge if the fetch failed.
This commit is contained in:
@ -35,7 +35,7 @@ download_objects () {
|
||||
}
|
||||
|
||||
echo "Getting remote $merge_name"
|
||||
download_one "$merge_repo/$merge_name" "$GIT_DIR"/MERGE_HEAD
|
||||
download_one "$merge_repo/$merge_name" "$GIT_DIR"/MERGE_HEAD || exit 1
|
||||
|
||||
echo "Getting object database"
|
||||
download_objects "$merge_repo" "$(cat "$GIT_DIR"/MERGE_HEAD)"
|
||||
download_objects "$merge_repo" "$(cat "$GIT_DIR"/MERGE_HEAD)" || exit 1
|
||||
|
Reference in New Issue
Block a user