summaryrefslogtreecommitdiff
path: root/builtin/cat-file.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-08-20 18:33:53 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-08-20 18:33:53 (GMT)
commitdc0f6f9e1d56059fff1e8c539a1c0e4bc5658714 (patch)
treea2f09658870423d62e82d0bab113bde15375fd35 /builtin/cat-file.c
parentace1f99cc8cf0a688f36c094552f90a398eb137f (diff)
parentecbbc0a53b0393c3b835440b397dedfa9d28ec01 (diff)
downloadgit-dc0f6f9e1d56059fff1e8c539a1c0e4bc5658714.zip
git-dc0f6f9e1d56059fff1e8c539a1c0e4bc5658714.tar.gz
git-dc0f6f9e1d56059fff1e8c539a1c0e4bc5658714.tar.bz2
Merge branch 'nd/no-the-index'
The more library-ish parts of the codebase learned to work on the in-core index-state instance that is passed in by their callers, instead of always working on the singleton "the_index" instance. * nd/no-the-index: (24 commits) blame.c: remove implicit dependency on the_index apply.c: remove implicit dependency on the_index apply.c: make init_apply_state() take a struct repository apply.c: pass struct apply_state to more functions resolve-undo.c: use the right index instead of the_index archive-*.c: use the right repository archive.c: avoid access to the_index grep: use the right index instead of the_index attr: remove index from git_attr_set_direction() entry.c: use the right index instead of the_index submodule.c: use the right index instead of the_index pathspec.c: use the right index instead of the_index unpack-trees: avoid the_index in verify_absent() unpack-trees: convert clear_ce_flags* to avoid the_index unpack-trees: don't shadow global var the_index unpack-trees: add a note about path invalidation unpack-trees: remove 'extern' on function declaration ls-files: correct index argument to get_convert_attr_ascii() preload-index.c: use the right index instead of the_index dir.c: remove an implicit dependency on the_index in pathspec code ...
Diffstat (limited to 'builtin/cat-file.c')
-rw-r--r--builtin/cat-file.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/cat-file.c b/builtin/cat-file.c
index 08dced2..64ec174 100644
--- a/builtin/cat-file.c
+++ b/builtin/cat-file.c
@@ -40,7 +40,7 @@ static int filter_object(const char *path, unsigned mode,
oid_to_hex(oid), path);
if ((type == OBJ_BLOB) && S_ISREG(mode)) {
struct strbuf strbuf = STRBUF_INIT;
- if (convert_to_working_tree(path, *buf, *size, &strbuf)) {
+ if (convert_to_working_tree(&the_index, path, *buf, *size, &strbuf)) {
free(*buf);
*size = strbuf.len;
*buf = strbuf_detach(&strbuf, NULL);