git-commit-vandalism/git-pull-script
Linus Torvalds b33e966608 Add "git-sh-setup-script" for common git shell script setup
It sets up the normal git environment variables and a few helper
functions (currently just "die()"), and returns ok if it all looks like
a git archive.  So use it something like

	. git-sh-setup-script || die "Not a git archive"

to make the rest of the git scripts more careful and readable.
2005-07-08 10:57:21 -07:00

26 lines
448 B
Bash
Executable File

#!/bin/sh
#
. git-sh-setup-script || die "Not a git archive"
merge_repo=$1
merge_name=$(echo "$1" | sed 's:\.git/*$::')
merge_head=HEAD
type=head
if [ "$2" = "tag" ]; then
type=tag
shift
fi
if [ "$2" ]
then
merge_name="$type '$2' of $merge_name"
merge_head="refs/${type}s/$2"
fi
git-fetch-script "$merge_repo" "$merge_head" || exit 1
git-resolve-script \
"$(cat "$GIT_DIR"/HEAD)" \
"$(cat "$GIT_DIR"/FETCH_HEAD)" \
"$merge_name"