[PATCH v4 6/7] cherry-pick: add a no-op --no-ff option to future proof scripts
- From
Christian Couder <chriscool@tuxfamily.org>
- Date
- Mar 6, 2010, 20:34 UTC
- Message-ID
- <20100306203447.2960.5046.chriscool@tuxfamily.org>
- In-Reply-To
- <20100306203250.2960.30309.chriscool@tuxfamily.org>
A --ff option to allow "git cherry-pick" to fast forward if possible was added in a previous patch, and this behavior may become the default one in the future.
So to future proof scripts that may rely on the current behavior it is safer to add a --no-ff option to make sure that the current behavior will be used.
Requested-by: Paolo Bonzini <bonzini@gnu.org> Signed-off-by: Christian Couder <chriscool@tuxfamily.org> --- Documentation/git-cherry-pick.txt | 6 +++++- builtin/revert.c | 6 +++++- t/t3506-cherry-pick-ff.sh | 8 ++++++++ 3 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt index d71607a..dfc8243 100644 --- a/Documentation/git-cherry-pick.txt +++ b/Documentation/git-cherry-pick.txt @@ -7,7 +7,7 @@ git-cherry-pick - Apply the change introduced by an existing commit SYNOPSIS -------- -'git cherry-pick' [--edit] [-n] [-m parent-number] [-s] [-x] [--ff] <commit> +'git cherry-pick' [--edit] [-n] [-m parent-number] [-s] [-x] [--[no-]ff] <commit> DESCRIPTION ----------- @@ -75,6 +75,10 @@ effect to your index in a row. cherry-pick'ed commit, then a fast forward to this commit will be performed. +--no-ff:: + Does nothing right now, but in the future this may disallow + fast forward if it becomes the default behavior. + Author ------ Written by Junio C Hamano <gitster@pobox.com> diff --git a/builtin/revert.c b/builtin/revert.c index 476f41e..0651e34 100644 --- a/builtin/revert.c +++ b/builtin/revert.c @@ -36,7 +36,7 @@ static const char * const cherry_pick_usage[] = { NULL }; -static int edit, no_replay, no_commit, mainline, signoff, allow_ff; +static int edit, no_replay, no_commit, mainline, signoff, allow_ff, no_ff; static enum { REVERT, CHERRY_PICK } action; static struct commit *commit; static const char *commit_name; @@ -63,11 +63,13 @@ static void parse_args(int argc, const char **argv) OPT_END(), OPT_END(), OPT_END(), + OPT_END(), }; if (action == CHERRY_PICK) { struct option cp_extra[] = { OPT_BOOLEAN(0, "ff", &allow_ff, "allow fast-forward"), + OPT_BOOLEAN(0, "no-ff", &no_ff, "disallow fast forward"), OPT_END(), }; if (parse_options_concat(options, ARRAY_SIZE(options), cp_extra)) @@ -297,6 +299,8 @@ static int revert_or_cherry_pick(int argc, const char **argv) die("cherry-pick --ff cannot be used with -x"); if (edit) die("cherry-pick --ff cannot be used with --edit"); + if (no_ff) + die("cherry-pick --ff cannot be used with --no-ff"); } if (read_cache() < 0) diff --git a/t/t3506-cherry-pick-ff.sh b/t/t3506-cherry-pick-ff.sh index e17ae71..2d7e532 100755 --- a/t/t3506-cherry-pick-ff.sh +++ b/t/t3506-cherry-pick-ff.sh @@ -35,6 +35,14 @@ test_expect_success 'cherry-pick not using --ff does not fast forwards' ' test "$(git rev-parse --verify HEAD)" != "$(git rev-parse --verify second)" ' +test_expect_success 'cherry-pick using --no-ff does not fast forwards' ' + git checkout master && + git reset --hard first && + test_tick && + git cherry-pick --no-ff second && + test "$(git rev-parse --verify HEAD)" != "$(git rev-parse --verify second)" +' + # # We setup the following graph: #
-- 1.7.0.1.307.g861f4