From: Felipe Contreras <felipe.contreras@gmail.com>
To: git@vger.kernel.org
Cc: Elijah Newren <newren@gmail.com>,
Alex Henrie <alexhenrie24@gmail.com>,
Junio C Hamano <gitster@pobox.com>, Jeff King <peff@peff.net>,
Philip Oakley <philipoakley@iee.email>,
Felipe Contreras <felipe.contreras@gmail.com>
Subject: [PATCH v4 17/19] pull: add pull.mode=ff-only
Date: Mon, 7 Dec 2020 18:26:46 -0600 [thread overview]
Message-ID: <20201208002648.1370414-18-felipe.contreras@gmail.com> (raw)
In-Reply-To: <20201208002648.1370414-1-felipe.contreras@gmail.com>
It is very typical for Git newcomers to inadvertently create merges and
worse; pushing them. This is one of the reasons many experienced users
prefer to avoid 'git pull', and recommend newcomers to avoid it as well.
To escape these problems--and keep 'git pull' useful--it has been
suggested that 'git pull' barfs by default if the merge is
non-fast-forward, which unfortunately would break backwards
compatibility.
This patch leaves everything in place to enable this new mode, but it
only gets enabled if the user specifically configures it;
pull.mode = ff-only.
Later on this mode can be enabled by default.
For the full discussion you can read:
https://lore.kernel.org/git/5363BB9F.40102@xiplink.com/
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
Documentation/config/branch.txt | 4 +--
Documentation/config/pull.txt | 4 +--
builtin/pull.c | 5 +++-
builtin/remote.c | 3 +++
rebase.c | 2 ++
rebase.h | 3 ++-
t/t5520-pull.sh | 45 +++++++++++++++++++++++++++++++++
7 files changed, 60 insertions(+), 6 deletions(-)
diff --git a/Documentation/config/branch.txt b/Documentation/config/branch.txt
index b57bf2c308..39f60cd8f7 100644
--- a/Documentation/config/branch.txt
+++ b/Documentation/config/branch.txt
@@ -98,8 +98,8 @@ for details).
branch.<name>.pullmode::
When "git pull" is run, this determines if it would either merge or
- rebase the fetched branch. The possible values are 'merge', and
- 'rebase'. See "pull.mode" for doing this in a non
+ rebase the fetched branch. The possible values are 'merge',
+ 'rebase', and 'ff-only'. See "pull.mode" for doing this in a non
branch-specific manner.
branch.<name>.description::
diff --git a/Documentation/config/pull.txt b/Documentation/config/pull.txt
index f4385cde33..40778d9120 100644
--- a/Documentation/config/pull.txt
+++ b/Documentation/config/pull.txt
@@ -32,8 +32,8 @@ for details).
pull.mode::
When "git pull" is run, this determines if it would either merge or
rebase the fetched branch. The possible values are 'merge',
- and 'rebase'. See "branch.<name>.pullmode" for setting this on a
- per-branch basis.
+ 'rebase', and 'ff-only'. See "branch.<name>.pullmode" for setting
+ this on a per-branch basis.
pull.octopus::
The default merge strategy to use when pulling multiple branches
diff --git a/builtin/pull.c b/builtin/pull.c
index 7756c8aea1..5a67667b79 100644
--- a/builtin/pull.c
+++ b/builtin/pull.c
@@ -1088,6 +1088,9 @@ int cmd_pull(int argc, const char **argv, const char *prefix)
can_ff = get_can_ff(&orig_head, &merge_heads.oid[0]);
+ if (mode == PULL_MODE_FF_ONLY && !can_ff)
+ die(_("The pull was not fast-forward, please either merge or rebase.\n"));
+
if (!opt_rebase && !can_ff && opt_verbosity >= 0 && (!opt_ff || !strcmp(opt_ff, "--ff"))) {
advise(_("Pulling without specifying how to reconcile divergent branches is discouraged;\n"
"you need to specify if you want a merge, or a rebase.\n"
@@ -1095,7 +1098,7 @@ int cmd_pull(int argc, const char **argv, const char *prefix)
"\n"
" git config pull.mode merge # (the default strategy)\n"
" git config pull.mode rebase\n"
- " git config pull.ff only # fast-forward only\n"
+ " git config pull.mode ff-only # fast-forward only\n"
"\n"
"You can replace \"git config\" with \"git config --global\" to set a default\n"
"preference for all repositories.\n"
diff --git a/builtin/remote.c b/builtin/remote.c
index 51b1e675e3..34d3ea9d38 100644
--- a/builtin/remote.c
+++ b/builtin/remote.c
@@ -335,6 +335,9 @@ static int config_read_branches(const char *key, const char *value, void *cb)
case PULL_MODE_REBASE:
info->rebase = REBASE_TRUE;
break;
+ case PULL_MODE_FF_ONLY:
+ info->rebase = REBASE_TRUE;
+ break;
default:
info->rebase = REBASE_INVALID;
break;
diff --git a/rebase.c b/rebase.c
index bdfca49886..c6233e888f 100644
--- a/rebase.c
+++ b/rebase.c
@@ -40,6 +40,8 @@ enum pull_mode_type pull_mode_parse_value(const char *value)
return PULL_MODE_MERGE;
else if (!strcmp(value, "rebase") || !strcmp(value, "r"))
return PULL_MODE_REBASE;
+ else if (!strcmp(value, "ff-only") || !strcmp(value, "f"))
+ return PULL_MODE_FF_ONLY;
return PULL_MODE_INVALID;
}
diff --git a/rebase.h b/rebase.h
index 5ab8f4ddd5..432bcb55c4 100644
--- a/rebase.h
+++ b/rebase.h
@@ -17,7 +17,8 @@ enum pull_mode_type {
PULL_MODE_INVALID = -1,
PULL_MODE_DEFAULT = 0,
PULL_MODE_MERGE,
- PULL_MODE_REBASE
+ PULL_MODE_REBASE,
+ PULL_MODE_FF_ONLY
};
enum pull_mode_type pull_mode_parse_value(const char *value);
diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh
index eb0086bd1c..b5b007b175 100755
--- a/t/t5520-pull.sh
+++ b/t/t5520-pull.sh
@@ -861,4 +861,49 @@ test_expect_success 'git pull --rebase against local branch' '
test_cmp expect file2
'
+setup_other () {
+ test_when_finished "git checkout master && git branch -D other test" &&
+ git checkout -b other $1 &&
+ >new &&
+ git add new &&
+ git commit -m new &&
+ git checkout -b test -t other &&
+ git reset --hard master
+}
+
+setup_ff () {
+ setup_other master
+}
+
+setup_non_ff () {
+ setup_other master^
+}
+
+test_expect_success 'fast-forward (pull.mode=ff-only)' '
+ setup_ff &&
+ git -c pull.mode=ff-only pull
+'
+
+test_expect_success 'non-fast-forward (pull.mode=ff-only)' '
+ setup_non_ff &&
+ test_must_fail git -c pull.mode=ff-only pull
+'
+
+test_expect_success 'non-fast-forward with merge (pull.mode=ff-only)' '
+ setup_non_ff &&
+ git -c pull.mode=ff-only pull --merge
+'
+
+test_expect_success 'non-fast-forward with rebase (pull.mode=ff-only)' '
+ setup_non_ff &&
+ git -c pull.mode=ff-only pull --rebase
+'
+
+test_expect_success 'non-fast-forward error message (pull.mode=ff-only)' '
+ setup_non_ff &&
+ test_must_fail git -c pull.mode=ff-only pull 2> error &&
+ cat error &&
+ test_i18ngrep "The pull was not fast-forward" error
+'
+
test_done
--
2.29.2
next prev parent reply other threads:[~2020-12-08 0:29 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-08 0:26 [PATCH v4 00/19] pull: default ff-only mode Felipe Contreras
2020-12-08 0:26 ` [PATCH v4 01/19] doc: pull: explain what is a fast-forward Felipe Contreras
2020-12-08 0:26 ` [PATCH v4 02/19] pull: improve default warning Felipe Contreras
2020-12-08 0:26 ` [PATCH v4 03/19] pull: refactor fast-forward check Felipe Contreras
2020-12-08 0:26 ` [PATCH v4 04/19] pull: cleanup autostash check Felipe Contreras
2020-12-08 0:26 ` [PATCH v4 05/19] pull: trivial cleanup Felipe Contreras
2020-12-08 0:26 ` [PATCH v4 06/19] pull: move default warning Felipe Contreras
2020-12-08 0:26 ` [PATCH v4 07/19] pull: display default warning only when non-ff Felipe Contreras
2020-12-08 0:26 ` [PATCH v4 08/19] pull: trivial whitespace style fix Felipe Contreras
2020-12-08 0:26 ` [PATCH v4 09/19] pull: introduce --merge option Felipe Contreras
2020-12-08 0:26 ` [PATCH v4 10/19] pull: show warning with --ff Felipe Contreras
2020-12-08 0:26 ` [PATCH v4 11/19] rebase: add REBASE_DEFAULT Felipe Contreras
2020-12-08 0:26 ` [PATCH v4 12/19] pull: move configurations fetches Felipe Contreras
2020-12-08 0:26 ` [PATCH v4 13/19] test: merge-pull-config: trivial cleanup Felipe Contreras
2020-12-08 0:26 ` [PATCH v4 14/19] test: pull-options: revert unnecessary changes Felipe Contreras
2020-12-08 0:26 ` [PATCH v4 15/19] pull: trivial memory fix Felipe Contreras
2020-12-08 0:26 ` [PATCH v4 16/19] pull: add pull.mode Felipe Contreras
2020-12-08 0:26 ` Felipe Contreras [this message]
2020-12-08 0:26 ` [PATCH v4 18/19] pull: advice of future changes Felipe Contreras
2020-12-08 0:26 ` [PATCH v4 19/19] future: pull: enable ff-only mode by default Felipe Contreras
2020-12-08 0:57 ` [PATCH v4 00/19] pull: default ff-only mode Felipe Contreras
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201208002648.1370414-18-felipe.contreras@gmail.com \
--to=felipe.contreras@gmail.com \
--cc=alexhenrie24@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=newren@gmail.com \
--cc=peff@peff.net \
--cc=philipoakley@iee.email \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).