]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1f56977 aba4727)
Merge branch 'tr/diff-submodule-no-reuse-worktree' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 18 Mar 2014 21:03:41 +0000 (14:03 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 18 Mar 2014 21:03:41 +0000 (14:03 -0700)
commita5aca6e883639ce3a3ad07271032905edc0ac608
treed668c311a147fc10e2c83b96c01506938fc02930tree | snapshot
parent1f569775810be1655c284076082015168865d005commit | diff
parentaba4727281612c3e24914691727e11e1f44a9aaccommit | diff
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
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.