kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

merge script: learn --[no-]rerere-autoupdate 

Port v1.7.0-rc0~83^2 (Teach --[no-]rerere-autoupdate option to
merge, revert and friends, 2009-12-04) to the example merge script.

After this change, all tests pass for me with the scripted
merge.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Jonathan Nieder 2010-08-17 02:13:40 -05:00 committed by Junio C Hamano
parent c2c9a87d4f
commit fdc4408a89
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
contrib/examples/git-merge.sh
View File

@ -16,6 +16,7 @@ squash create a single commit instead of doing a merge
commit perform a commit if the merge succeeds (default) commit perform a commit if the merge succeeds (default)
ff allow fast-forward (default) ff allow fast-forward (default)
ff-only abort if fast-forward is not possible ff-only abort if fast-forward is not possible
rerere-autoupdate update index with any reused conflict resolution
s,strategy= merge strategy to use s,strategy= merge strategy to use
X= option for selected merge strategy X= option for selected merge strategy
m,message= message to be used for the merge commit (if any) m,message= message to be used for the merge commit (if any)
@ -48,7 +49,7 @@ xopt=
allow_fast_forward=t allow_fast_forward=t
fast_forward_only= fast_forward_only=
allow_trivial_merge=t allow_trivial_merge=t
squash= no_commit= log_arg= squash= no_commit= log_arg= rr_arg=


dropsave() { dropsave() {
rm -f -- "$GIT_DIR/MERGE_HEAD" "$GIT_DIR/MERGE_MSG" \ rm -f -- "$GIT_DIR/MERGE_HEAD" "$GIT_DIR/MERGE_MSG" \
@ -200,6 +201,8 @@ parse_config () {
test "$allow_fast_forward" != f || test "$allow_fast_forward" != f ||
die "You cannot combine --ff-only with --no-ff." die "You cannot combine --ff-only with --no-ff."
fast_forward_only=t ;; fast_forward_only=t ;;
--rerere-autoupdate|--no-rerere-autoupdate)
rr_arg=$1 ;;
-s|--strategy) -s|--strategy)
shift shift
case " $all_strategies " in case " $all_strategies " in
@ -612,6 +615,6 @@ Conflicts:
sed -e 's/^[^ ]* / /' | sed -e 's/^[^ ]* / /' |
uniq uniq
} >>"$GIT_DIR/MERGE_MSG" } >>"$GIT_DIR/MERGE_MSG"
git rerere git rerere $rr_arg
die "Automatic merge failed; fix conflicts and then commit the result." die "Automatic merge failed; fix conflicts and then commit the result."
fi fi