From: Felipe Contreras <felipe.contreras@gmail.com>
To: git@vger.kernel.org
Cc: "Vít Ondruch" <vondruch@redhat.com>,
"Alex Henrie" <alexhenrie24@gmail.com>,
"Theodore Y . Ts'o" <tytso@mit.edu>, "Jeff King" <peff@peff.net>,
"Andreas Krey" <a.krey@gmx.de>,
"John Keeping" <john@keeping.me.uk>,
"Richard Hansen" <rhansen@rhansen.org>,
"Philip Oakley" <philipoakley@iee.org>,
"Brian M. Carlson" <sandals@crustytoothpaste.net>,
"W. Trevor King" <wking@tremily.us>,
"Felipe Contreras" <felipe.contreras@gmail.com>
Subject: [PATCH v7 0/1] Reject non-ff pulls by default
Date: Mon, 23 Nov 2020 16:46:20 -0600 [thread overview]
Message-ID: <20201123224621.2573159-1-felipe.contreras@gmail.com> (raw)
This is an attempt to revive the old patch series [1], except the only thing it's doing is the
important change: adding the option to reject non-ff pulls.
Following this patch the next one should add a new default mode that warns instead of fail, and the
next one change the default to ff-only.
This leaves the interface in an inconsistent state, IMO, since I believe these should work:
* git pull --rebase
* git pull --merge
* git -c pull.mode=rebase pull
* git -c pull.mode=merge pull
* git -c pull.mode=ff-only pull
But that can be fixed later.
Cheers.
[1] https://lore.kernel.org/git/1398988808-29678-1-git-send-email-felipe.contreras@gmail.com/
Felipe Contreras (1):
pull: add ff-only option
Documentation/config/branch.txt | 2 ++
Documentation/config/pull.txt | 2 ++
builtin/pull.c | 6 +++++-
rebase.c | 2 ++
rebase.h | 3 ++-
t/t5520-pull.sh | 36 +++++++++++++++++++++++++++++++++
6 files changed, 49 insertions(+), 2 deletions(-)
--
2.29.2
next reply other threads:[~2020-11-23 22:55 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-23 22:46 Felipe Contreras [this message]
2020-11-23 22:46 ` [PATCH v7 1/1] pull: add ff-only option Felipe Contreras
2020-11-23 23:02 ` Felipe Contreras
2020-11-23 23:22 ` Alex Henrie
2020-11-23 23:32 ` Junio C Hamano
2020-11-23 23:51 ` Felipe Contreras
2020-11-24 1:45 ` Jeff King
2020-11-24 0:08 ` Felipe Contreras
2020-11-24 0:32 ` Raymond E. Pasco
2020-11-24 1:51 ` Alex Henrie
2020-11-24 3:45 ` 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=20201123224621.2573159-1-felipe.contreras@gmail.com \
--to=felipe.contreras@gmail.com \
--cc=a.krey@gmx.de \
--cc=alexhenrie24@gmail.com \
--cc=git@vger.kernel.org \
--cc=john@keeping.me.uk \
--cc=peff@peff.net \
--cc=philipoakley@iee.org \
--cc=rhansen@rhansen.org \
--cc=sandals@crustytoothpaste.net \
--cc=tytso@mit.edu \
--cc=vondruch@redhat.com \
--cc=wking@tremily.us \
/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).