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