diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-06 17:40:22 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-06 17:40:22 -0700 |
| commit | ed37b5b2b94398f3ab8312dfdf23cfd25549e3ec (patch) | |
| tree | 8ba05dbc5815b0bc731a93d8353d36ba633d14c4 /git-fetch-script | |
| parent | 3f4eff75308b86fe462a2333108470bd6556e3c4 (diff) | |
| download | git-ed37b5b2b94398f3ab8312dfdf23cfd25549e3ec.tar.gz | |
Make fetch/pull scripts terminate cleanly on errors
Don't continue with a merge if the fetch failed.
Diffstat (limited to 'git-fetch-script')
| -rwxr-xr-x | git-fetch-script | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-fetch-script b/git-fetch-script index 17f22afedd..7cd88b93b2 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 |