summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2017-05-19 12:59:15 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-05-24 01:59:27 (GMT)
commit158b06caee5f9ea2987f444b8e49bd2d678b187d (patch)
treec7038b47c4392461e760b97f0d4ef0d9a766f073 /templates
parentd04ec74b17138733463c0ca1024fdbb42be6096a (diff)
downloadgit-158b06caee5f9ea2987f444b8e49bd2d678b187d.zip
git-158b06caee5f9ea2987f444b8e49bd2d678b187d.tar.gz
git-158b06caee5f9ea2987f444b8e49bd2d678b187d.tar.bz2
diff: use pending "path" if it is available
There's a subtle distinction between "name" and "path" for a blob that we resolve: the name is what the user told us on the command line, and the path is what we traversed when finding the blob within a tree (if we did so). When we diff blobs directly, we use "name", but "path" is more likely to be useful to the user (it will find the correct .gitattributes, and give them a saner diff header). We still have to fall back to using the name for some cases (i.e., any blob reference that isn't of the form tree:path). That's the best we can do in such a case. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'templates')
0 files changed, 0 insertions, 0 deletions