2005-04-18 21:15:10 +02:00
|
|
|
#!/bin/sh
|
|
|
|
|
#
|
2005-08-23 06:57:59 +02:00
|
|
|
# Copyright (c) 2005 Junio C Hamano
|
|
|
|
|
#
|
|
|
|
|
# Fetch one or more remote refs and merge it/them into the current HEAD.
|
|
|
|
|
|
2007-10-29 09:41:18 +01:00
|
|
|
USAGE='[-n | --no-summary] [--[no-]commit] [--[no-]squash] [--[no-]ff] [-s strategy]... [<fetch-options>] <repo> <head>...'
|
2005-12-13 23:30:31 +01:00
|
|
|
LONG_USAGE='Fetch one or more remote refs and merge it/them into the current HEAD.'
|
2007-01-12 21:52:03 +01:00
|
|
|
SUBDIRECTORY_OK=Yes
|
2007-11-06 10:50:02 +01:00
|
|
|
OPTIONS_SPEC=
|
2005-11-24 09:12:11 +01:00
|
|
|
. git-sh-setup
|
2006-12-28 08:34:48 +01:00
|
|
|
set_reflog_action "pull $*"
|
2006-12-31 05:32:38 +01:00
|
|
|
require_work_tree
|
2007-01-12 21:52:03 +01:00
|
|
|
cd_to_toplevel
|
2005-08-26 03:15:32 +02:00
|
|
|
|
2007-01-01 08:21:50 +01:00
|
|
|
test -z "$(git ls-files -u)" ||
|
2007-01-12 21:52:03 +01:00
|
|
|
die "You are in the middle of a conflicted merge."
|
2007-01-01 08:21:50 +01:00
|
|
|
|
2007-10-29 09:41:18 +01:00
|
|
|
strategy_args= no_summary= no_commit= squash= no_ff=
|
2007-11-28 14:11:07 +01:00
|
|
|
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)
|
2007-09-23 22:42:08 +02:00
|
|
|
while :
|
2005-09-26 04:43:51 +02:00
|
|
|
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 ;;
|
2007-05-23 23:01:29 +02:00
|
|
|
--summary)
|
|
|
|
|
no_summary=$1
|
|
|
|
|
;;
|
2005-11-02 04:30:11 +01:00
|
|
|
--no-c|--no-co|--no-com|--no-comm|--no-commi|--no-commit)
|
|
|
|
|
no_commit=--no-commit ;;
|
2007-10-29 09:41:18 +01:00
|
|
|
--c|--co|--com|--comm|--commi|--commit)
|
|
|
|
|
no_commit=--commit ;;
|
git-merge --squash
Some people tend to do many little commits on a topic branch,
recording all the trials and errors, and when the topic is
reasonably cooked well, would want to record the net effect of
the series as one commit on top of the mainline, removing the
cruft from the history. The topic is then abandoned or forked
off again from that point at the mainline.
The barebone porcelainish that comes with core git tools does
not officially support such operation, but you can fake it by
using "git pull --no-merge" when such a topic branch is not a
strict superset of the mainline, like this:
git checkout mainline
git pull --no-commit . that-topic-branch
: fix conflicts if any
rm -f .git/MERGE_HEAD
git commit -a -m 'consolidated commit log message'
git branch -f that-topic-branch ;# now fully merged
This however does not work when the topic branch is a fast
forward of the mainline, because normal "git pull" will never
create a merge commit in such a case, and there is nothing
special --no-commit could do to begin with.
This patch introduces a new option, --squash, to support such a
workflow officially in both fast-forward case and true merge
case. The user-level operation would be the same in both cases:
git checkout mainline
git pull --squash . that-topic-branch
: fix conflicts if any -- naturally, there would be
: no conflict if fast forward.
git commit -a -m 'consolidated commit log message'
git branch -f that-topic-branch ;# now fully merged
When the current branch is already up-to-date with respect to
the other branch, there truly is nothing to do, so the new
option does not have any effect.
This was brought up in #git IRC channel recently.
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-23 10:37:02 +02:00
|
|
|
--sq|--squ|--squa|--squas|--squash)
|
|
|
|
|
squash=--squash ;;
|
2007-10-29 09:41:18 +01:00
|
|
|
--no-sq|--no-squ|--no-squa|--no-squas|--no-squash)
|
|
|
|
|
squash=--no-squash ;;
|
|
|
|
|
--ff)
|
|
|
|
|
no_ff=--ff ;;
|
|
|
|
|
--no-ff)
|
|
|
|
|
no_ff=--no-ff ;;
|
2005-09-26 04:43:51 +02:00
|
|
|
-s=*|--s=*|--st=*|--str=*|--stra=*|--strat=*|--strate=*|\
|
|
|
|
|
--strateg=*|--strategy=*|\
|
|
|
|
|
-s|--s|--st|--str|--stra|--strat|--strate|--strateg|--strategy)
|
|
|
|
|
case "$#,$1" in
|
|
|
|
|
*,*=*)
|
2006-06-27 18:54:26 +02:00
|
|
|
strategy=`expr "z$1" : 'z-[^=]*=\(.*\)'` ;;
|
2005-09-26 04:43:51 +02:00
|
|
|
1,*)
|
|
|
|
|
usage ;;
|
|
|
|
|
*)
|
|
|
|
|
strategy="$2"
|
|
|
|
|
shift ;;
|
|
|
|
|
esac
|
|
|
|
|
strategy_args="${strategy_args}-s $strategy "
|
|
|
|
|
;;
|
2007-11-28 14:11:07 +01:00
|
|
|
-r|--r|--re|--reb|--reba|--rebas|--rebase)
|
|
|
|
|
rebase=true
|
|
|
|
|
;;
|
|
|
|
|
--no-r|--no-re|--no-reb|--no-reba|--no-rebas|--no-rebase)
|
|
|
|
|
rebase=false
|
|
|
|
|
;;
|
2005-11-07 06:30:56 +01:00
|
|
|
-h|--h|--he|--hel|--help)
|
|
|
|
|
usage
|
|
|
|
|
;;
|
2007-09-23 22:42:08 +02:00
|
|
|
*)
|
|
|
|
|
# Pass thru anything that may be meant for fetch.
|
2005-10-04 00:45:44 +02:00
|
|
|
break
|
2005-09-26 04:43:51 +02:00
|
|
|
;;
|
|
|
|
|
esac
|
|
|
|
|
shift
|
|
|
|
|
done
|
|
|
|
|
|
2007-12-28 22:58:43 +01:00
|
|
|
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
|
|
|
|
|
}
|
|
|
|
|
|
2008-01-26 19:04:37 +01:00
|
|
|
test true = "$rebase" && {
|
|
|
|
|
. 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)"
|
|
|
|
|
}
|
2007-07-03 07:52:14 +02:00
|
|
|
orig_head=$(git rev-parse --verify HEAD 2>/dev/null)
|
2006-12-28 08:34:48 +01:00
|
|
|
git-fetch --update-head-ok "$@" || exit 1
|
2005-08-26 03:15:32 +02:00
|
|
|
|
2007-07-03 07:52:14 +02:00
|
|
|
curr_head=$(git rev-parse --verify HEAD 2>/dev/null)
|
2005-08-26 03:15:32 +02:00
|
|
|
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."
|
2006-03-22 10:09:43 +01:00
|
|
|
echo >&2 "Warning: fast forwarding your working tree from"
|
2006-10-11 08:00:29 +02:00
|
|
|
echo >&2 "Warning: commit $orig_head."
|
2007-07-03 07:52:14 +02:00
|
|
|
git update-index --refresh 2>/dev/null
|
|
|
|
|
git read-tree -u -m "$orig_head" "$curr_head" ||
|
2006-03-22 10:57:11 +01:00
|
|
|
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.'
|
|
|
|
|
|
2005-08-26 03:15:32 +02:00
|
|
|
fi
|
|
|
|
|
|
2005-09-26 07:54:23 +02:00
|
|
|
merge_head=$(sed -e '/ not-for-merge /d' \
|
|
|
|
|
-e 's/ .*//' "$GIT_DIR"/FETCH_HEAD | \
|
|
|
|
|
tr '\012' ' ')
|
2005-08-20 11:57:26 +02:00
|
|
|
|
|
|
|
|
case "$merge_head" in
|
2005-08-23 06:57:59 +02:00
|
|
|
'')
|
2007-01-15 23:25:33 +01:00
|
|
|
case $? in
|
2007-12-28 22:58:43 +01:00
|
|
|
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 $?;;
|
2007-01-15 23:25:33 +01:00
|
|
|
esac
|
2005-08-23 06:57:59 +02:00
|
|
|
;;
|
2005-09-26 04:43:51 +02:00
|
|
|
?*' '?*)
|
2006-11-16 20:47:22 +01:00
|
|
|
if test -z "$orig_head"
|
|
|
|
|
then
|
|
|
|
|
echo >&2 "Cannot merge multiple branches into empty head"
|
|
|
|
|
exit 1
|
|
|
|
|
fi
|
2005-09-26 04:43:51 +02:00
|
|
|
;;
|
|
|
|
|
esac
|
|
|
|
|
|
2006-11-16 20:47:22 +01:00
|
|
|
if test -z "$orig_head"
|
|
|
|
|
then
|
2007-07-03 07:52:14 +02:00
|
|
|
git update-ref -m "initial pull" HEAD $merge_head "" &&
|
|
|
|
|
git read-tree --reset -u HEAD || exit 1
|
2006-11-16 20:47:22 +01:00
|
|
|
exit
|
|
|
|
|
fi
|
|
|
|
|
|
2007-07-03 07:52:14 +02:00
|
|
|
merge_name=$(git fmt-merge-msg <"$GIT_DIR/FETCH_HEAD") || exit
|
2008-01-26 19:04:37 +01:00
|
|
|
test true = "$rebase" &&
|
2008-02-23 01:52:29 +01:00
|
|
|
exec git-rebase $strategy_args --onto $merge_head \
|
|
|
|
|
${oldremoteref:-$merge_head}
|
2007-10-29 09:41:18 +01:00
|
|
|
exec git-merge $no_summary $no_commit $squash $no_ff $strategy_args \
|
git-merge --squash
Some people tend to do many little commits on a topic branch,
recording all the trials and errors, and when the topic is
reasonably cooked well, would want to record the net effect of
the series as one commit on top of the mainline, removing the
cruft from the history. The topic is then abandoned or forked
off again from that point at the mainline.
The barebone porcelainish that comes with core git tools does
not officially support such operation, but you can fake it by
using "git pull --no-merge" when such a topic branch is not a
strict superset of the mainline, like this:
git checkout mainline
git pull --no-commit . that-topic-branch
: fix conflicts if any
rm -f .git/MERGE_HEAD
git commit -a -m 'consolidated commit log message'
git branch -f that-topic-branch ;# now fully merged
This however does not work when the topic branch is a fast
forward of the mainline, because normal "git pull" will never
create a merge commit in such a case, and there is nothing
special --no-commit could do to begin with.
This patch introduces a new option, --squash, to support such a
workflow officially in both fast-forward case and true merge
case. The user-level operation would be the same in both cases:
git checkout mainline
git pull --squash . that-topic-branch
: fix conflicts if any -- naturally, there would be
: no conflict if fast forward.
git commit -a -m 'consolidated commit log message'
git branch -f that-topic-branch ;# now fully merged
When the current branch is already up-to-date with respect to
the other branch, there truly is nothing to do, so the new
option does not have any effect.
This was brought up in #git IRC channel recently.
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-23 10:37:02 +02:00
|
|
|
"$merge_name" HEAD $merge_head
|