diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2017-04-24 17:01:23 +0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-04-24 21:28:55 -0700 |
| commit | fa099d23227f88b5a1cd79c646551130d9b36e6d (patch) | |
| tree | f5308d3f4b446b027099b9720070023f5f2fa89a /branch.c | |
| parent | 17eff96b83be5c4c25e33a40e632d1b55c506d33 (diff) | |
| download | git-fa099d23227f88b5a1cd79c646551130d9b36e6d.tar.gz | |
worktree.c: kill parse_ref() in favor of refs_resolve_ref_unsafe()
The manual parsing code is replaced with a call to refs_resolve_ref_unsafe().
The manual parsing code must die because only refs/files-backend.c
should do that.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'branch.c')
| -rw-r--r-- | branch.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -355,7 +355,8 @@ int replace_each_worktree_head_symref(const char *oldref, const char *newref, for (i = 0; worktrees[i]; i++) { if (worktrees[i]->is_detached) continue; - if (strcmp(oldref, worktrees[i]->head_ref)) + if (worktrees[i]->head_ref && + strcmp(oldref, worktrees[i]->head_ref)) continue; if (set_worktree_head_symref(get_worktree_git_dir(worktrees[i]), |