diff options
author | Junio C Hamano <gitster@pobox.com> | 2016-09-19 20:47:19 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-09-19 20:47:19 (GMT) |
commit | 4af9a7d344b0e1c3b504c0cfb650dabdb1df1852 (patch) | |
tree | 243319fc09235a1e046ea94f40f7837ed9f02ea2 /builtin/grep.c | |
parent | 4322f3848a224843a2df81055f07899ce1a1b388 (diff) | |
parent | 3a5d7c55f76681ad9dcef8564275217881c9ace0 (diff) | |
download | git-4af9a7d344b0e1c3b504c0cfb650dabdb1df1852.zip git-4af9a7d344b0e1c3b504c0cfb650dabdb1df1852.tar.gz git-4af9a7d344b0e1c3b504c0cfb650dabdb1df1852.tar.bz2 |
Merge branch 'bc/object-id'
The "unsigned char sha1[20]" to "struct object_id" conversion
continues. Notable changes in this round includes that ce->sha1,
i.e. the object name recorded in the cache_entry, turns into an
object_id.
It had merge conflicts with a few topics in flight (Christian's
"apply.c split", Dscho's "cat-file --filters" and Jeff Hostetler's
"status --porcelain-v2"). Extra sets of eyes double-checking for
mismerges are highly appreciated.
* bc/object-id:
builtin/reset: convert to use struct object_id
builtin/commit-tree: convert to struct object_id
builtin/am: convert to struct object_id
refs: add an update_ref_oid function.
sha1_name: convert get_sha1_mb to struct object_id
builtin/update-index: convert file to struct object_id
notes: convert init_notes to use struct object_id
builtin/rm: convert to use struct object_id
builtin/blame: convert file to use struct object_id
Convert read_mmblob to take struct object_id.
notes-merge: convert struct notes_merge_pair to struct object_id
builtin/checkout: convert some static functions to struct object_id
streaming: make stream_blob_to_fd take struct object_id
builtin: convert textconv_object to use struct object_id
builtin/cat-file: convert some static functions to struct object_id
builtin/cat-file: convert struct expand_data to use struct object_id
builtin/log: convert some static functions to use struct object_id
builtin/blame: convert struct origin to use struct object_id
builtin/apply: convert static functions to struct object_id
cache: convert struct cache_entry to use struct object_id
Diffstat (limited to 'builtin/grep.c')
-rw-r--r-- | builtin/grep.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin/grep.c b/builtin/grep.c index ae73831..8887b6a 100644 --- a/builtin/grep.c +++ b/builtin/grep.c @@ -398,7 +398,8 @@ static int grep_cache(struct grep_opt *opt, const struct pathspec *pathspec, int if (cached || (ce->ce_flags & CE_VALID) || ce_skip_worktree(ce)) { if (ce_stage(ce) || ce_intent_to_add(ce)) continue; - hit |= grep_sha1(opt, ce->sha1, ce->name, 0, ce->name); + hit |= grep_sha1(opt, ce->oid.hash, ce->name, 0, + ce->name); } else hit |= grep_file(opt, ce->name); |