From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 14 Mar 2014 21:25:20 +0000 (-0700)
Subject: Merge branch 'tr/diff-submodule-no-reuse-worktree'
X-Git-Tag: v2.0.0-rc0~126
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=481e6aaaccbef810f6c43cfd46058cff36cb1c66;p=thirdparty%2Fgit.git

Merge branch 'tr/diff-submodule-no-reuse-worktree'

"git diff --external-diff" incorrectly fed the submodule directory
in the working tree to the external diff driver when it knew it is
the same as one of the versions being compared.

* tr/diff-submodule-no-reuse-worktree:
  diff: do not reuse_worktree_file for submodules
---

481e6aaaccbef810f6c43cfd46058cff36cb1c66