[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-stat] [--[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= diffstat= no_commit= squash= no_ff= ff_only=
log_arg= verbosity=
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
	-q|--quiet)
		verbosity="$verbosity -q" ;;
	-v|--verbose)
		verbosity="$verbosity -v" ;;
	-n|--no-stat|--no-summary)
		diffstat=--no-stat ;;
	--stat|--summary)
		diffstat=--stat ;;
	--log|--no-log)
		log_arg=$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 ;;
	--ff-only)
		ff_only=--ff-only ;;
	-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/}
	upstream=$(git config "branch.$curr_branch.merge")
	remote=$(git config "branch.$curr_branch.remote")

	if [ $# -gt 1 ]; then
		echo "There are no candidates for merging in the refs that you just fetched."
		echo "Generally this means that you provided a wildcard refspec which had no"
		echo "matches on the remote end."
	elif [ $# -gt 0 ] && [ "$1" != "$remote" ]; then
		echo "You asked to pull from the remote '$1', but did not specify"
		echo "a branch to merge. Because this is not the default configured remote"
		echo "for your current branch, you must specify a branch on the command line."
	elif [ -z "$curr_branch" ]; then
		echo "You are not currently on a branch, so I cannot use any"
		echo "'branch.<branchname>.merge' in your configuration file."
		echo "Please specify which branch you want to merge on the command"
		echo "line and try again (e.g. 'git pull <repository> <refspec>')."
		echo "See git-pull(1) for details."
	elif [ -z "$upstream" ]; then
		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 "specify 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."
		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."
	else
		echo "Your configuration specifies to merge the ref '${upstream#refs/heads/}' from the"
		echo "remote, but no such ref was fetched."
	fi
	exit 1
}

test true = "$rebase" && {
	if ! git rev-parse -q --verify HEAD >/dev/null
	then
		# On an unborn branch
		if test -f "$GIT_DIR/index"
		then
			die "updating an unborn branch with changes added to the index"
		fi
	else
		git update-index --ignore-submodules --refresh &&
		git diff-files --ignore-submodules --quiet &&
		git diff-index --ignore-submodules --cached --quiet HEAD -- ||
		die "refusing to pull with rebase: your working tree is not up-to-date"
	fi
	oldremoteref= &&
	. git-parse-remote &&
	remoteref="$(get_remote_merge_branch "$@" 2>/dev/null)" &&
	oldremoteref="$(git rev-parse -q --verify "$remoteref")" &&
	for reflog in $(git rev-list -g $remoteref 2>/dev/null)
	do
		if test "$reflog" = "$(git merge-base $reflog $curr_branch)"
		then
			oldremoteref="$reflog"
			break
		fi
	done
}
orig_head=$(git rev-parse -q --verify HEAD)
git fetch $verbosity --update-head-ok "$@" || exit 1

curr_head=$(git rev-parse -q --verify HEAD)
if test -n "$orig_head" && 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 -q --refresh
	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
'')
	error_on_no_merge_candidates "$@"
	;;
?*' '?*)
	if test -z "$orig_head"
	then
		die "Cannot merge multiple branches into empty head"
	fi
	if test true = "$rebase"
	then
		die "Cannot rebase onto multiple branches"
	fi
	;;
esac

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

merge_name=$(git fmt-merge-msg $log_arg <"$GIT_DIR/FETCH_HEAD") || exit
test true = "$rebase" &&
	exec git rebase $diffstat $strategy_args --onto $merge_head \
	${oldremoteref:-$merge_head}
exec git merge $verbosity $diffstat $no_commit $squash $no_ff $ff_only $log_arg $strategy_args \
	-m "$merge_name" $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
d8abe148	7	USAGE='[-n \| --no-stat] [--[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
13474835 BG	19	strategy_args= diffstat= no_commit= squash= no_ff= ff_only=
13474835 BG	20	log_arg= verbosity=
cd67e4d4 JS	21	curr_branch=$(git symbolic-ref -q HEAD)
	22	curr_branch_short=$(echo "$curr_branch" \| sed "s\|refs/heads/\|\|")
	23	rebase=$(git config --bool branch.$curr_branch_short.rebase)
822f7c73	24	while :
60fb5b2c JH	25	do
60fb5b2c JH	26	case "$1" in
7f87aff2	27	-q\|--quiet)
c6576f91	28	verbosity="$verbosity -q" ;;
7f87aff2	29	-v\|--verbose)
c6576f91	30	verbosity="$verbosity -v" ;;
d8abe148	31	-n\|--no-stat\|--no-summary)
a334e125	32	diffstat=--no-stat ;;
d8abe148	33	--stat\|--summary)
a334e125	34	diffstat=--stat ;;
efb779f8 SG	35	--log\|--no-log)
efb779f8 SG	36	log_arg=$1 ;;
123ee3ca JH	37	--no-c\|--no-co\|--no-com\|--no-comm\|--no-commi\|--no-commit)
123ee3ca JH	38	no_commit=--no-commit ;;
5072a323 LH	39	--c\|--co\|--com\|--comm\|--commi\|--commit)
5072a323 LH	40	no_commit=--commit ;;
7d0c6887 JH	41	--sq\|--squ\|--squa\|--squas\|--squash)
7d0c6887 JH	42	squash=--squash ;;
5072a323 LH	43	--no-sq\|--no-squ\|--no-squa\|--no-squas\|--no-squash)
	44	squash=--no-squash ;;
	45	--ff)
	46	no_ff=--ff ;;
	47	--no-ff)
	48	no_ff=--no-ff ;;
13474835 BG	49	--ff-only)
13474835 BG	50	ff_only=--ff-only ;;
60fb5b2c JH	51	-s=\|--s=\|--st=\|--str=\|--stra=\|--strat=\|--strate=*\|\
	52	--strateg=\|--strategy=\|\
	53	-s\|--s\|--st\|--str\|--stra\|--strat\|--strate\|--strateg\|--strategy)
	54	case "$#,$1" in
	55	,=*)
8096fae7	56	strategy=`expr "z$1" : 'z-[^=]=\(.\)'` ;;
60fb5b2c JH	57	1,*)
	58	usage ;;
	59	*)
	60	strategy="$2"
	61	shift ;;
	62	esac
	63	strategy_args="${strategy_args}-s $strategy "
	64	;;
cd67e4d4 JS	65	-r\|--r\|--re\|--reb\|--reba\|--rebas\|--rebase)
	66	rebase=true
	67	;;
	68	--no-r\|--no-re\|--no-reb\|--no-reba\|--no-rebas\|--no-rebase)
	69	rebase=false
	70	;;
93d69d86 JL	71	-h\|--h\|--he\|--hel\|--help)
	72	usage
	73	;;
822f7c73 DK	74	*)
822f7c73 DK	75	# Pass thru anything that may be meant for fetch.
619e5a0e	76	break
60fb5b2c JH	77	;;
	78	esac
	79	shift
	80	done
	81
441ed413 JH	82	error_on_no_merge_candidates () {
	83	exec >&2
	84	for opt
	85	do
	86	case "$opt" in
	87	-t\|--t\|--ta\|--tag\|--tags)
	88	echo "Fetching tags only, you probably meant:"
	89	echo " git fetch --tags"
	90	exit 1
	91	esac
	92	done
	93
	94	curr_branch=${curr_branch#refs/heads/}
a6dbf881	95	upstream=$(git config "branch.$curr_branch.merge")
a8c9bef4	96	remote=$(git config "branch.$curr_branch.remote")
441ed413	97
a8c9bef4 JK	98	if [ $# -gt 1 ]; then
	99	echo "There are no candidates for merging in the refs that you just fetched."
	100	echo "Generally this means that you provided a wildcard refspec which had no"
	101	echo "matches on the remote end."
	102	elif [ $# -gt 0 ] && [ "$1" != "$remote" ]; then
	103	echo "You asked to pull from the remote '$1', but did not specify"
	104	echo "a branch to merge. Because this is not the default configured remote"
	105	echo "for your current branch, you must specify a branch on the command line."
	106	elif [ -z "$curr_branch" ]; then
61e6108d MM	107	echo "You are not currently on a branch, so I cannot use any"
	108	echo "'branch.<branchname>.merge' in your configuration file."
	109	echo "Please specify which branch you want to merge on the command"
	110	echo "line and try again (e.g. 'git pull <repository> <refspec>')."
	111	echo "See git-pull(1) for details."
a6dbf881	112	elif [ -z "$upstream" ]; then
61e6108d MM	113	echo "You asked me to pull without telling me which branch you"
	114	echo "want to merge with, and 'branch.${curr_branch}.merge' in"
	115	echo "your configuration file does not tell me either. Please"
	116	echo "specify which branch you want to merge on the command line and"
	117	echo "try again (e.g. 'git pull <repository> <refspec>')."
	118	echo "See git-pull(1) for details."
	119	echo
	120	echo "If you often merge with the same branch, you may want to"
	121	echo "configure the following variables in your configuration"
	122	echo "file:"
	123	echo
	124	echo " branch.${curr_branch}.remote = <nickname>"
	125	echo " branch.${curr_branch}.merge = <remote-ref>"
	126	echo " remote.<nickname>.url = <url>"
	127	echo " remote.<nickname>.fetch = <refspec>"
	128	echo
	129	echo "See git-config(1) for details."
a6dbf881	130	else
a8c9bef4 JK	131	echo "Your configuration specifies to merge the ref '${upstream#refs/heads/}' from the"
a8c9bef4 JK	132	echo "remote, but no such ref was fetched."
61e6108d	133	fi
441ed413 JH	134	exit 1
	135	}
	136
c85c7927	137	test true = "$rebase" && {
19a7fcbf JK	138	if ! git rev-parse -q --verify HEAD >/dev/null
	139	then
	140	# On an unborn branch
	141	if test -f "$GIT_DIR/index"
	142	then
	143	die "updating an unborn branch with changes added to the index"
	144	fi
	145	else
	146	git update-index --ignore-submodules --refresh &&
	147	git diff-files --ignore-submodules --quiet &&
	148	git diff-index --ignore-submodules --cached --quiet HEAD -- \|\|
	149	die "refusing to pull with rebase: your working tree is not up-to-date"
	150	fi
d44e7126	151	oldremoteref= &&
c85c7927	152	. git-parse-remote &&
d44e7126 SB	153	remoteref="$(get_remote_merge_branch "$@" 2>/dev/null)" &&
	154	oldremoteref="$(git rev-parse -q --verify "$remoteref")" &&
	155	for reflog in $(git rev-list -g $remoteref 2>/dev/null)
	156	do
	157	if test "$reflog" = "$(git merge-base $reflog $curr_branch)"
	158	then
	159	oldremoteref="$reflog"
	160	break
	161	fi
	162	done
c85c7927	163	}
2d179857	164	orig_head=$(git rev-parse -q --verify HEAD)
7f87aff2	165	git fetch $verbosity --update-head-ok "$@" \|\| exit 1
b10ac50f	166
2d179857	167	curr_head=$(git rev-parse -q --verify HEAD)
b0ad11ea	168	if test -n "$orig_head" && test "$curr_head" != "$orig_head"
b10ac50f JH	169	then
	170	# The fetch involved updating the current branch.
	171
	172	# The working tree and the index file is still based on the
	173	# $orig_head commit, but we are merging into $curr_head.
	174	# First update the working tree to match $curr_head.
	175
	176	echo >&2 "Warning: fetch updated the current branch head."
a75d7b54	177	echo >&2 "Warning: fast-forwarding your working tree from"
a057f806	178	echo >&2 "Warning: commit $orig_head."
7bd93c1c	179	git update-index -q --refresh
5be60078	180	git read-tree -u -m "$orig_head" "$curr_head" \|\|
8323124a JH	181	die 'Cannot fast-forward your working tree.
	182	After making sure that you saved anything precious from
	183	$ git diff '$orig_head'
	184	output, run
	185	$ git reset --hard
	186	to recover.'
	187
b10ac50f JH	188	fi
b10ac50f JH	189
05dd8e2e JH	190	merge_head=$(sed -e '/ not-for-merge /d' \
	191	-e 's/ .*//' "$GIT_DIR"/FETCH_HEAD \| \
	192	tr '\012' ' ')
e0bfc81e JH	193
e0bfc81e JH	194	case "$merge_head" in
521003ff	195	'')
4973aa22	196	error_on_no_merge_candidates "$@"
521003ff	197	;;
60fb5b2c	198	?' '?)
d09e79cb LT	199	if test -z "$orig_head"
d09e79cb LT	200	then
bc2bbc45	201	die "Cannot merge multiple branches into empty head"
d09e79cb	202	fi
51b2ead0 JS	203	if test true = "$rebase"
51b2ead0 JS	204	then
bc2bbc45	205	die "Cannot rebase onto multiple branches"
51b2ead0	206	fi
60fb5b2c JH	207	;;
	208	esac
	209
d09e79cb LT	210	if test -z "$orig_head"
d09e79cb LT	211	then
b0ad11ea	212	git update-ref -m "initial pull" HEAD $merge_head "$curr_head" &&
5be60078	213	git read-tree --reset -u HEAD \|\| exit 1
d09e79cb LT	214	exit
	215	fi
	216
efb779f8	217	merge_name=$(git fmt-merge-msg $log_arg <"$GIT_DIR/FETCH_HEAD") \|\| exit
c85c7927	218	test true = "$rebase" &&
c0ecb070	219	exec git rebase $diffstat $strategy_args --onto $merge_head \
0d2dd191	220	${oldremoteref:-$merge_head}
c0ecb070 HB	221	exec git merge $verbosity $diffstat $no_commit $squash $no_ff $ff_only $log_arg $strategy_args \
c0ecb070 HB	222	-m "$merge_name" $merge_head