summaryrefslogtreecommitdiff
path: root/worktree.c
diff options
context:
space:
mode:
authorRené Scharfe <l.s.r@web.de>2017-09-23 09:44:57 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-09-24 01:18:18 (GMT)
commite691b027b60034ed3362fc4d6065b6be85bf234b (patch)
tree70bd0398eea23aa1848f9e8265a8e4e005f85432 /worktree.c
parent54fad6614fc6b61ee6eb4a5b3daa7a2239019b49 (diff)
downloadgit-e691b027b60034ed3362fc4d6065b6be85bf234b.zip
git-e691b027b60034ed3362fc4d6065b6be85bf234b.tar.gz
git-e691b027b60034ed3362fc4d6065b6be85bf234b.tar.bz2
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>
Diffstat (limited to 'worktree.c')
-rw-r--r--worktree.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/worktree.c b/worktree.c
index 8aaeea0..7001562 100644
--- a/worktree.c
+++ b/worktree.c
@@ -307,7 +307,6 @@ const struct worktree *find_shared_symref(const char *symref,
for (i = 0; worktrees[i]; i++) {
struct worktree *wt = worktrees[i];
const char *symref_target;
- unsigned char sha1[20];
struct ref_store *refs;
int flags;
@@ -327,7 +326,7 @@ const struct worktree *find_shared_symref(const char *symref,
refs = get_worktree_ref_store(wt);
symref_target = refs_resolve_ref_unsafe(refs, symref, 0,
- sha1, &flags);
+ NULL, &flags);
if ((flags & REF_ISSYMREF) && !strcmp(symref_target, target)) {
existing = wt;
break;