mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'lh/merge'

Browse Source 
* lh/merge:
  git-merge: add --ff and --no-ff options
  git-merge: add support for --commit and --no-squash
  git-merge: add support for branch.<name>.mergeoptions
  git-merge: refactor option parsing
  git-merge: fix faulty SQUASH_MSG
  Add test-script for git-merge porcelain
This commit is contained in:
Junio C Hamano
2007-10-03 03:05:58 -07:00
parent 9b0185ca06 d66424c4ac
commit e66273a6ab
5 changed files with 521 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
git-merge.sh
View File

@ -3,7 +3,7 @@
# Copyright (c) 2005 Junio C Hamano
#
USAGE='[-n] [--summary] [--no-commit] [--squash] [-s <strategy>] [-m=<merge-message>] <commit>+'
USAGE='[-n] [--summary] [--[no-]commit] [--[no-]squash] [--[no-]ff] [-s <strategy>] [-m=<merge-message>] <commit>+'
SUBDIRECTORY_OK=Yes
. git-sh-setup
@ -59,7 +59,7 @@ finish_up_to_date () {
squash_message () {
echo Squashed commit of the following:
echo
git log --no-merges ^"$head" $remote
git log --no-merges ^"$head" $remoteheads
}
finish () {
@ -133,11 +133,7 @@ merge_name () {
fi
}
case "$#" in 0) usage ;; esac
have_message=
while test $# != 0
do
parse_option () {
case "$1" in
-n|--n|--no|--no-|--no-s|--no-su|--no-sum|--no-summ|\
--no-summa|--no-summar|--no-summary)
@ -145,9 +141,17 @@ do
--summary)
show_diffstat=t ;;
--sq|--squ|--squa|--squas|--squash)
squash=t no_commit=t ;;
allow_fast_forward=t squash=t no_commit=t ;;
--no-sq|--no-squ|--no-squa|--no-squas|--no-squash)
allow_fast_forward=t squash= no_commit= ;;
--c|--co|--com|--comm|--commi|--commit)
allow_fast_forward=t squash= no_commit= ;;
--no-c|--no-co|--no-com|--no-comm|--no-commi|--no-commit)
no_commit=t ;;
allow_fast_forward=t squash= no_commit=t ;;
--ff)
allow_fast_forward=t squash= no_commit= ;;
--no-ff)
allow_fast_forward=false squash= no_commit= ;;
-s=*|--s=*|--st=*|--str=*|--stra=*|--strat=*|--strate=*|\
--strateg=*|--strategy=*|\
-s|--s|--st|--str|--stra|--strat|--strate|--strateg|--strategy)
@ -180,9 +184,42 @@ do
have_message=t
;;
-*) usage ;;
*) break ;;
*) return 1 ;;
esac
shift
args_left=$#
}
parse_config () {
while test $# -gt 0
do
parse_option "$@" || usage
while test $args_left -lt $#
do
shift
done
done
}
test $# != 0 || usage
have_message=
if branch=$(git-symbolic-ref -q HEAD)
then
mergeopts=$(git config "branch.${branch#refs/heads/}.mergeoptions")
if test -n "$mergeopts"
then
parse_config $mergeopts
fi
fi
while parse_option "$@"
do
while test $args_left -lt $#
do
shift
done
done
if test -z "$show_diffstat"; then
@ -458,7 +495,13 @@ done
# auto resolved the merge cleanly.
if test '' != "$result_tree"
then
parents=$(git show-branch --independent "$head" "$@" | sed -e 's/^/-p /')
if test "$allow_fast_forward" = "t"
then
parents=$(git show-branch --independent "$head" "$@")
else
parents=$(git rev-parse "$head" "$@")
fi
parents=$(echo "$parents" | sed -e 's/^/-p /')
result_commit=$(printf '%s\n' "$merge_msg" | git commit-tree $result_tree $parents) || exit
finish "$result_commit" "Merge made by $wt_strategy."
dropsave