summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-07 00:40:22 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-07 00:40:22 (GMT)
commited37b5b2b94398f3ab8312dfdf23cfd25549e3ec (patch)
tree8ba05dbc5815b0bc731a93d8353d36ba633d14c4
parent3f4eff75308b86fe462a2333108470bd6556e3c4 (diff)
downloadgit-ed37b5b2b94398f3ab8312dfdf23cfd25549e3ec.zip
git-ed37b5b2b94398f3ab8312dfdf23cfd25549e3ec.tar.gz
git-ed37b5b2b94398f3ab8312dfdf23cfd25549e3ec.tar.bz2
Make fetch/pull scripts terminate cleanly on errors
Don't continue with a merge if the fetch failed.
-rwxr-xr-xgit-fetch-script4
-rwxr-xr-xgit-pull-script2
2 files changed, 3 insertions, 3 deletions
diff --git a/git-fetch-script b/git-fetch-script
index 17f22af..7cd88b9 100755
--- a/git-fetch-script
+++ b/git-fetch-script
@@ -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
diff --git a/git-pull-script b/git-pull-script
index 49f42b5..a4ca97c 100755
--- a/git-pull-script
+++ b/git-pull-script
@@ -15,7 +15,7 @@ fi
: ${GIT_DIR=.git}
: ${GIT_OBJECT_DIRECTORY="${SHA1_FILE_DIRECTORY-"$GIT_DIR/objects"}"}
-git-fetch-script "$merge_repo" "$merge_head"
+git-fetch-script "$merge_repo" "$merge_head" || exit 1
git-resolve-script \
"$(cat "$GIT_DIR"/HEAD)" \