diff options
Diffstat (limited to 'git-pull-script')
| -rwxr-xr-x | git-pull-script | 2 |
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)" \ |