[PATCH 5/5] git-merge: add --ff and --no-ff options
- From
- Lars Hjemli <hjemli@gmail.com>
- Date
- Sep 22, 2007, 00:33 UTC
- Message-ID
- <1190421186-21784-6-git-send-email-hjemli@gmail.com>
- In-Reply-To
- <1190421186-21784-5-git-send-email-hjemli@gmail.com>
These new options can be used to control the policy for fast-forward merges: --ff allows it (this is the default) while --no-ff will create a merge commit.
Signed-off-by: Lars Hjemli <hjemli@gmail.com> --- Documentation/merge-options.txt | 9 +++++++++ git-merge.sh | 20 +++++++++++++++----- t/t7600-merge.sh | 18 ++++++++++++++++++ 3 files changed, 42 insertions(+), 5 deletions(-)
diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt index 9be90b5..b6c4dc4 100644 --- a/Documentation/merge-options.txt +++ b/Documentation/merge-options.txt @@ -23,6 +23,15 @@ top of the current branch whose effect is the same as merging another branch (or more in case of an octopus). +--no-ff:: + Generate a merge commit even if the merge resolved as a + fast-forward. + +--ff:: + Do not generate a merge commit if the merge resolved as + a fast-forward, only update the branch pointer. This is + the default behavior of git-merge. + -s <strategy>, \--strategy=<strategy>:: Use the given merge strategy; can be supplied more than once to specify them in the order they should be tried. diff --git a/git-merge.sh b/git-merge.sh index 73ff130..daa95a1 100755 --- a/git-merge.sh +++ b/git-merge.sh @@ -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] [--squash] [--[no-]ff] -s <strategy>] [-m=<merge-message>] <commit>+' SUBDIRECTORY_OK=Yes . git-sh-setup @@ -127,11 +127,15 @@ parse_option () { --summary) show_diffstat=t ;; --sq|--squ|--squa|--squas|--squash) - squash=t no_commit=t ;; + allow_fast_forward=t squash=t no_commit=t ;; --c|--co|--com|--comm|--commi|--commit) - squash= no_commit= ;; + allow_fast_forward=t squash= no_commit= ;; --no-c|--no-co|--no-com|--no-comm|--no-commi|--no-commit) - squash= 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) @@ -470,7 +474,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 diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh index 75b0ee4..6e16a28 100755 --- a/t/t7600-merge.sh +++ b/t/t7600-merge.sh @@ -393,4 +393,22 @@ test_expect_success 'merge c1 with c2 (override --squash)' ' test "$c2" = "$(git rev-parse HEAD^2)" ' +test_expect_success 'merge c0 with c1 (no-ff)' ' + git reset --hard c0 && + git merge --no-ff c1 && + test "$c0" = "$(git rev-parse HEAD^1)" && + test "$c1" = "$(git rev-parse HEAD^2)" +' + +test_debug 'gitk --all' + +test_expect_success 'merge c0 with c1 (ff overrides no-ff)' ' + git reset --hard c0 && + git config branch.master.mergeoptions "--no-ff" && + git merge --ff c1 && + test "$c1" = "$(git rev-parse HEAD)" +' + +test_debug 'gitk --all' + test_done
-- 1.5.3.2.82.g75c8d