| commit | 481e6aaaccbef810f6c43cfd46058cff36cb1c66 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 14 Mar 2014 21:25:20 +0000 (14 14:25 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 14 Mar 2014 21:25:20 +0000 (14 14:25 -0700) | ||
| tree | 8b7d1324dcdc0944b46ac8f3c35c166e6a2796b0 | treesnapshot (tar.gz zip) |
| parent | 6eb593a764303c05c7ca4f0fd107c5118b9cf7fb | commitdiff |
| parent | aba4727281612c3e24914691727e11e1f44a9aac | commitdiff |
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
"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 | blobhistory |
| t/t4020-diff-external.sh | diff1 | diff2 | blobhistory |