diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-11-15 12:04:52 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-11-15 12:04:52 +0900 |
| commit | 9fbcb51ec548318f0088a5fee6c77a5f1d8512b4 (patch) | |
| tree | 548dfa2d249d03ddb7bec8653d8e596727bf94ae /worktree.c | |
| parent | bb2c9262a5eff9e4d6ddca23f6e0787afbd7b091 (diff) | |
| parent | dbd2b55cb7b06e94096b8c18852a94732e3f76a8 (diff) | |
| download | git-9fbcb51ec548318f0088a5fee6c77a5f1d8512b4.tar.gz | |
Merge branch 'jk/misc-resolve-ref-unsafe-fixes' into maint
Some codepaths did not check for errors when asking what branch the
HEAD points at, which have been fixed.
* jk/misc-resolve-ref-unsafe-fixes:
worktree: handle broken symrefs in find_shared_symref()
log: handle broken HEAD in decoration check
remote: handle broken symrefs
test-ref-store: avoid passing NULL to printf
Diffstat (limited to 'worktree.c')
| -rw-r--r-- | worktree.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/worktree.c b/worktree.c index 70015629dc..f8c40f2f5f 100644 --- a/worktree.c +++ b/worktree.c @@ -327,7 +327,8 @@ const struct worktree *find_shared_symref(const char *symref, refs = get_worktree_ref_store(wt); symref_target = refs_resolve_ref_unsafe(refs, symref, 0, NULL, &flags); - if ((flags & REF_ISSYMREF) && !strcmp(symref_target, target)) { + if ((flags & REF_ISSYMREF) && + symref_target && !strcmp(symref_target, target)) { existing = wt; break; } |