]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6eb593a aba4727)
Merge branch 'tr/diff-submodule-no-reuse-worktree'
authorJunio C Hamano <gitster@pobox.com>
Fri, 14 Mar 2014 21:25:20 +0000 (14:25 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 14 Mar 2014 21:25:20 +0000 (14:25 -0700)
commit481e6aaaccbef810f6c43cfd46058cff36cb1c66
tree8b7d1324dcdc0944b46ac8f3c35c166e6a2796b0tree | snapshot
parent6eb593a764303c05c7ca4f0fd107c5118b9cf7fbcommit | diff
parentaba4727281612c3e24914691727e11e1f44a9aaccommit | diff
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
diff.c diff1 | diff2 | blob | history
t/t4020-diff-external.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.