[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


die_conflict () {
    git diff-index --cached --name-status -r --ignore-submodules HEAD --
    if [ $(git config --bool --get advice.resolveConflict || echo true) = "true" ]; then
	die "Pull is not possible because you have unmerged files.
Please, fix them up in the work tree, and then use 'git add/rm <file>'
as appropriate to mark resolution, or use 'git commit -a'."
    else
	die "Pull is not possible because you have unmerged files."
    fi
}

die_merge () {
    if [ $(git config --bool --get advice.resolveConflict || echo true) = "true" ]; then
	die "You have not concluded your merge (MERGE_HEAD exists).
Please, commit your changes before you can merge."
    else
	die "You have not concluded your merge (MERGE_HEAD exists)."
    fi
}

test -z "$(git ls-files -u)" || die_conflict
test -f "$GIT_DIR/MERGE_HEAD" && die_merge

strategy_args= diffstat= no_commit= squash= no_ff= ff_only=
log_arg= verbosity= progress= recurse_submodules=
merge_args=
curr_branch=$(git symbolic-ref -q HEAD)
curr_branch_short="${curr_branch#refs/heads/}"
rebase=$(git config --bool branch.$curr_branch_short.rebase)
dry_run=
while :
do
	case "$1" in
	-q|--quiet)
		verbosity="$verbosity -q" ;;
	-v|--verbose)
		verbosity="$verbosity -v" ;;
	--progress)
		progress=--progress ;;
	-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 "
		;;
	-X*)
		case "$#,$1" in
		1,-X)
			usage ;;
		*,-X)
			xx="-X $(git rev-parse --sq-quote "$2")"
			shift ;;
		*,*)
			xx=$(git rev-parse --sq-quote "$1") ;;
		esac
		merge_args="$merge_args$xx "
		;;
	-r|--r|--re|--reb|--reba|--rebas|--rebase)
		rebase=true
		;;
	--no-r|--no-re|--no-reb|--no-reba|--no-rebas|--no-rebase)
		rebase=false
		;;
	--recurse-submodules)
		recurse_submodules=--recurse-submodules
		;;
	--no-recurse-submodules)
		recurse_submodules=--no-recurse-submodules
		;;
	--d|--dr|--dry|--dry-|--dry-r|--dry-ru|--dry-run)
		dry_run=--dry-run
		;;
	-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

	if test true = "$rebase"
	then
		op_type=rebase
		op_prep=against
	else
		op_type=merge
		op_prep=with
	fi

	curr_branch=${curr_branch#refs/heads/}
	upstream=$(git config "branch.$curr_branch.merge")
	remote=$(git config "branch.$curr_branch.remote")

	if [ $# -gt 1 ]; then
		if [ "$rebase" = true ]; then
			printf "There is no candidate for rebasing against "
		else
			printf "There are no candidates for merging "
		fi
		echo "among 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. 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 remote branch you want to use 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 $op_type $op_prep, and 'branch.${curr_branch}.merge' in"
		echo "your configuration file does not tell me, either. Please"
		echo "specify which branch you want to use 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 $op_type $op_prep the same branch, you may want to"
		echo "use something like the following in your configuration file:"
		echo
		echo "    [branch \"${curr_branch}\"]"
		echo "    remote = <nickname>"
		echo "    merge = <remote-ref>"
		test rebase = "$op_type" &&
			echo "    rebase = true"
		echo
		echo "    [remote \"<nickname>\"]"
		echo "    url = <url>"
		echo "    fetch = <refspec>"
		echo
		echo "See git-config(1) for details."
	else
		echo "Your configuration specifies to $op_type $op_prep the ref '${upstream#refs/heads/}'"
		echo "from the 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
		require_clean_work_tree "pull with rebase" "Please commit or stash them."
	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 $progress $dry_run $recurse_submodules --update-head-ok "$@" || exit 1
test -z "$dry_run" || exit 0

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

if test true = "$rebase"
then
	o=$(git show-branch --merge-base $curr_branch $merge_head $oldremoteref)
	if test "$oldremoteref" = "$o"
	then
		unset oldremoteref
	fi
fi

merge_name=$(git fmt-merge-msg $log_arg <"$GIT_DIR/FETCH_HEAD") || exit
case "$rebase" in
true)
	eval="git-rebase $diffstat $strategy_args $merge_args"
	eval="$eval --onto $merge_head ${oldremoteref:-$merge_head}"
	;;
*)
	eval="git-merge $diffstat $no_commit $squash $no_ff $ff_only"
	eval="$eval  $log_arg $strategy_args $merge_args"
	eval="$eval \"\$merge_name\" HEAD $merge_head $verbosity"
	;;
esac
eval "exec $eval"
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
d38a30df MM	16
	17	die_conflict () {
	18	git diff-index --cached --name-status -r --ignore-submodules HEAD --
	19	if [ $(git config --bool --get advice.resolveConflict \|\| echo true) = "true" ]; then
	20	die "Pull is not possible because you have unmerged files.
	21	Please, fix them up in the work tree, and then use 'git add/rm <file>'
	22	as appropriate to mark resolution, or use 'git commit -a'."
	23	else
	24	die "Pull is not possible because you have unmerged files."
	25	fi
	26	}
	27
	28	die_merge () {
	29	if [ $(git config --bool --get advice.resolveConflict \|\| echo true) = "true" ]; then
	30	die "You have not concluded your merge (MERGE_HEAD exists).
	31	Please, commit your changes before you can merge."
	32	else
	33	die "You have not concluded your merge (MERGE_HEAD exists)."
	34	fi
	35	}
	36
	37	test -z "$(git ls-files -u)" \|\| die_conflict
	38	test -f "$GIT_DIR/MERGE_HEAD" && die_merge
d1014a17	39
13474835	40	strategy_args= diffstat= no_commit= squash= no_ff= ff_only=
7dce19d3	41	log_arg= verbosity= progress= recurse_submodules=
ee2c7955	42	merge_args=
cd67e4d4	43	curr_branch=$(git symbolic-ref -q HEAD)
0d12e59f	44	curr_branch_short="${curr_branch#refs/heads/}"
cd67e4d4	45	rebase=$(git config --bool branch.$curr_branch_short.rebase)
29609e68	46	dry_run=
822f7c73	47	while :
60fb5b2c JH	48	do
60fb5b2c JH	49	case "$1" in
7f87aff2	50	-q\|--quiet)
c6576f91	51	verbosity="$verbosity -q" ;;
7f87aff2	52	-v\|--verbose)
c6576f91	53	verbosity="$verbosity -v" ;;
9839018e TRC	54	--progress)
9839018e TRC	55	progress=--progress ;;
d8abe148	56	-n\|--no-stat\|--no-summary)
a334e125	57	diffstat=--no-stat ;;
d8abe148	58	--stat\|--summary)
a334e125	59	diffstat=--stat ;;
efb779f8 SG	60	--log\|--no-log)
efb779f8 SG	61	log_arg=$1 ;;
123ee3ca JH	62	--no-c\|--no-co\|--no-com\|--no-comm\|--no-commi\|--no-commit)
123ee3ca JH	63	no_commit=--no-commit ;;
5072a323 LH	64	--c\|--co\|--com\|--comm\|--commi\|--commit)
5072a323 LH	65	no_commit=--commit ;;
7d0c6887 JH	66	--sq\|--squ\|--squa\|--squas\|--squash)
7d0c6887 JH	67	squash=--squash ;;
5072a323 LH	68	--no-sq\|--no-squ\|--no-squa\|--no-squas\|--no-squash)
	69	squash=--no-squash ;;
	70	--ff)
	71	no_ff=--ff ;;
	72	--no-ff)
	73	no_ff=--no-ff ;;
13474835 BG	74	--ff-only)
13474835 BG	75	ff_only=--ff-only ;;
60fb5b2c JH	76	-s=\|--s=\|--st=\|--str=\|--stra=\|--strat=\|--strate=*\|\
	77	--strateg=\|--strategy=\|\
	78	-s\|--s\|--st\|--str\|--stra\|--strat\|--strate\|--strateg\|--strategy)
	79	case "$#,$1" in
	80	,=*)
8096fae7	81	strategy=`expr "z$1" : 'z-[^=]=\(.\)'` ;;
60fb5b2c JH	82	1,*)
	83	usage ;;
	84	*)
	85	strategy="$2"
	86	shift ;;
	87	esac
	88	strategy_args="${strategy_args}-s $strategy "
	89	;;
ee2c7955 AP	90	-X*)
	91	case "$#,$1" in
	92	1,-X)
	93	usage ;;
	94	*,-X)
14e5d40c	95	xx="-X $(git rev-parse --sq-quote "$2")"
ee2c7955 AP	96	shift ;;
ee2c7955 AP	97	,)
14e5d40c	98	xx=$(git rev-parse --sq-quote "$1") ;;
ee2c7955 AP	99	esac
	100	merge_args="$merge_args$xx "
	101	;;
cd67e4d4 JS	102	-r\|--r\|--re\|--reb\|--reba\|--rebas\|--rebase)
	103	rebase=true
	104	;;
	105	--no-r\|--no-re\|--no-reb\|--no-reba\|--no-rebas\|--no-rebase)
	106	rebase=false
	107	;;
7dce19d3 JL	108	--recurse-submodules)
	109	recurse_submodules=--recurse-submodules
	110	;;
be254a0e JL	111	--no-recurse-submodules)
	112	recurse_submodules=--no-recurse-submodules
	113	;;
29609e68 JK	114	--d\|--dr\|--dry\|--dry-\|--dry-r\|--dry-ru\|--dry-run)
	115	dry_run=--dry-run
	116	;;
93d69d86 JL	117	-h\|--h\|--he\|--hel\|--help)
	118	usage
	119	;;
822f7c73 DK	120	*)
822f7c73 DK	121	# Pass thru anything that may be meant for fetch.
619e5a0e	122	break
60fb5b2c JH	123	;;
	124	esac
	125	shift
	126	done
	127
441ed413 JH	128	error_on_no_merge_candidates () {
	129	exec >&2
	130	for opt
	131	do
	132	case "$opt" in
	133	-t\|--t\|--ta\|--tag\|--tags)
	134	echo "Fetching tags only, you probably meant:"
	135	echo " git fetch --tags"
	136	exit 1
	137	esac
	138	done
	139
995fc2f7 JK	140	if test true = "$rebase"
	141	then
	142	op_type=rebase
	143	op_prep=against
	144	else
	145	op_type=merge
	146	op_prep=with
	147	fi
	148
441ed413	149	curr_branch=${curr_branch#refs/heads/}
a6dbf881	150	upstream=$(git config "branch.$curr_branch.merge")
a8c9bef4	151	remote=$(git config "branch.$curr_branch.remote")
441ed413	152
a8c9bef4	153	if [ $# -gt 1 ]; then
995fc2f7 JK	154	if [ "$rebase" = true ]; then
	155	printf "There is no candidate for rebasing against "
	156	else
	157	printf "There are no candidates for merging "
	158	fi
	159	echo "among the refs that you just fetched."
a8c9bef4 JK	160	echo "Generally this means that you provided a wildcard refspec which had no"
	161	echo "matches on the remote end."
	162	elif [ $# -gt 0 ] && [ "$1" != "$remote" ]; then
	163	echo "You asked to pull from the remote '$1', but did not specify"
995fc2f7	164	echo "a branch. Because this is not the default configured remote"
a8c9bef4 JK	165	echo "for your current branch, you must specify a branch on the command line."
a8c9bef4 JK	166	elif [ -z "$curr_branch" ]; then
61e6108d MM	167	echo "You are not currently on a branch, so I cannot use any"
61e6108d MM	168	echo "'branch.<branchname>.merge' in your configuration file."
995fc2f7	169	echo "Please specify which remote branch you want to use on the command"
61e6108d MM	170	echo "line and try again (e.g. 'git pull <repository> <refspec>')."
61e6108d MM	171	echo "See git-pull(1) for details."
a6dbf881	172	elif [ -z "$upstream" ]; then
61e6108d	173	echo "You asked me to pull without telling me which branch you"
995fc2f7 JK	174	echo "want to $op_type $op_prep, and 'branch.${curr_branch}.merge' in"
	175	echo "your configuration file does not tell me, either. Please"
	176	echo "specify which branch you want to use on the command line and"
61e6108d MM	177	echo "try again (e.g. 'git pull <repository> <refspec>')."
	178	echo "See git-pull(1) for details."
	179	echo
995fc2f7 JK	180	echo "If you often $op_type $op_prep the same branch, you may want to"
	181	echo "use something like the following in your configuration file:"
	182	echo
	183	echo " [branch \"${curr_branch}\"]"
	184	echo " remote = <nickname>"
	185	echo " merge = <remote-ref>"
	186	test rebase = "$op_type" &&
	187	echo " rebase = true"
61e6108d	188	echo
995fc2f7 JK	189	echo " [remote \"<nickname>\"]"
	190	echo " url = <url>"
	191	echo " fetch = <refspec>"
61e6108d MM	192	echo
61e6108d MM	193	echo "See git-config(1) for details."
a6dbf881	194	else
995fc2f7 JK	195	echo "Your configuration specifies to $op_type $op_prep the ref '${upstream#refs/heads/}'"
995fc2f7 JK	196	echo "from the remote, but no such ref was fetched."
61e6108d	197	fi
441ed413 JH	198	exit 1
	199	}
	200
c85c7927	201	test true = "$rebase" && {
19a7fcbf JK	202	if ! git rev-parse -q --verify HEAD >/dev/null
	203	then
	204	# On an unborn branch
	205	if test -f "$GIT_DIR/index"
	206	then
	207	die "updating an unborn branch with changes added to the index"
	208	fi
	209	else
92c62a3f	210	require_clean_work_tree "pull with rebase" "Please commit or stash them."
19a7fcbf	211	fi
d44e7126	212	oldremoteref= &&
c85c7927	213	. git-parse-remote &&
d44e7126 SB	214	remoteref="$(get_remote_merge_branch "$@" 2>/dev/null)" &&
	215	oldremoteref="$(git rev-parse -q --verify "$remoteref")" &&
	216	for reflog in $(git rev-list -g $remoteref 2>/dev/null)
	217	do
	218	if test "$reflog" = "$(git merge-base $reflog $curr_branch)"
	219	then
	220	oldremoteref="$reflog"
	221	break
	222	fi
	223	done
c85c7927	224	}
2d179857	225	orig_head=$(git rev-parse -q --verify HEAD)
7dce19d3	226	git fetch $verbosity $progress $dry_run $recurse_submodules --update-head-ok "$@" \|\| exit 1
29609e68	227	test -z "$dry_run" \|\| exit 0
b10ac50f	228
2d179857	229	curr_head=$(git rev-parse -q --verify HEAD)
b0ad11ea	230	if test -n "$orig_head" && test "$curr_head" != "$orig_head"
b10ac50f JH	231	then
	232	# The fetch involved updating the current branch.
	233
	234	# The working tree and the index file is still based on the
	235	# $orig_head commit, but we are merging into $curr_head.
	236	# First update the working tree to match $curr_head.
	237
	238	echo >&2 "Warning: fetch updated the current branch head."
a75d7b54	239	echo >&2 "Warning: fast-forwarding your working tree from"
a057f806	240	echo >&2 "Warning: commit $orig_head."
7bd93c1c	241	git update-index -q --refresh
5be60078	242	git read-tree -u -m "$orig_head" "$curr_head" \|\|
8323124a JH	243	die 'Cannot fast-forward your working tree.
	244	After making sure that you saved anything precious from
	245	$ git diff '$orig_head'
	246	output, run
	247	$ git reset --hard
	248	to recover.'
	249
b10ac50f JH	250	fi
b10ac50f JH	251
05dd8e2e JH	252	merge_head=$(sed -e '/ not-for-merge /d' \
	253	-e 's/ .*//' "$GIT_DIR"/FETCH_HEAD \| \
	254	tr '\012' ' ')
e0bfc81e JH	255
e0bfc81e JH	256	case "$merge_head" in
521003ff	257	'')
4973aa22	258	error_on_no_merge_candidates "$@"
521003ff	259	;;
60fb5b2c	260	?' '?)
d09e79cb LT	261	if test -z "$orig_head"
d09e79cb LT	262	then
bc2bbc45	263	die "Cannot merge multiple branches into empty head"
d09e79cb	264	fi
51b2ead0 JS	265	if test true = "$rebase"
51b2ead0 JS	266	then
bc2bbc45	267	die "Cannot rebase onto multiple branches"
51b2ead0	268	fi
60fb5b2c JH	269	;;
	270	esac
	271
d09e79cb LT	272	if test -z "$orig_head"
d09e79cb LT	273	then
b0ad11ea	274	git update-ref -m "initial pull" HEAD $merge_head "$curr_head" &&
5be60078	275	git read-tree --reset -u HEAD \|\| exit 1
d09e79cb LT	276	exit
	277	fi
	278
cf65426d EN	279	if test true = "$rebase"
	280	then
	281	o=$(git show-branch --merge-base $curr_branch $merge_head $oldremoteref)
	282	if test "$oldremoteref" = "$o"
	283	then
	284	unset oldremoteref
	285	fi
	286	fi
	287
efb779f8	288	merge_name=$(git fmt-merge-msg $log_arg <"$GIT_DIR/FETCH_HEAD") \|\| exit
14e5d40c JH	289	case "$rebase" in
	290	true)
	291	eval="git-rebase $diffstat $strategy_args $merge_args"
	292	eval="$eval --onto $merge_head ${oldremoteref:-$merge_head}"
	293	;;
	294	*)
	295	eval="git-merge $diffstat $no_commit $squash $no_ff $ff_only"
	296	eval="$eval $log_arg $strategy_args $merge_args"
7ecee331	297	eval="$eval \"\$merge_name\" HEAD $merge_head $verbosity"
14e5d40c JH	298	;;
	299	esac
	300	eval "exec $eval"