diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-03-28 22:37:46 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-03-28 22:37:46 +0100 |
| commit | 39c5835dd68473e6b829d94533e892cffee09286 (patch) | |
| tree | fae72e5ec0a49154bd168cbedc07fad3fddb2cde /entry.c | |
| parent | Merge branch 'jk/difftool-dir-diff-edit-fix' (diff) | |
| parent | t2003: work around path mangling issue on Windows (diff) | |
| download | git-39c5835dd68473e6b829d94533e892cffee09286.tar.xz git-39c5835dd68473e6b829d94533e892cffee09286.zip | |
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.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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, |