]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'nd/worktree-kill-parse-ref'
authorJunio C Hamano <gitster@pobox.com>
Tue, 16 May 2017 02:51:51 +0000 (11:51 +0900)
committerJunio C Hamano <gitster@pobox.com>
Tue, 16 May 2017 02:51:51 +0000 (11:51 +0900)
"git gc" did not interact well with "git worktree"-managed
per-worktree refs.

* nd/worktree-kill-parse-ref:
  refs: kill set_worktree_head_symref()
  worktree.c: kill parse_ref() in favor of refs_resolve_ref_unsafe()
  refs: introduce get_worktree_ref_store()
  refs: add REFS_STORE_ALL_CAPS
  refs.c: make submodule ref store hashmap generic
  environment.c: fix potential segfault by get_git_common_dir()

1  2 
branch.c
environment.c
refs.c
refs.h
refs/files-backend.c
refs/refs-internal.h
worktree.c

diff --cc branch.c
Simple merge
diff --cc environment.c
Simple merge
diff --cc refs.c
Simple merge
diff --cc refs.h
Simple merge
Simple merge
Simple merge
diff --cc worktree.c
Simple merge