From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 18 Jun 2018 17:18:44 +0000 (-0700)
Subject: Merge branch 'en/rename-directory-detection'
X-Git-Tag: v2.18.0~16
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f72432d64ebc4fea80265114464ddb7b25ce9633;p=git

Merge branch 'en/rename-directory-detection'

Newly added codepath in merge-recursive had potential buffer
overrun, which has been fixed.

* en/rename-directory-detection:
  merge-recursive: use xstrdup() instead of fixed buffer
---

f72432d64ebc4fea80265114464ddb7b25ce9633