From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 16 Dec 2016 23:27:47 +0000 (-0800)
Subject: Merge branch 'dt/empty-submodule-in-merge'
X-Git-Tag: v2.12.0-rc0~157
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a616162909ae756c36cef17cea7466c3f500caec;p=thirdparty%2Fgit.git

Merge branch 'dt/empty-submodule-in-merge'

An empty directory in a working tree that can simply be nuked used
to interfere while merging or cherry-picking a change to create a
submodule directory there, which has been fixed..

* dt/empty-submodule-in-merge:
  submodules: allow empty working-tree dirs in merge/cherry-pick
---

a616162909ae756c36cef17cea7466c3f500caec