From: Stefan Beller <sbeller@google.com>
To: jonathantanmy@google.com
Cc: bmwill@google.com, git@vger.kernel.org, gitster@pobox.com,
hvoigt@hvoigt.net, sbeller@google.com, seanwbehan@riseup.net
Subject: [PATCHv3 0/6] Moving submodules with nested submodules
Date: Wed, 28 Mar 2018 15:35:25 -0700 [thread overview]
Message-ID: <20180328223531.241920-1-sbeller@google.com> (raw)
In-Reply-To: <20180328105416.3add54858bac92573d7d1130@google.com>
v3:
* reordered patches to have Jonathans patch before submodule_free
* addressed Jonathans comments on patch 5.
* rebased on origin/sb/object-store to resolve a visibility conflict
about repo_init being exposed outside of repository.c
v2:
* addressed memleaks and messy code in patch 5
* removed the extern keyword where applicable
* extended the commit message, stating we want to rename submodule_free
in the future.
* picked up Jonathans patch and added it as a nice finish of the series.
I did not see the need or aesthetic desire to put that patch earlier
in the series.
Thanks,
Stefan
v1:
This fixes the bug reported in [1] ("Bug: moving submodules that have submodules
inside them causes a fatal error in git status")
[1] https://public-inbox.org/git/20180306192017.GA5797@riseup.net/
Thanks,
Stefan
Jonathan Tan (1):
grep: remove "repo" arg from non-supporting funcs
Stefan Beller (5):
submodule.h: drop declaration of connect_work_tree_and_git_dir
submodule-config: allow submodule_free to handle arbitrary
repositories
submodule-config: add repository argument to submodule_from_{name,
path}
submodule-config: remove submodule_from_cache
submodule: fixup nested submodules after moving the submodule
.../technical/api-submodule-config.txt | 2 +-
builtin/grep.c | 14 ++---
builtin/mv.c | 6 +-
builtin/submodule--helper.c | 17 +++---
dir.c | 60 ++++++++++++++++++-
dir.h | 12 +++-
repository.c | 8 +--
repository.h | 3 +
submodule-config.c | 29 ++++-----
submodule-config.h | 15 +++--
submodule.c | 40 +++++++------
submodule.h | 1 -
t/helper/test-submodule-config.c | 8 ++-
t/t7001-mv.sh | 2 +-
unpack-trees.c | 2 +-
15 files changed, 140 insertions(+), 79 deletions(-)
--
2.17.0.rc1.321.gba9d0f2565-goog
next prev parent reply other threads:[~2018-03-28 22:35 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-27 21:39 [PATCH 0/5] Moving submodules with nested submodules Stefan Beller
2018-03-27 21:39 ` [PATCH 1/5] submodule.h: drop declaration of connect_work_tree_and_git_dir Stefan Beller
2018-03-27 21:39 ` [PATCH 2/5] submodule-config: allow submodule_free to handle arbitrary repositories Stefan Beller
2018-03-27 22:57 ` Brandon Williams
2018-03-27 22:58 ` [PATCH] grep: remove "repo" arg from non-supporting funcs Jonathan Tan
2018-03-27 23:20 ` Stefan Beller
2018-03-28 0:24 ` Jonathan Tan
2018-03-28 0:35 ` Stefan Beller
2018-03-27 21:39 ` [PATCH 3/5] submodule-config: add repository argument to submodule_from_{name, path} Stefan Beller
2018-03-27 23:04 ` Jonathan Tan
2018-03-27 23:53 ` Stefan Beller
2018-03-27 21:39 ` [PATCH 4/5] submodule-config: remove submodule_from_cache Stefan Beller
2018-03-27 23:07 ` Jonathan Tan
2018-03-27 21:39 ` [PATCH 5/5] submodule: fixup nested submodules after moving the submodule Stefan Beller
2018-03-27 23:25 ` Brandon Williams
2018-03-28 0:07 ` Jonathan Tan
2018-03-28 0:42 ` Stefan Beller
2018-03-28 17:24 ` [PATCHv2 0/6] Moving submodules with nested submodules Stefan Beller
2018-03-28 17:24 ` [PATCH 1/6] submodule.h: drop declaration of connect_work_tree_and_git_dir Stefan Beller
2018-03-28 17:24 ` [PATCH 2/6] submodule-config: allow submodule_free to handle arbitrary repositories Stefan Beller
2018-03-28 17:24 ` [PATCH 3/6] submodule-config: add repository argument to submodule_from_{name, path} Stefan Beller
2018-03-28 17:24 ` [PATCH 4/6] submodule-config: remove submodule_from_cache Stefan Beller
2018-03-28 17:24 ` [PATCH 5/6] submodule: fixup nested submodules after moving the submodule Stefan Beller
2018-03-28 17:35 ` Brandon Williams
2018-03-28 19:08 ` Stefan Beller
2018-03-28 17:46 ` Jonathan Tan
2018-03-28 17:24 ` [PATCH 6/6] grep: remove "repo" arg from non-supporting funcs Stefan Beller
2018-03-28 17:54 ` [PATCHv2 0/6] Moving submodules with nested submodules Jonathan Tan
2018-03-28 22:35 ` Stefan Beller [this message]
2018-03-28 22:35 ` [PATCHv3 1/6] submodule.h: drop declaration of connect_work_tree_and_git_dir Stefan Beller
2018-03-28 22:35 ` [PATCHv3 2/6] grep: remove "repo" arg from non-supporting funcs Stefan Beller
2018-03-28 22:35 ` [PATCHv3 3/6] submodule-config: allow submodule_free to handle arbitrary repositories Stefan Beller
2018-03-28 22:35 ` [PATCHv3 4/6] submodule-config: add repository argument to submodule_from_{name, path} Stefan Beller
2018-03-28 22:35 ` [PATCHv3 5/6] submodule-config: remove submodule_from_cache Stefan Beller
2018-03-28 22:35 ` [PATCHv3 6/6] submodule: fixup nested submodules after moving the submodule Stefan Beller
2018-03-28 23:17 ` [PATCHv3 0/6] Moving submodules with nested submodules Jonathan Tan
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=20180328223531.241920-1-sbeller@google.com \
--to=sbeller@google.com \
--cc=bmwill@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=hvoigt@hvoigt.net \
--cc=jonathantanmy@google.com \
--cc=seanwbehan@riseup.net \
/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).