kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

refs: pass NULL to refs_resolve_ref_unsafe() if hash is not needed 

This allows us to get rid of two write-only variables, one of them
being a SHA1 buffer.

Signed-off-by: Rene Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
René Scharfe 2017-09-23 11:44:57 +02:00 committed by Junio C Hamano
parent 54fad6614f
commit e691b027b6
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
refs/files-backend.c
View File

@ -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 * check with HEAD only which should cover 99% of all usage
* scenarios (even 100% of the default ones). * scenarios (even 100% of the default ones).
*/ */
struct object_id head_oid;
int head_flag; int head_flag;
const char *head_ref; const char *head_ref;


head_ref = refs_resolve_ref_unsafe(&refs->base, "HEAD", head_ref = refs_resolve_ref_unsafe(&refs->base, "HEAD",
RESOLVE_REF_READING, RESOLVE_REF_READING,
head_oid.hash, &head_flag); NULL, &head_flag);
if (head_ref && (head_flag & REF_ISSYMREF) && if (head_ref && (head_flag & REF_ISSYMREF) &&
!strcmp(head_ref, lock->ref_name)) { !strcmp(head_ref, lock->ref_name)) {
struct strbuf log_err = STRBUF_INIT; struct strbuf log_err = STRBUF_INIT;

3
worktree.c
View File

@ -307,7 +307,6 @@ const struct worktree *find_shared_symref(const char *symref,
for (i = 0; worktrees[i]; i++) { for (i = 0; worktrees[i]; i++) {
struct worktree *wt = worktrees[i]; struct worktree *wt = worktrees[i];
const char *symref_target; const char *symref_target;
unsigned char sha1[20];
struct ref_store *refs; struct ref_store *refs;
int flags; int flags;


@ -327,7 +326,7 @@ const struct worktree *find_shared_symref(const char *symref,


refs = get_worktree_ref_store(wt); refs = get_worktree_ref_store(wt);
symref_target = refs_resolve_ref_unsafe(refs, symref, 0, symref_target = refs_resolve_ref_unsafe(refs, symref, 0,
sha1, &flags); NULL, &flags);
if ((flags & REF_ISSYMREF) && !strcmp(symref_target, target)) { if ((flags & REF_ISSYMREF) && !strcmp(symref_target, target)) {
existing = wt; existing = wt;
break; break;