Re: [PATCH 0/6] git-rm absorbs submodule git directory before deletion
Stefan Beller <sbeller@google.com> writes:
Show 8 quoted lines
> The "checkout --recurse-submodules" series got too large to comfortably send
> it out for review, so I had to break it up into smaller series'; this is the
> first subseries, but it makes sense on its own.
>
> This series teaches git-rm to absorb the git directory of a submodule instead
> of failing and complaining about the git directory preventing deletion.
>
> It applies on origin/sb/submodule-embed-gitdir.
Thanks. I probably should rename the topic again with s/embed/absorb/;
Show 20 quoted lines
> Any feedback welcome!
>
> Thanks,
> Stefan
>
> Stefan Beller (6):
> submodule.h: add extern keyword to functions
> submodule: modernize ok_to_remove_submodule to use argv_array
> submodule: add flags to ok_to_remove_submodule
> ok_to_remove_submodule: absorb the submodule git dir
> t3600: slightly modernize style
> rm: add absorb a submodules git dir before deletion
>
> builtin/rm.c | 21 +++-----
> cache.h | 2 +
> entry.c | 5 ++
> submodule.c | 77 +++++++++++++++++++++++-----
> submodule.h | 64 ++++++++++++++---------
> t/t3600-rm.sh | 159 +++++++++++++++++++++++----------------------------------
> 6 files changed, 182 insertions(+), 146 deletions(-)
Junio C Hamano <gitster@pobox.com>