RFC Submodule support in git mv, git rm
Get series with b4
b4 am 20080716190753.19772.93357.stgit@localhostVersions newest first
- v1 RFC Latest7 patches 5 repliesIn review
Patches in v1 No applies recorded yet
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/7 | git-mv: Remove dead code branchbuiltin-mv.c | +7 | 0 replies | |
| 2/7 | t7400: Add short "git submodule add" testsuitet/ | +27 | 0 replies | |
| 3/7 | git submodule add: Fix naming clash handlinggit-submodule.sh t/ | +23 | 0 replies | |
| 4/7 | submodule.*: Introduce simple C interface for submodule lookup by pathMakefile submodule.c submodule.h | +60 | 0 replies | |
| 5/7 | git mv: Support moving submodulesbuiltin-mv.c cache.h sha1_file.c | +61 | 47 replies | |
| 6/7 | git rm: Support for removing submodulesDocumentation/ builtin-rm.c | +58 | 3 replies | |
| 7/7 | t7403: Submodule git mv, git rm testsuitet/ | +242 | 0 replies |
Reviews trailers per patch
1 of 7 patches has a Reviewed-by or Acked-by.
| Patch | Stephen Rothwell |
|---|---|
| 1/7 | |
| 2/7 | |
| 3/7 | |
| 4/7 | |
| 5/7 | A-b |
| 6/7 | |
| 7/7 |
Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.
Cover letter [RFC][PATCH 0/7] Submodule support in git mv, git rm
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