The following series implements submodule support in git mv and git rm,
plus enhancing the submodules testsuite a bit. I'd appreciate comments,
especially on the git mv change, since the index_path_src_sha1 is
really a horrible hack.
The pinnacle of this series was supposed to be merge-recursive support
for submodule-somethingelese conflicts, however that seems a bit more
complicated than I expected, so I decided to first send the rest for
a review.
---
Petr Baudis (7):
t7403: Submodule git mv, git rm testsuite
git rm: Support for removing submodules
git mv: Support moving submodules
submodule.*: Introduce simple C interface for submodule lookup by path
git submodule add: Fix naming clash handling
t7400: Add short "git submodule add" testsuite
git-mv: Remove dead code branch
Documentation/git-rm.txt | 6 +
Makefile | 2
builtin-mv.c | 67 ++++++++++--
builtin-rm.c | 65 ++++++++++--
cache.h | 2
git-submodule.sh | 15 ++-
sha1_file.c | 10 ++
submodule.c | 50 +++++++++
submodule.h | 8 +
t/t7400-submodule-basic.sh | 39 +++++++
t/t7403-submodule-mvrm.sh | 242 ++++++++++++++++++++++++++++++++++++++++++++
11 files changed, 476 insertions(+), 30 deletions(-)
create mode 100644 submodule.c
create mode 100644 submodule.h
create mode 100755 t/t7403-submodule-mvrm.sh
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
