[thirdparty/git.git] / git-pull.sh

#!/bin/sh
#
# Copyright (c) 2005 Junio C Hamano
#
# Fetch one or more remote refs and merge it/them into the current HEAD.

USAGE='[-n | --no-summary] [--[no-]commit] [--[no-]squash] [--[no-]ff] [-s strategy]... [<fetch-options>] <repo> <head>...'
LONG_USAGE='Fetch one or more remote refs and merge it/them into the current HEAD.'
SUBDIRECTORY_OK=Yes
OPTIONS_SPEC=
. git-sh-setup
set_reflog_action "pull $*"
require_work_tree
cd_to_toplevel

test -z "$(git ls-files -u)" ||
	die "You are in the middle of a conflicted merge."

strategy_args= no_summary= no_commit= squash= no_ff=
curr_branch=$(git symbolic-ref -q HEAD)
curr_branch_short=$(echo "$curr_branch" | sed "s|refs/heads/||")
rebase=$(git config --bool branch.$curr_branch_short.rebase)
while :
do
	case "$1" in
	-n|--n|--no|--no-|--no-s|--no-su|--no-sum|--no-summ|\
		--no-summa|--no-summar|--no-summary)
		no_summary=-n ;;
	--summary)
		no_summary=$1
		;;
	--no-c|--no-co|--no-com|--no-comm|--no-commi|--no-commit)
		no_commit=--no-commit ;;
	--c|--co|--com|--comm|--commi|--commit)
		no_commit=--commit ;;
	--sq|--squ|--squa|--squas|--squash)
		squash=--squash ;;
	--no-sq|--no-squ|--no-squa|--no-squas|--no-squash)
		squash=--no-squash ;;
	--ff)
		no_ff=--ff ;;
	--no-ff)
		no_ff=--no-ff ;;
	-s=*|--s=*|--st=*|--str=*|--stra=*|--strat=*|--strate=*|\
		--strateg=*|--strategy=*|\
	-s|--s|--st|--str|--stra|--strat|--strate|--strateg|--strategy)
		case "$#,$1" in
		*,*=*)
			strategy=`expr "z$1" : 'z-[^=]*=\(.*\)'` ;;
		1,*)
			usage ;;
		*)
			strategy="$2"
			shift ;;
		esac
		strategy_args="${strategy_args}-s $strategy "
		;;
	-r|--r|--re|--reb|--reba|--rebas|--rebase)
		rebase=true
		;;
	--no-r|--no-re|--no-reb|--no-reba|--no-rebas|--no-rebase)
		rebase=false
		;;
	-h|--h|--he|--hel|--help)
		usage
		;;
	*)
		# Pass thru anything that may be meant for fetch.
		break
		;;
	esac
	shift
done

error_on_no_merge_candidates () {
	exec >&2
	for opt
	do
		case "$opt" in
		-t|--t|--ta|--tag|--tags)
			echo "Fetching tags only, you probably meant:"
			echo "  git fetch --tags"
			exit 1
		esac
	done

	curr_branch=${curr_branch#refs/heads/}

	echo "You asked me to pull without telling me which branch you"
	echo "want to merge with, and 'branch.${curr_branch}.merge' in"
	echo "your configuration file does not tell me either.  Please"
	echo "name which branch you want to merge on the command line and"
	echo "try again (e.g. 'git pull <repository> <refspec>')."
	echo "See git-pull(1) for details on the refspec."
	echo
	echo "If you often merge with the same branch, you may want to"
	echo "configure the following variables in your configuration"
	echo "file:"
	echo
	echo "    branch.${curr_branch}.remote = <nickname>"
	echo "    branch.${curr_branch}.merge = <remote-ref>"
	echo "    remote.<nickname>.url = <url>"
	echo "    remote.<nickname>.fetch = <refspec>"
	echo
	echo "See git-config(1) for details."
	exit 1
}

orig_head=$(git rev-parse --verify HEAD 2>/dev/null)
git-fetch --update-head-ok "$@" || exit 1

curr_head=$(git rev-parse --verify HEAD 2>/dev/null)
if test "$curr_head" != "$orig_head"
then
	# The fetch involved updating the current branch.

	# The working tree and the index file is still based on the
	# $orig_head commit, but we are merging into $curr_head.
	# First update the working tree to match $curr_head.

	echo >&2 "Warning: fetch updated the current branch head."
	echo >&2 "Warning: fast forwarding your working tree from"
	echo >&2 "Warning: commit $orig_head."
	git update-index --refresh 2>/dev/null
	git read-tree -u -m "$orig_head" "$curr_head" ||
		die 'Cannot fast-forward your working tree.
After making sure that you saved anything precious from
$ git diff '$orig_head'
output, run
$ git reset --hard
to recover.'

fi

merge_head=$(sed -e '/	not-for-merge	/d' \
	-e 's/	.*//' "$GIT_DIR"/FETCH_HEAD | \
	tr '\012' ' ')

case "$merge_head" in
'')
	case $? in
	0) error_on_no_merge_candidates "$@";;
	1) echo >&2 "You are not currently on a branch; you must explicitly"
	   echo >&2 "specify which branch you wish to merge:"
	   echo >&2 "  git pull <remote> <branch>"
	   exit 1;;
	*) exit $?;;
	esac
	;;
?*' '?*)
	if test -z "$orig_head"
	then
		echo >&2 "Cannot merge multiple branches into empty head"
		exit 1
	fi
	;;
esac

if test -z "$orig_head"
then
	git update-ref -m "initial pull" HEAD $merge_head "" &&
	git read-tree --reset -u HEAD || exit 1
	exit
fi

merge_name=$(git fmt-merge-msg <"$GIT_DIR/FETCH_HEAD") || exit
test true = "$rebase" && exec git-rebase $merge_head
exec git-merge $no_summary $no_commit $squash $no_ff $strategy_args \
	"$merge_name" HEAD $merge_head
Commit	Line	Data
839a7a06 LT	1	#!/bin/sh
839a7a06 LT	2	#
521003ff JH	3	# Copyright (c) 2005 Junio C Hamano
	4	#
	5	# Fetch one or more remote refs and merge it/them into the current HEAD.
	6
5072a323	7	USAGE='[-n \| --no-summary] [--[no-]commit] [--[no-]squash] [--[no-]ff] [-s strategy]... [<fetch-options>] <repo> <head>...'
806f36d4	8	LONG_USAGE='Fetch one or more remote refs and merge it/them into the current HEAD.'
533b7039	9	SUBDIRECTORY_OK=Yes
8f321a39	10	OPTIONS_SPEC=
ae2b0f15	11	. git-sh-setup
f9474132	12	set_reflog_action "pull $*"
7eff28a9	13	require_work_tree
533b7039	14	cd_to_toplevel
b10ac50f	15
d1014a17	16	test -z "$(git ls-files -u)" \|\|
533b7039	17	die "You are in the middle of a conflicted merge."
d1014a17	18
5072a323	19	strategy_args= no_summary= no_commit= squash= no_ff=
cd67e4d4 JS	20	curr_branch=$(git symbolic-ref -q HEAD)
	21	curr_branch_short=$(echo "$curr_branch" \| sed "s\|refs/heads/\|\|")
	22	rebase=$(git config --bool branch.$curr_branch_short.rebase)
822f7c73	23	while :
60fb5b2c JH	24	do
	25	case "$1" in
	26	-n\|--n\|--no\|--no-\|--no-s\|--no-su\|--no-sum\|--no-summ\|\
	27	--no-summa\|--no-summar\|--no-summary)
	28	no_summary=-n ;;
51e7ecf4 AR	29	--summary)
	30	no_summary=$1
	31	;;
123ee3ca JH	32	--no-c\|--no-co\|--no-com\|--no-comm\|--no-commi\|--no-commit)
123ee3ca JH	33	no_commit=--no-commit ;;
5072a323 LH	34	--c\|--co\|--com\|--comm\|--commi\|--commit)
5072a323 LH	35	no_commit=--commit ;;
7d0c6887 JH	36	--sq\|--squ\|--squa\|--squas\|--squash)
7d0c6887 JH	37	squash=--squash ;;
5072a323 LH	38	--no-sq\|--no-squ\|--no-squa\|--no-squas\|--no-squash)
	39	squash=--no-squash ;;
	40	--ff)
	41	no_ff=--ff ;;
	42	--no-ff)
	43	no_ff=--no-ff ;;
60fb5b2c JH	44	-s=\|--s=\|--st=\|--str=\|--stra=\|--strat=\|--strate=*\|\
	45	--strateg=\|--strategy=\|\
	46	-s\|--s\|--st\|--str\|--stra\|--strat\|--strate\|--strateg\|--strategy)
	47	case "$#,$1" in
	48	,=*)
8096fae7	49	strategy=`expr "z$1" : 'z-[^=]=\(.\)'` ;;
60fb5b2c JH	50	1,*)
	51	usage ;;
	52	*)
	53	strategy="$2"
	54	shift ;;
	55	esac
	56	strategy_args="${strategy_args}-s $strategy "
	57	;;
cd67e4d4 JS	58	-r\|--r\|--re\|--reb\|--reba\|--rebas\|--rebase)
	59	rebase=true
	60	;;
	61	--no-r\|--no-re\|--no-reb\|--no-reba\|--no-rebas\|--no-rebase)
	62	rebase=false
	63	;;
93d69d86 JL	64	-h\|--h\|--he\|--hel\|--help)
	65	usage
	66	;;
822f7c73 DK	67	*)
822f7c73 DK	68	# Pass thru anything that may be meant for fetch.
619e5a0e	69	break
60fb5b2c JH	70	;;
	71	esac
	72	shift
	73	done
	74
441ed413 JH	75	error_on_no_merge_candidates () {
	76	exec >&2
	77	for opt
	78	do
	79	case "$opt" in
	80	-t\|--t\|--ta\|--tag\|--tags)
	81	echo "Fetching tags only, you probably meant:"
	82	echo " git fetch --tags"
	83	exit 1
	84	esac
	85	done
	86
	87	curr_branch=${curr_branch#refs/heads/}
	88
	89	echo "You asked me to pull without telling me which branch you"
	90	echo "want to merge with, and 'branch.${curr_branch}.merge' in"
	91	echo "your configuration file does not tell me either. Please"
	92	echo "name which branch you want to merge on the command line and"
	93	echo "try again (e.g. 'git pull <repository> <refspec>')."
	94	echo "See git-pull(1) for details on the refspec."
	95	echo
	96	echo "If you often merge with the same branch, you may want to"
	97	echo "configure the following variables in your configuration"
	98	echo "file:"
	99	echo
	100	echo " branch.${curr_branch}.remote = <nickname>"
	101	echo " branch.${curr_branch}.merge = <remote-ref>"
	102	echo " remote.<nickname>.url = <url>"
	103	echo " remote.<nickname>.fetch = <refspec>"
	104	echo
	105	echo "See git-config(1) for details."
	106	exit 1
	107	}
	108
5be60078	109	orig_head=$(git rev-parse --verify HEAD 2>/dev/null)
f9474132	110	git-fetch --update-head-ok "$@" \|\| exit 1
b10ac50f	111
5be60078	112	curr_head=$(git rev-parse --verify HEAD 2>/dev/null)
b10ac50f JH	113	if test "$curr_head" != "$orig_head"
	114	then
	115	# The fetch involved updating the current branch.
	116
	117	# The working tree and the index file is still based on the
	118	# $orig_head commit, but we are merging into $curr_head.
	119	# First update the working tree to match $curr_head.
	120
	121	echo >&2 "Warning: fetch updated the current branch head."
cf46e7b8	122	echo >&2 "Warning: fast forwarding your working tree from"
a057f806	123	echo >&2 "Warning: commit $orig_head."
5be60078 JH	124	git update-index --refresh 2>/dev/null
5be60078 JH	125	git read-tree -u -m "$orig_head" "$curr_head" \|\|
8323124a JH	126	die 'Cannot fast-forward your working tree.
	127	After making sure that you saved anything precious from
	128	$ git diff '$orig_head'
	129	output, run
	130	$ git reset --hard
	131	to recover.'
	132
b10ac50f JH	133	fi
b10ac50f JH	134
05dd8e2e JH	135	merge_head=$(sed -e '/ not-for-merge /d' \
	136	-e 's/ .*//' "$GIT_DIR"/FETCH_HEAD \| \
	137	tr '\012' ' ')
e0bfc81e JH	138
e0bfc81e JH	139	case "$merge_head" in
521003ff	140	'')
a74b1706	141	case $? in
441ed413 JH	142	0) error_on_no_merge_candidates "$@";;
	143	1) echo >&2 "You are not currently on a branch; you must explicitly"
	144	echo >&2 "specify which branch you wish to merge:"
	145	echo >&2 " git pull <remote> <branch>"
	146	exit 1;;
	147	*) exit $?;;
a74b1706	148	esac
521003ff	149	;;
60fb5b2c	150	?' '?)
d09e79cb LT	151	if test -z "$orig_head"
	152	then
	153	echo >&2 "Cannot merge multiple branches into empty head"
	154	exit 1
	155	fi
60fb5b2c JH	156	;;
	157	esac
	158
d09e79cb LT	159	if test -z "$orig_head"
d09e79cb LT	160	then
5be60078 JH	161	git update-ref -m "initial pull" HEAD $merge_head "" &&
5be60078 JH	162	git read-tree --reset -u HEAD \|\| exit 1
d09e79cb LT	163	exit
	164	fi
	165
5be60078	166	merge_name=$(git fmt-merge-msg <"$GIT_DIR/FETCH_HEAD") \|\| exit
cd67e4d4	167	test true = "$rebase" && exec git-rebase $merge_head
5072a323	168	exec git-merge $no_summary $no_commit $squash $no_ff $strategy_args \
7d0c6887	169	"$merge_name" HEAD $merge_head