From: Jeff King <peff@peff.net>
Date: Mon, 29 Oct 2012 08:12:07 +0000 (-0400)
Subject: Merge branch 'jl/submodule-rm'
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d21240fafafdea4fb4cab27c0e9b58ebad7d6172;p=git.git

Merge branch 'jl/submodule-rm'

"git rm submodule" cannot blindly remove a submodule directory as
its working tree may have local changes, and worse yet, it may even
have its repository embedded in it.  Teach it some special cases
where it is safe to remove a submodule, specifically, when there is
no local changes in the submodule working tree, and its repository
is not embedded in its working tree but is elsewhere and uses the
gitfile mechanism to point at it.

* jl/submodule-rm:
  submodule: teach rm to remove submodules unless they contain a git directory
---

d21240fafafdea4fb4cab27c0e9b58ebad7d6172
diff --cc builtin/rm.c
index b384c4c3c,4a881ab27..2aea3b565
--- a/builtin/rm.c
+++ b/builtin/rm.c
@@@ -9,9 -9,10 +9,10 @@@
  #include "cache-tree.h"
  #include "tree-walk.h"
  #include "parse-options.h"
+ #include "submodule.h"
  
  static const char * const builtin_rm_usage[] = {
 -	"git rm [options] [--] <file>...",
 +	N_("git rm [options] [--] <file>..."),
  	NULL
  };