Ensure `git-pull` fails if `git-merge` fails.

If git-merge exits with a non-zero exit status so should git-pull.
This way the caller of git-pull knows the task did not complete
successfully simply by checking the process exit status.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Shawn O. Pearce 2006-12-28 02:35:01 -05:00 коммит произвёл Junio C Hamano
Родитель 0bb733c91c
Коммит bf699582fd
1 изменённых файлов: 1 добавлений и 1 удалений

Просмотреть файл

@ -119,5 +119,5 @@ case "$strategy_args" in
esac esac
merge_name=$(git-fmt-merge-msg <"$GIT_DIR/FETCH_HEAD") || exit merge_name=$(git-fmt-merge-msg <"$GIT_DIR/FETCH_HEAD") || exit
git-merge $no_summary $no_commit $squash $strategy_args \ exec git-merge $no_summary $no_commit $squash $strategy_args \
"$merge_name" HEAD $merge_head "$merge_name" HEAD $merge_head