From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 18 Mar 2014 21:03:41 +0000 (-0700)
Subject: Merge branch 'tr/diff-submodule-no-reuse-worktree' into maint
X-Git-Tag: v1.9.1~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a5aca6e883639ce3a3ad07271032905edc0ac608;p=thirdparty%2Fgit.git

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

"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
---

a5aca6e883639ce3a3ad07271032905edc0ac608