From: Stefan Beller <sbeller@google.com>
To: bmwill@google.com
Cc: git@vger.kernel.org, jrnieder@gmail.com, gitster@pobox.com,
philipoakley@iee.org, Stefan Beller <sbeller@google.com>
Subject: [PATCH 0/3] pull: optionally rebase submodules
Date: Fri, 23 Jun 2017 12:12:59 -0700 [thread overview]
Message-ID: <20170623191302.16053-1-sbeller@google.com> (raw)
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 reply other threads:[~2017-06-23 19:13 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-23 19:12 Stefan Beller [this message]
2017-06-23 19:13 ` [PATCH 1/3] builtin/fetch: factor submodule recurse parsing out to submodule config Stefan Beller
2017-06-23 22:26 ` Junio C Hamano
2017-06-23 19:13 ` [PATCH 2/3] builtin/fetch: parse recurse-submodules-default at default options parsing Stefan Beller
2017-06-23 22:36 ` Junio C Hamano
2017-06-23 22:49 ` Stefan Beller
2017-06-24 0:51 ` Junio C Hamano
2017-06-27 3:00 ` Stefan Beller
2017-06-27 21:31 ` [PATCH] builtin/fetch cleanup: always set default value for submodule recursing Stefan Beller
2017-06-23 19:13 ` [PATCH 3/3] pull: optionally rebase submodules (remote submodule changes only) Stefan Beller
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170623191302.16053-1-sbeller@google.com \
--to=sbeller@google.com \
--cc=bmwill@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
--cc=philipoakley@iee.org \
/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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.