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 | |
| parent | git-resolve-script: don't wait for three seconds any more (diff) | |
| download | tgif-ed37b5b2b94398f3ab8312dfdf23cfd25549e3ec.tar.xz | |
Make fetch/pull scripts terminate cleanly on errors
Don't continue with a merge if the fetch failed.
| -rwxr-xr-x | git-fetch-script | 4 | ||||
| -rwxr-xr-x | git-pull-script | 2 |
2 files changed, 3 insertions, 3 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 diff --git a/git-pull-script b/git-pull-script index 49f42b5ab2..a4ca97c645 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)" \ |