summaryrefslogtreecommitdiff
path: root/entry.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-03-28 21:37:46 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-03-28 21:37:46 (GMT)
commit39c5835dd68473e6b829d94533e892cffee09286 (patch)
treefae72e5ec0a49154bd168cbedc07fad3fddb2cde /entry.c
parent18973d8ac9e396d0eefdf36d7c6aa43aa7d396a6 (diff)
parent8be412a723459feb9f521062e2919f8f6e8389d3 (diff)
downloadgit-39c5835dd68473e6b829d94533e892cffee09286.zip
git-39c5835dd68473e6b829d94533e892cffee09286.tar.gz
git-39c5835dd68473e6b829d94533e892cffee09286.tar.bz2
Merge branch 'jk/checkout-attribute-lookup'
Codepath to stream blob object contents directly from the object store to filesystem did not use the correct path to find conversion filters when writing to temporary files. * jk/checkout-attribute-lookup: t2003: work around path mangling issue on Windows entry: fix filter lookup t2003: modernize style
Diffstat (limited to 'entry.c')
-rw-r--r--entry.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/entry.c b/entry.c
index 17a6bcc..63c52ed 100644
--- a/entry.c
+++ b/entry.c
@@ -145,7 +145,7 @@ static int write_entry(struct cache_entry *ce, char *path, const struct checkout
struct stat st;
if (ce_mode_s_ifmt == S_IFREG) {
- struct stream_filter *filter = get_stream_filter(path, ce->sha1);
+ struct stream_filter *filter = get_stream_filter(ce->name, ce->sha1);
if (filter &&
!streaming_write_entry(ce, path, filter,
state, to_tempfile,