aboutsummaryrefslogtreecommitdiff
path: root/git-pull-script
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-06 17:40:22 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-06 17:40:22 -0700
commited37b5b2b94398f3ab8312dfdf23cfd25549e3ec (patch)
tree8ba05dbc5815b0bc731a93d8353d36ba633d14c4 /git-pull-script
parent3f4eff75308b86fe462a2333108470bd6556e3c4 (diff)
downloadgit-ed37b5b2b94398f3ab8312dfdf23cfd25549e3ec.tar.gz
git-ed37b5b2b94398f3ab8312dfdf23cfd25549e3ec.tar.xz
Make fetch/pull scripts terminate cleanly on errors
Don't continue with a merge if the fetch failed.
Diffstat (limited to 'git-pull-script')
-rwxr-xr-xgit-pull-script2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-pull-script b/git-pull-script
index 49f42b5ab..a4ca97c64 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)" \