git@vger.kernel.org mailing list mirror (one of many)
 help / Atom feed
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
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


             reply index

Thread overview: 10+ messages in thread (expand / 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 publically 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 to all the recipients 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

git@vger.kernel.org mailing list mirror (one of many)

Archives are clonable:
	git clone --mirror https://public-inbox.org/git
	git clone --mirror http://ou63pmih66umazou.onion/git
	git clone --mirror http://czquwvybam4bgbro.onion/git
	git clone --mirror http://hjrcffqmbrq6wope.onion/git

Newsgroups are available over NNTP:
	nntp://news.public-inbox.org/inbox.comp.version-control.git
	nntp://ou63pmih66umazou.onion/inbox.comp.version-control.git
	nntp://czquwvybam4bgbro.onion/inbox.comp.version-control.git
	nntp://hjrcffqmbrq6wope.onion/inbox.comp.version-control.git
	nntp://news.gmane.org/gmane.comp.version-control.git

 note: .onion URLs require Tor: https://www.torproject.org/
       or Tor2web: https://www.tor2web.org/

AGPL code for this site: git clone https://public-inbox.org/ public-inbox