git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / mirror / code / Atom feed
* [PATCH v8 00/10] Reject non-ff pulls by default
@ 2020-11-25  3:29 Felipe Contreras
  2020-11-25  3:29 ` [PATCH v8 01/10] pull: refactor fast-forward check Felipe Contreras
                   ` (9 more replies)
  0 siblings, 10 replies; 13+ messages in thread
From: Felipe Contreras @ 2020-11-25  3:29 UTC (permalink / raw)
  To: git
  Cc: Alex Henrie, Jeff King, Junio C Hamano, Elijah Newren,
	Johannes Schindelin, 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].

Since v7 of the series the pull.mode configuration is added, and the warning has been updated to
make use of that.

What is missing from the old series is:
  * Add git pull --merge
  * Actually change the default to ff-only

Cheers.

[1] https://lore.kernel.org/git/1398988808-29678-1-git-send-email-felipe.contreras@gmail.com/


Felipe Contreras (10):
  pull: refactor fast-forward check
  pull: cleanup autostash check
  pull: trivial cleanup
  pull: move default warning
  pull: display default warning only when non-ff
  test: pull-options: revert unnecessary changes
  rebase: add REBASE_DEFAULT
  pull: add pull.mode
  pull: add pull.mode=ff-only
  pull: improve default warning

 Documentation/config/branch.txt |   6 ++
 Documentation/config/pull.txt   |   6 ++
 Documentation/git-pull.txt      |  17 ++++
 builtin/pull.c                  | 146 ++++++++++++++++++++++----------
 builtin/remote.c                |  22 ++++-
 rebase.c                        |  12 +++
 rebase.h                        |  13 ++-
 t/t5520-pull.sh                 |  92 ++++++++++++++++++++
 t/t5521-pull-options.sh         |  22 ++---
 t/t7601-merge-pull-config.sh    |  49 ++++-------
 10 files changed, 297 insertions(+), 88 deletions(-)

-- 
2.29.2


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

end of thread, other threads:[~2020-12-02  5:06 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-25  3:29 [PATCH v8 00/10] Reject non-ff pulls by default Felipe Contreras
2020-11-25  3:29 ` [PATCH v8 01/10] pull: refactor fast-forward check Felipe Contreras
2020-11-25  3:29 ` [PATCH v8 02/10] pull: cleanup autostash check Felipe Contreras
2020-11-25  3:29 ` [PATCH v8 03/10] pull: trivial cleanup Felipe Contreras
2020-11-25  3:29 ` [PATCH v8 04/10] pull: move default warning Felipe Contreras
2020-11-25  3:29 ` [PATCH v8 05/10] pull: display default warning only when non-ff Felipe Contreras
2020-11-25  3:29 ` [PATCH v8 06/10] test: pull-options: revert unnecessary changes Felipe Contreras
2020-11-25  3:29 ` [PATCH v8 07/10] rebase: add REBASE_DEFAULT Felipe Contreras
2020-11-25  3:29 ` [PATCH v8 08/10] pull: add pull.mode Felipe Contreras
2020-11-25 12:31   ` Philip Oakley
2020-12-02  5:04     ` Felipe Contreras
2020-11-25  3:29 ` [PATCH v8 09/10] pull: add pull.mode=ff-only Felipe Contreras
2020-11-25  3:29 ` [PATCH v8 10/10] pull: improve default warning Felipe Contreras

Code repositories for project(s) associated with this 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).