From: Stefan Beller <sbeller@google.com>
To: bmwill@google.com, novalis@novalis.org
Cc: git@vger.kernel.org, Stefan Beller <sbeller@google.com>
Subject: [RFC/PATCH 0/4] working tree operations: support superprefix
Date: Mon, 9 Jan 2017 17:45:38 -0800 [thread overview]
Message-ID: <20170110014542.19352-1-sbeller@google.com> (raw)
As you may know, I am trying to implement "git checkout --recurse-submodules"
which recurses into submodules and update the submodules to the recorded
state of the superproject. I realized that such a huge change is a big endeavor,
and needs to be broken up into many series.
Currently I plan to send about 4 series:
* This one; teaching the superprefix to working tree operations.
* structured tests, i.e. enhancing lib-submodule-update.sh to have a function
to test for any corner case (File/Submodule conflict,
Directory/Submodule conflict; non-existence of submodule commit; and such)
* the actual internal implementation, mostly touching unpack-trees.c,
entry.c and helper functions in submodule.c
* Enabling commands to take advantage of the infrastructure provided.
At that point we only need to add a --recurse-submodule flag in the
respective command and add a line to its respective test
"test_switch_submodule_recursing $cmd --recurse-submodule"
--
This patch series is the first of the four series.
It consists of 4 patches, the first 3 are refactoring to a modern style of Git,
the last patch is the actual patch that allows read-tree to be used with
the superprefix option. read-tree is already exposed there to make the
super-prefix code tested.
The series is based on master.
Thanks,
Stefan
Stefan Beller (4):
read-tree: use OPT_BOOL instead of OPT_SET_INT
t1000: modernize style
t1001: modernize style
unpack-trees: support super-prefix option
builtin/read-tree.c | 36 +--
git.c | 2 +-
t/t1000-read-tree-m-3way.sh | 648 +++++++++++++++++++++----------------------
t/t1001-read-tree-m-2way.sh | 650 ++++++++++++++++++++++----------------------
unpack-trees.c | 39 ++-
5 files changed, 699 insertions(+), 676 deletions(-)
--
2.11.0.rc2.30.g7c4be45.dirty
next reply other threads:[~2017-01-10 1:45 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-10 1:45 Stefan Beller [this message]
2017-01-10 1:45 ` [PATCH 1/4] read-tree: use OPT_BOOL instead of OPT_SET_INT Stefan Beller
2017-01-10 20:41 ` Junio C Hamano
2017-01-10 1:45 ` [PATCH 2/4] t1000: modernize style Stefan Beller
2017-01-10 20:37 ` Junio C Hamano
2017-01-10 20:43 ` Stefan Beller
2017-01-10 22:01 ` Junio C Hamano
2017-01-10 1:45 ` [PATCH 3/4] t1001: " Stefan Beller
2017-01-10 1:45 ` [PATCH 4/4] unpack-trees: support super-prefix option Stefan Beller
2017-01-11 21:32 ` Junio C Hamano
2017-01-11 22:12 ` Stefan Beller
2017-01-11 23:28 ` Junio C Hamano
2017-01-11 23:57 ` Stefan Beller
2017-01-12 0:12 ` [PATCHv2 " Stefan Beller
2017-01-12 21:40 ` Junio C Hamano
2017-01-12 22:19 ` Stefan Beller
[not found] ` <152c0fbf-084c-847f-2a30-a45ea3dd26f2@gmail.com>
2017-01-13 17:56 ` [RFC/PATCH 0/4] working tree operations: support superprefix Brian J. Davis
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=20170110014542.19352-1-sbeller@google.com \
--to=sbeller@google.com \
--cc=bmwill@google.com \
--cc=git@vger.kernel.org \
--cc=novalis@novalis.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 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 NNTP newsgroup(s).