diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-05-16 11:51:51 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-05-16 11:51:51 +0900 |
| commit | 4b44b7b1df44d371eaf3fbed75829d1a749bc7df (patch) | |
| tree | d8ea9ed31a6946e476db01034a653a2bbd86084c /refs/refs-internal.h | |
| parent | a0ab83ebd807f2bfe1a565ff94fe7d3c6903efee (diff) | |
| parent | d026a25657cbe15ceb6bcb5d5047a36a0a70b33e (diff) | |
| download | git-4b44b7b1df44d371eaf3fbed75829d1a749bc7df.tar.gz | |
Merge branch 'nd/worktree-kill-parse-ref'
"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()
Diffstat (limited to 'refs/refs-internal.h')
| -rw-r--r-- | refs/refs-internal.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/refs/refs-internal.h b/refs/refs-internal.h index 3d46131efb..12cf4e4718 100644 --- a/refs/refs-internal.h +++ b/refs/refs-internal.h @@ -482,6 +482,10 @@ struct ref_store; #define REF_STORE_WRITE (1 << 1) /* can perform update operations */ #define REF_STORE_ODB (1 << 2) /* has access to object database */ #define REF_STORE_MAIN (1 << 3) +#define REF_STORE_ALL_CAPS (REF_STORE_READ | \ + REF_STORE_WRITE | \ + REF_STORE_ODB | \ + REF_STORE_MAIN) /* * Initialize the ref_store for the specified gitdir. These functions |