git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH 0/3] pull: optionally rebase submodules

From
Stefan Beller <sbeller@google.com>
Date
Jun 23, 2017, 19:12 UTC
Message-ID
<20170623191302.16053-1-sbeller@google.com>

This supersedes the RFC in May by Brandon https://public-inbox.org/git/20170511172437.96878-1-bmwill@google.com/

It adds more (enough?) error checking, as explained in the last commit message.

Documentation and issues raised in the review of that RFC have been addressed.

The first two patches are a little refactoring needed for the last patch that adds the functionality.

Thanks, Stefan

Stefan Beller (3):
  builtin/fetch: factor submodule recurse parsing out to submodule
    config
  builtin/fetch: parse recurse-submodules-default at default options
    parsing
  pull: optionally rebase submodules (remote submodule changes only)
 Documentation/git-pull.txt | 12 ++++----
 builtin/fetch.c            | 37 ++++++++---------------
 builtin/pull.c             | 73 +++++++++++++++++++++++++++++++++++++++-------
 submodule-config.c         | 22 ++++++++++++++
 submodule-config.h         |  3 ++
 submodule.c                | 26 +++++++++++++++++
 submodule.h                |  4 +++
 t/t5572-pull-submodule.sh  | 58 ++++++++++++++++++++++++++++++++++++
 8 files changed, 194 insertions(+), 41 deletions(-)
-- 
2.12.2.575.gb14f27f917
Next: Stefan Beller
Message 1 of 10 in “pull: optionally rebase submodules”
  1. 0/3 pull: optionally rebase submodulesStefan Beller, Jun 23, 2017
  2. 1/3 builtin/fetch: factor submodule recurse parsing out to submodule configStefan Beller, Jun 23, 2017
  3. Junio C HamanoJun 23, 2017
  4. 2/3 builtin/fetch: parse recurse-submodules-default at default options parsingStefan Beller, Jun 23, 2017
  5. Junio C HamanoJun 23, 2017
  6. Stefan BellerJun 23, 2017
  7. Junio C HamanoJun 24, 2017
  8. Stefan BellerJun 27, 2017
  9. builtin/fetch cleanup: always set default value for submodule recursingStefan Beller, Jun 27, 2017
  10. 3/3 pull: optionally rebase submodules (remote submodule changes only)Stefan Beller, Jun 23, 2017

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.