X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=builtin%2Fgrep.c;h=2699001fbd6dfe07f0338ee478454ec2b7325559;hb=307179732d580735c579b9bfae2eaf7a536f4ae9;hp=467eb4542b72f189afc3c656ce43748bb8df7712;hpb=6a289d45c0e5d155f536d7c1f73c3b33690e92c6;p=thirdparty%2Fgit.git diff --git a/builtin/grep.c b/builtin/grep.c index 467eb4542b..2699001fbd 100644 --- a/builtin/grep.c +++ b/builtin/grep.c @@ -458,7 +458,8 @@ static int grep_submodule(struct grep_opt *opt, object = parse_object_or_die(oid, oid_to_hex(oid)); grep_read_lock(); - data = read_object_with_reference(&object->oid, tree_type, + data = read_object_with_reference(&subrepo, + &object->oid, tree_type, &size, NULL); grep_read_unlock(); @@ -625,7 +626,8 @@ static int grep_object(struct grep_opt *opt, const struct pathspec *pathspec, int hit, len; grep_read_lock(); - data = read_object_with_reference(&obj->oid, tree_type, + data = read_object_with_reference(opt->repo, + &obj->oid, tree_type, &size, NULL); grep_read_unlock();