diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-09-28 14:47:56 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-09-28 14:47:56 +0900 |
| commit | 73ecdc606eedbfd98ec66d50d44b3374425fd13b (patch) | |
| tree | 6a2aeb6eb0b30e1645c8af06b10c9f4ec2815dd8 /worktree.c | |
| parent | 2812ca7f0e11f6a46c8b1b5b4450df20412c22be (diff) | |
| parent | 744c040b19412fa5075810eb1aced105fad96726 (diff) | |
| download | git-73ecdc606eedbfd98ec66d50d44b3374425fd13b.tar.xz | |
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 'worktree.c')
| -rw-r--r-- | worktree.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/worktree.c b/worktree.c index 8aaeea0377..70015629dc 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; |