Re: difftool -d symlinks, under what conditions
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:56:23
Possibly related (same subject, not in this thread)
- 2016-06-15 · Re: difftool -d symlinks, under what conditions · Junio C Hamano <hidden>
- 2016-06-15 · Re: difftool -d symlinks, under what conditions · Junio C Hamano <hidden>
- 2016-06-15 · Re: difftool -d symlinks, under what conditions · John Keeping <hidden>
- 2016-06-15 · Re: difftool -d symlinks, under what conditions · Junio C Hamano <hidden>
- 2016-06-15 · Re: difftool -d symlinks, under what conditions · John Keeping <hidden>
John Keeping [off-list ref] writes:
The path passed to get_stream_filter is only used to decide what filters apply to the file, so shouldn't it be using "ce->name" and not "path" for the same reason that the call to convert_to_working_tree() further down the same function does?
Correct and well spotted.
quoted hunk
-- >8 --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,