[PATCH] Trapping exit in tests, using return for errors
[git/jrn.git] / git-pull-script
blobfc463260bd9dd07e50494e7cbb39ef6833179ff3
1 #!/bin/sh
3 . git-sh-setup-script || die "Not a git archive"
4 . git-parse-remote "$@"
5 merge_name="$_remote_name"
7 git-fetch-script "$@" || exit 1
9 git-resolve-script \
10 "$(cat "$GIT_DIR"/HEAD)" \
11 "$(cat "$GIT_DIR"/FETCH_HEAD)" \
12 "Merge $merge_name"