Re: [PATCHv3 3/4] submodule: add flags to ok_to_remove_submodule

2016-12-14 Thread Junio C Hamano
Stefan Beller writes: > diff --git a/submodule.c b/submodule.c > index 9f0b544ebe..2d13744b06 100644 > --- a/submodule.c > +++ b/submodule.c > @@ -1019,7 +1019,7 @@ int submodule_uses_gitfile(const char *path) > return 1; > } > > -int ok_to_remove_submodule(const

Re: [PATCHv3 3/4] submodule: add flags to ok_to_remove_submodule

2016-12-14 Thread Brandon Williams
On 12/14, Stefan Beller wrote: > In different contexts the question whether deleting a submodule is ok > to remove may be answered differently. This sentence is oddly worded. Maybe this: In different context the question "Is it ok to delete a submodule?" may be answered differently. --

[PATCHv3 3/4] submodule: add flags to ok_to_remove_submodule

2016-12-14 Thread Stefan Beller
In different contexts the question whether deleting a submodule is ok to remove may be answered differently. In 293ab15eea (submodule: teach rm to remove submodules unless they contain a git directory, 2012-09-26) a case was made that we can safely ignore ignored untracked files for removal as we