[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= no_stat= no_commit= squash= no_ff= 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=-q ;;
	-v|--verbose)
		verbosity=-v ;;
	-n|--no-stat|--no-summary)
		no_stat=-n ;;
	--stat|--summary)
		no_stat=$1 ;;
	--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 ;;
	-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
}

test true = "$rebase" && {
	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"

	. git-parse-remote &&
	origin="$1"
	test -z "$origin" && origin=$(get_default_remote)
	reflist="$(get_remote_refs_for_fetch "$@" 2>/dev/null |
		sed "s|refs/heads/\(.*\):|\1|")" &&
	oldremoteref="$(git rev-parse --verify \
		"refs/remotes/$origin/$reflist" 2>/dev/null)"
}
orig_head=$(git rev-parse --verify HEAD 2>/dev/null)
git fetch $verbosity --update-head-ok "$@" || exit 1

curr_head=$(git rev-parse --verify HEAD 2>/dev/null)
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 --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 "$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 $strategy_args --onto $merge_head \
	${oldremoteref:-$merge_head}
exec git-merge $no_stat $no_commit $squash $no_ff $log_arg $strategy_args \
	"$merge_name" HEAD $merge_head $verbosity
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
7f87aff2	19	strategy_args= no_stat= no_commit= squash= no_ff= log_arg= verbosity=
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
60fb5b2c JH	25	case "$1" in
7f87aff2 TA	26	-q\|--quiet)
	27	verbosity=-q ;;
	28	-v\|--verbose)
	29	verbosity=-v ;;
d8abe148 SG	30	-n\|--no-stat\|--no-summary)
	31	no_stat=-n ;;
	32	--stat\|--summary)
	33	no_stat=$1 ;;
efb779f8 SG	34	--log\|--no-log)
efb779f8 SG	35	log_arg=$1 ;;
123ee3ca JH	36	--no-c\|--no-co\|--no-com\|--no-comm\|--no-commi\|--no-commit)
123ee3ca JH	37	no_commit=--no-commit ;;
5072a323 LH	38	--c\|--co\|--com\|--comm\|--commi\|--commit)
5072a323 LH	39	no_commit=--commit ;;
7d0c6887 JH	40	--sq\|--squ\|--squa\|--squas\|--squash)
7d0c6887 JH	41	squash=--squash ;;
5072a323 LH	42	--no-sq\|--no-squ\|--no-squa\|--no-squas\|--no-squash)
	43	squash=--no-squash ;;
	44	--ff)
	45	no_ff=--ff ;;
	46	--no-ff)
	47	no_ff=--no-ff ;;
60fb5b2c JH	48	-s=\|--s=\|--st=\|--str=\|--stra=\|--strat=\|--strate=*\|\
	49	--strateg=\|--strategy=\|\
	50	-s\|--s\|--st\|--str\|--stra\|--strat\|--strate\|--strateg\|--strategy)
	51	case "$#,$1" in
	52	,=*)
8096fae7	53	strategy=`expr "z$1" : 'z-[^=]=\(.\)'` ;;
60fb5b2c JH	54	1,*)
	55	usage ;;
	56	*)
	57	strategy="$2"
	58	shift ;;
	59	esac
	60	strategy_args="${strategy_args}-s $strategy "
	61	;;
cd67e4d4 JS	62	-r\|--r\|--re\|--reb\|--reba\|--rebas\|--rebase)
	63	rebase=true
	64	;;
	65	--no-r\|--no-re\|--no-reb\|--no-reba\|--no-rebas\|--no-rebase)
	66	rebase=false
	67	;;
93d69d86 JL	68	-h\|--h\|--he\|--hel\|--help)
	69	usage
	70	;;
822f7c73 DK	71	*)
822f7c73 DK	72	# Pass thru anything that may be meant for fetch.
619e5a0e	73	break
60fb5b2c JH	74	;;
	75	esac
	76	shift
	77	done
	78
441ed413 JH	79	error_on_no_merge_candidates () {
	80	exec >&2
	81	for opt
	82	do
	83	case "$opt" in
	84	-t\|--t\|--ta\|--tag\|--tags)
	85	echo "Fetching tags only, you probably meant:"
	86	echo " git fetch --tags"
	87	exit 1
	88	esac
	89	done
	90
	91	curr_branch=${curr_branch#refs/heads/}
	92
	93	echo "You asked me to pull without telling me which branch you"
	94	echo "want to merge with, and 'branch.${curr_branch}.merge' in"
	95	echo "your configuration file does not tell me either. Please"
	96	echo "name which branch you want to merge on the command line and"
	97	echo "try again (e.g. 'git pull <repository> <refspec>')."
	98	echo "See git-pull(1) for details on the refspec."
	99	echo
	100	echo "If you often merge with the same branch, you may want to"
	101	echo "configure the following variables in your configuration"
	102	echo "file:"
	103	echo
	104	echo " branch.${curr_branch}.remote = <nickname>"
	105	echo " branch.${curr_branch}.merge = <remote-ref>"
	106	echo " remote.<nickname>.url = <url>"
	107	echo " remote.<nickname>.fetch = <refspec>"
	108	echo
	109	echo "See git-config(1) for details."
	110	exit 1
	111	}
	112
c85c7927	113	test true = "$rebase" && {
7d90c8ee JS	114	git update-index --ignore-submodules --refresh &&
	115	git diff-files --ignore-submodules --quiet &&
	116	git diff-index --ignore-submodules --cached --quiet HEAD -- \|\|
f9189cf8 JS	117	die "refusing to pull with rebase: your working tree is not up-to-date"
f9189cf8 JS	118
c85c7927 JS	119	. git-parse-remote &&
	120	origin="$1"
	121	test -z "$origin" && origin=$(get_default_remote)
	122	reflist="$(get_remote_refs_for_fetch "$@" 2>/dev/null \|
	123	sed "s\|refs/heads/\(.*\):\|\1\|")" &&
	124	oldremoteref="$(git rev-parse --verify \
	125	"refs/remotes/$origin/$reflist" 2>/dev/null)"
	126	}
5be60078	127	orig_head=$(git rev-parse --verify HEAD 2>/dev/null)
7f87aff2	128	git fetch $verbosity --update-head-ok "$@" \|\| exit 1
b10ac50f	129
5be60078	130	curr_head=$(git rev-parse --verify HEAD 2>/dev/null)
b0ad11ea	131	if test -n "$orig_head" && test "$curr_head" != "$orig_head"
b10ac50f JH	132	then
	133	# The fetch involved updating the current branch.
	134
	135	# The working tree and the index file is still based on the
	136	# $orig_head commit, but we are merging into $curr_head.
	137	# First update the working tree to match $curr_head.
	138
	139	echo >&2 "Warning: fetch updated the current branch head."
cf46e7b8	140	echo >&2 "Warning: fast forwarding your working tree from"
a057f806	141	echo >&2 "Warning: commit $orig_head."
5be60078 JH	142	git update-index --refresh 2>/dev/null
5be60078 JH	143	git read-tree -u -m "$orig_head" "$curr_head" \|\|
8323124a JH	144	die 'Cannot fast-forward your working tree.
	145	After making sure that you saved anything precious from
	146	$ git diff '$orig_head'
	147	output, run
	148	$ git reset --hard
	149	to recover.'
	150
b10ac50f JH	151	fi
b10ac50f JH	152
05dd8e2e JH	153	merge_head=$(sed -e '/ not-for-merge /d' \
	154	-e 's/ .*//' "$GIT_DIR"/FETCH_HEAD \| \
	155	tr '\012' ' ')
e0bfc81e JH	156
e0bfc81e JH	157	case "$merge_head" in
521003ff	158	'')
a74b1706	159	case $? in
441ed413 JH	160	0) error_on_no_merge_candidates "$@";;
	161	1) echo >&2 "You are not currently on a branch; you must explicitly"
	162	echo >&2 "specify which branch you wish to merge:"
	163	echo >&2 " git pull <remote> <branch>"
	164	exit 1;;
	165	*) exit $?;;
a74b1706	166	esac
521003ff	167	;;
60fb5b2c	168	?' '?)
d09e79cb LT	169	if test -z "$orig_head"
	170	then
	171	echo >&2 "Cannot merge multiple branches into empty head"
	172	exit 1
	173	fi
60fb5b2c JH	174	;;
	175	esac
	176
d09e79cb LT	177	if test -z "$orig_head"
d09e79cb LT	178	then
b0ad11ea	179	git update-ref -m "initial pull" HEAD $merge_head "$curr_head" &&
5be60078	180	git read-tree --reset -u HEAD \|\| exit 1
d09e79cb LT	181	exit
	182	fi
	183
efb779f8	184	merge_name=$(git fmt-merge-msg $log_arg <"$GIT_DIR/FETCH_HEAD") \|\| exit
c85c7927	185	test true = "$rebase" &&
0d2dd191 JS	186	exec git-rebase $strategy_args --onto $merge_head \
0d2dd191 JS	187	${oldremoteref:-$merge_head}
efb779f8	188	exec git-merge $no_stat $no_commit $squash $no_ff $log_arg $strategy_args \
7f87aff2	189	"$merge_name" HEAD $merge_head $verbosity