git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / mirror / code / Atom feed
* [PATCH v7 0/1] Reject non-ff pulls by default
@ 2020-11-23 22:46 Felipe Contreras
  2020-11-23 22:46 ` [PATCH v7 1/1] pull: add ff-only option Felipe Contreras
  0 siblings, 1 reply; 11+ messages in thread
From: Felipe Contreras @ 2020-11-23 22:46 UTC (permalink / raw)
  To: git
  Cc: Vít Ondruch, Alex Henrie, Theodore Y . Ts'o, Jeff King,
	Andreas Krey, John Keeping, Richard Hansen, Philip Oakley,
	Brian M. Carlson, W. Trevor King, Felipe Contreras

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


^ permalink raw reply	[flat|nested] 11+ messages in thread

end of thread, other threads:[~2020-11-24  3:47 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-23 22:46 [PATCH v7 0/1] Reject non-ff pulls by default Felipe Contreras
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

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).