From: Stefan Beller <sbeller@google.com>
To: bmwill@google.com
Cc: git@vger.kernel.org, jrnieder@gmail.com, gitster@pobox.com,
jonathantanmy@google.com, philipoakley@iee.org,
Stefan Beller <sbeller@google.com>
Subject: [PATCHv2 0/4] recursive submodules: git-reset!
Date: Tue, 18 Apr 2017 14:37:21 -0700 [thread overview]
Message-ID: <20170418213725.7901-1-sbeller@google.com> (raw)
v2:
* improved commit message to be proper English (Thanks, Philip!)
* clarified why the patch 2 is so short (i.e. it doesn't matter if the submodule
is initialized in the preparation repo, we care about the actual testing repo!
Thanks, Brandon)
* reworded patch 1 (Thanks Jonathan)
Thanks,
Stefan
v1: https://public-inbox.org/git/20170411234923.1860-1-sbeller@google.com/
Now that the BIG one has landed, e394fa01d6 (Merge branch
'sb/checkout-recurse-submodules', 2017-03-28), you would expect that
teaching to recurse into submodules is easy for all the remaining
working tree manipulations?
It turns out it is. See the last patch how we teach git-reset to recurse
into submodules.
However when thinking more about what git-reset is expected to do,
I added tests and some fixes for them (patch 2+3).
patch 1 is a correctness thing, required for patch 3.
Thanks,
Stefan
Stefan Beller (4):
entry.c: submodule recursing: respect force flag correctly
submodule.c: uninitialized submodules are ignored in recursive
commands
submodule.c: submodule_move_head works with broken submodules
builtin/reset: add --recurse-submodules switch
builtin/reset.c | 30 ++++++++++++++++++++++++++++++
entry.c | 8 ++++----
submodule.c | 31 +++++++++++++++++++++++++++----
t/lib-submodule-update.sh | 24 +++++++++++++++++++++---
t/t7112-reset-submodule.sh | 8 ++++++++
unpack-trees.c | 7 ++++++-
6 files changed, 96 insertions(+), 12 deletions(-)
next reply other threads:[~2017-04-18 21:37 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-18 21:37 Stefan Beller [this message]
2017-04-18 21:37 ` [PATCHv2 1/4] entry.c: submodule recursing: respect force flag correctly Stefan Beller
2017-04-18 21:37 ` [PATCHv2 2/4] submodule.c: uninitialized submodules are ignored in recursive commands Stefan Beller
2017-04-18 21:37 ` [PATCHv2 3/4] submodule.c: submodule_move_head works with broken submodules Stefan Beller
2017-04-18 21:37 ` [PATCHv2 4/4] builtin/reset: add --recurse-submodules switch Stefan Beller
2017-04-19 4:18 ` Junio C Hamano
2017-04-19 19:08 ` Stefan Beller
2017-04-21 17:39 ` [PATCHv3 " Stefan Beller
2017-04-20 19:41 ` [PATCHv2 0/4] recursive submodules: git-reset! Brandon Williams
2017-04-20 20:00 ` 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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170418213725.7901-1-sbeller@google.com \
--to=sbeller@google.com \
--cc=bmwill@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jonathantanmy@google.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.
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).