Re: [PATCH v4] Teach rm to remove submodules unless they contain a git directory

Jens Lehmann [off-list ref] writes:

Changes since v3:
- Added get_ours_cache_pos() helper to only check stage 2 of a conflict
- Added tests for modified submodules in the conflict case

Thanks.

+			/*
+			 * Skip unmerged entries except for populated submodules
+			 * that could loose history when removed.
+			 */

s/loose/lose/, I think.

Am 27.09.2012 18:53, schrieb Junio C Hamano:

Jens Lehmann [off-list ref] writes:

quoted

+			/*
+			 * Skip unmerged entries except for populated submodules
+			 * that could loose history when removed.
+			 */

s/loose/lose/, I think.

Thanks for squashing that one in!

I also used "loose" in the commit message where "lose" would have been
correct. I can resend a new version correcting both if you want.