diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-09-28 08:47:56 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-09-28 08:47:56 +0300 |
| commit | 73ecdc606eedbfd98ec66d50d44b3374425fd13b (patch) | |
| tree | 6a2aeb6eb0b30e1645c8af06b10c9f4ec2815dd8 /refs | |
| parent | 2812ca7f0e11f6a46c8b1b5b4450df20412c22be (diff) | |
| parent | 744c040b19412fa5075810eb1aced105fad96726 (diff) | |
Merge branch 'rs/resolve-ref-optional-result'
Code clean-up.
* rs/resolve-ref-optional-result:
refs: pass NULL to resolve_ref_unsafe() if hash is not needed
refs: pass NULL to refs_resolve_ref_unsafe() if hash is not needed
refs: make sha1 output parameter of refs_resolve_ref_unsafe() optional
Diffstat (limited to 'refs')
| -rw-r--r-- | refs/files-backend.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/refs/files-backend.c b/refs/files-backend.c index dac33628b3..fec77744b4 100644 --- a/refs/files-backend.c +++ b/refs/files-backend.c @@ -1676,13 +1676,12 @@ static int commit_ref_update(struct files_ref_store *refs, * check with HEAD only which should cover 99% of all usage * scenarios (even 100% of the default ones). */ - struct object_id head_oid; int head_flag; const char *head_ref; head_ref = refs_resolve_ref_unsafe(&refs->base, "HEAD", RESOLVE_REF_READING, - head_oid.hash, &head_flag); + NULL, &head_flag); if (head_ref && (head_flag & REF_ISSYMREF) && !strcmp(head_ref, lock->ref_name)) { struct strbuf log_err = STRBUF_INIT; |