{"thread":{"id":"41437","subject":"[PATCH v5 00/27] refs backends","startedAt":"2016-02-18T05:17:23Z","lastAt":"2016-02-25T20:50:38Z","messageCount":52,"participants":["David Turner","Duy Nguyen","Junio C Hamano","Eric Wong"],"isPatch":true,"patchVersion":5,"patchTotal":27},"messages":[{"id":"278526","messageId":"1455772670-21142-1-git-send-email-dturner@twopensource.com","threadId":"41437","inReplyTo":null,"subject":"[PATCH v5 00/27] refs backends","fromName":"David Turner","fromEmail":"dturner@twopensource.com","sentAt":"2016-02-18T05:17:23Z","receivedAt":"2016-02-18T05:17:23Z","isPatch":true,"sender":{"key":"novalis@novalis.org","avatar":"https://avatars.githubusercontent.com/u/77003?v=4"},"body":"This version incorporates numerous changes suggested by Michael\nHaggerty. Also a few by Duy Nguyen.\n\nOf particular note are a few new patches:\n\nrefs: Move head_ref{,_submodule} to the common code. Michael pointed\nout that these didn't directly use backend-specific functions.\n\nrefs: add method for do_for_each_ref. This was originally separate\nmethods for each flavor of do_for_each_ref, and has now been simplified\nto use a single common method.\n\nrefs: forbid cross-backend ref renames. Later, we could go back and make\nthese work.\n\nrefs: don't dereference on rename and refs: on symref reflog expire,\nlock symref not referrent. These are broken out of \"resolve symbolic\nrefs first\", which was overlong, and now come with tests. Also, I applied\nMichael's insight on ref_noderef to the lmdb backend (so that it passes\nthe new tests).\n\ntests: add ref-storage argument: this allows everyone to run the tests\nunder lmdb easily.\n\n\nDavid Turner (25):\n refs: Move head_ref{,_submodule} to the common code\n refs: move for_each_*ref* functions into common code\n refs: add method for do_for_each_ref\n refs: add do_for_each_per_worktree_ref\n refs: add methods for reflog\n refs: add method for initial ref transaction commit\n refs: add method for delete_refs\n refs: add methods to init refs db\n refs: add method to rename refs\n refs: forbid cross-backend ref renames\n refs: make lock generic\n refs: move duplicate check to common code\n refs: allow log-only updates\n refs: don't dereference on rename\n refs: on symref reflog expire, lock symref not referrent\n refs: resolve symbolic refs first\n refs: always handle non-normal refs in files backend\n init: allow alternate ref strorage to be set for new repos\n refs: check submodules' ref storage config\n clone: allow ref storage backend to be set for clone\n svn: learn ref-storage argument\n refs: add register_ref_storage_backends()\n refs: add LMDB refs storage backend\n refs: tests for lmdb backend\n tests: add ref-storage argument\n\nRonnie Sahlberg (2):\n refs: add a backend method structure with transaction functions\n refs: add methods for misc ref operations\n\n .gitignore | 1 +\n Documentation/config.txt | 9 +\n Documentation/git-clone.txt | 6 +\n Documentation/git-init-db.txt | 2 +-\n Documentation/git-init.txt | 8 +-\n Documentation/technical/refs-lmdb-backend.txt | 52 +\n Documentation/technical/repository-version.txt | 5 +\n Makefile | 12 +\n builtin/clone.c | 5 +\n builtin/init-db.c | 55 +-\n builtin/submodule--helper.c | 2 +-\n cache.h | 2 +\n config.c | 25 +\n configure.ac | 33 +\n contrib/completion/git-completion.bash | 6 +-\n contrib/workdir/git-new-workdir | 3 +\n git-submodule.sh | 13 +\n git-svn.perl | 6 +-\n path.c | 30 +-\n refs.c | 512 ++++++-\n refs.h | 21 +\n refs/files-backend.c | 464 +++---\n refs/lmdb-backend.c | 1921 ++++++++++++++++++++++++\n refs/refs-internal.h | 114 +-\n setup.c | 23 +-\n t/lib-submodule-update.sh | 15 +-\n t/lib-t6000.sh | 5 +-\n t/t0001-init.sh | 25 +\n t/t0008-ignores.sh | 2 +-\n t/t0062-revision-walking.sh | 6 +\n t/t1021-rerere-in-workdir.sh | 6 +\n t/t1200-tutorial.sh | 8 +-\n t/t1302-repo-version.sh | 6 +\n t/t1305-config-include.sh | 17 +-\n t/t1400-update-ref.sh | 6 +\n t/t1401-symbolic-ref.sh | 18 +-\n t/t1410-reflog.sh | 26 +-\n t/t1430-bad-ref-name.sh | 6 +\n t/t1450-fsck.sh | 12 +-\n t/t1460-refs-lmdb-backend.sh | 1109 ++++++++++++++\n t/t1470-refs-lmdb-backend-reflog.sh | 359 +++++\n t/t1480-refs-lmdb-submodule.sh | 85 ++\n t/t1506-rev-parse-diagnosis.sh | 4 +-\n t/t2013-checkout-submodule.sh | 2 +-\n t/t2105-update-index-gitfile.sh | 4 +-\n t/t2107-update-index-basic.sh | 6 +-\n t/t2201-add-update-typechange.sh | 4 +-\n t/t3001-ls-files-others-exclude.sh | 2 +-\n t/t3010-ls-files-killed-modified.sh | 4 +-\n t/t3040-subprojects-basic.sh | 4 +-\n t/t3050-subprojects-fetch.sh | 2 +-\n t/t3200-branch.sh | 74 +-\n t/t3210-pack-refs.sh | 7 +\n t/t3211-peel-ref.sh | 6 +\n t/t3308-notes-merge.sh | 2 +-\n t/t3404-rebase-interactive.sh | 2 +-\n t/t3600-rm.sh | 2 +-\n t/t3800-mktag.sh | 4 +-\n t/t3903-stash.sh | 2 +-\n t/t4010-diff-pathspec.sh | 2 +-\n t/t4020-diff-external.sh | 2 +-\n t/t4027-diff-submodule.sh | 2 +-\n t/t4035-diff-quiet.sh | 2 +-\n t/t4255-am-submodule.sh | 2 +-\n t/t5000-tar-tree.sh | 3 +-\n t/t5304-prune.sh | 2 +-\n t/t5312-prune-corruption.sh | 11 +-\n t/t5500-fetch-pack.sh | 10 +-\n t/t5510-fetch.sh | 30 +-\n t/t5526-fetch-submodules.sh | 4 +-\n t/t5527-fetch-odd-refs.sh | 7 +\n t/t5537-fetch-shallow.sh | 7 +\n t/t5700-clone-reference.sh | 42 +-\n t/t6001-rev-list-graft.sh | 3 +-\n t/t6010-merge-base.sh | 2 +-\n t/t6050-replace.sh | 4 +-\n t/t6120-describe.sh | 6 +-\n t/t6301-for-each-ref-errors.sh | 12 +-\n t/t7201-co.sh | 2 +-\n t/t7300-clean.sh | 25 +-\n t/t7400-submodule-basic.sh | 18 +-\n t/t7402-submodule-rebase.sh | 2 +-\n t/t7405-submodule-merge.sh | 10 +-\n t/t9104-git-svn-follow-parent.sh | 3 +-\n t/t9115-git-svn-dcommit-funky-renames.sh | 2 +-\n t/t9350-fast-export.sh | 6 +-\n t/t9902-completion.sh | 3 +-\n t/t9903-bash-prompt.sh | 1 +\n t/test-lib-functions.sh | 53 +-\n t/test-lib.sh | 7 +\n test-refs-lmdb-backend.c | 64 +\n transport.c | 7 +-\n 92 files changed, 5071 insertions(+), 457 deletions(-)\n create mode 100644 Documentation/technical/refs-lmdb-backend.txt\n create mode 100644 refs/lmdb-backend.c\n create mode 100755 t/t1460-refs-lmdb-backend.sh\n create mode 100755 t/t1470-refs-lmdb-backend-reflog.sh\n create mode 100755 t/t1480-refs-lmdb-submodule.sh\n create mode 100644 test-refs-lmdb-backend.c\n\n-- \n2.4.2.767.g62658d5-twtrsrc\n"},{"id":"278527","messageId":"1455772670-21142-2-git-send-email-dturner@twopensource.com","threadId":"41437","inReplyTo":"1455772670-21142-1-git-send-email-dturner@twopensource.com","subject":"[PATCH v5 01/27] refs: Move head_ref{,_submodule} to the common code","fromName":"David Turner","fromEmail":"dturner@twopensource.com","sentAt":"2016-02-18T05:17:24Z","receivedAt":"2016-02-18T05:17:24Z","isPatch":true,"sender":{"key":"novalis@novalis.org","avatar":"https://avatars.githubusercontent.com/u/77003?v=4"},"body":"These don't use any backend-specific functions. These were previously\ndefined in terms of the do_head_ref helper function, but since they\nare otherwise identical, we don't need that function.\n\nSigned-off-by: David Turner \n---\n refs.c | 23 +++++++++++++++++++++++\n refs/files-backend.c | 28 ----------------------------\n 2 files changed, 23 insertions(+), 28 deletions(-)\n\ndiff --git a/refs.c b/refs.c\nindex e2d34b2..4367c14 100644\n--- a/refs.c\n+++ b/refs.c\n@@ -1082,3 +1082,26 @@ int rename_ref_available(const char *oldname, const char *newname)\n \tstrbuf_release(&err);\n \treturn ret;\n }\n+\n+int head_ref_submodule(const char *submodule, each_ref_fn fn, void *cb_data)\n+{\n+\tstruct object_id oid;\n+\tint flag;\n+\n+\tif (submodule) {\n+\t\tif (resolve_gitlink_ref(submodule, \"HEAD\", oid.hash) == 0)\n+\t\t\treturn fn(\"HEAD\", &oid, 0, cb_data);\n+\n+\t\treturn 0;\n+\t}\n+\n+\tif (!read_ref_full(\"HEAD\", RESOLVE_REF_READING, oid.hash, &flag))\n+\t\treturn fn(\"HEAD\", &oid, flag, cb_data);\n+\n+\treturn 0;\n+}\n+\n+int head_ref(each_ref_fn fn, void *cb_data)\n+{\n+\treturn head_ref_submodule(NULL, fn, cb_data);\n+}\ndiff --git a/refs/files-backend.c b/refs/files-backend.c\nindex b569762..2e2a6d9 100644\n--- a/refs/files-backend.c\n+++ b/refs/files-backend.c\n@@ -1753,34 +1753,6 @@ static int do_for_each_ref(struct ref_cache *refs, const char *base,\n \treturn do_for_each_entry(refs, base, do_one_ref, &data);\n }\n \n-static int do_head_ref(const char *submodule, each_ref_fn fn, void *cb_data)\n-{\n-\tstruct object_id oid;\n-\tint flag;\n-\n-\tif (submodule) {\n-\t\tif (resolve_gitlink_ref(submodule, \"HEAD\", oid.hash) == 0)\n-\t\t\treturn fn(\"HEAD\", &oid, 0, cb_data);\n-\n-\t\treturn 0;\n-\t}\n-\n-\tif (!read_ref_full(\"HEAD\", RESOLVE_REF_READING, oid.hash, &flag))\n-\t\treturn fn(\"HEAD\", &oid, flag, cb_data);\n-\n-\treturn 0;\n-}\n-\n-int head_ref(each_ref_fn fn, void *cb_data)\n-{\n-\treturn do_head_ref(NULL, fn, cb_data);\n-}\n-\n-int head_ref_submodule(const char *submodule, each_ref_fn fn, void *cb_data)\n-{\n-\treturn do_head_ref(submodule, fn, cb_data);\n-}\n-\n int for_each_ref(each_ref_fn fn, void *cb_data)\n {\n \treturn do_for_each_ref(&ref_cache, \"\", fn, 0, 0, cb_data);\n-- \n2.4.2.767.g62658d5-twtrsrc\n"},{"id":"278528","messageId":"1455772670-21142-3-git-send-email-dturner@twopensource.com","threadId":"41437","inReplyTo":"1455772670-21142-1-git-send-email-dturner@twopensource.com","subject":"[PATCH v5 02/27] refs: move for_each_*ref* functions into common code","fromName":"David Turner","fromEmail":"dturner@twopensource.com","sentAt":"2016-02-18T05:17:25Z","receivedAt":"2016-02-18T05:17:25Z","isPatch":true,"sender":{"key":"novalis@novalis.org","avatar":"https://avatars.githubusercontent.com/u/77003?v=4"},"body":"Make do_for_each_ref take a submodule as an argument instead of a\nref_cache. Since all for_each_*ref* functions are defined in terms of\ndo_for_each_ref, we can then move them into the common code.\n\nLater, we can simply make do_for_each_ref into a backend function.\n\nSigned-off-by: David Turner \n---\n refs.c | 52 +++++++++++++++++++++++++++++++++++++++++++\n refs/files-backend.c | 62 +++++-----------------------------------------------\n refs/refs-internal.h | 9 ++++++++\n 3 files changed, 66 insertions(+), 57 deletions(-)\n\ndiff --git a/refs.c b/refs.c\nindex 4367c14..c38311b 100644\n--- a/refs.c\n+++ b/refs.c\n@@ -1105,3 +1105,55 @@ int head_ref(each_ref_fn fn, void *cb_data)\n {\n \treturn head_ref_submodule(NULL, fn, cb_data);\n }\n+\n+int for_each_ref(each_ref_fn fn, void *cb_data)\n+{\n+\treturn do_for_each_ref(NULL, \"\", fn, 0, 0, cb_data);\n+}\n+\n+int for_each_ref_submodule(const char *submodule, each_ref_fn fn, void *cb_data)\n+{\n+\treturn do_for_each_ref(submodule, \"\", fn, 0, 0, cb_data);\n+}\n+\n+int for_each_ref_in(const char *prefix, each_ref_fn fn, void *cb_data)\n+{\n+\treturn do_for_each_ref(NULL, prefix, fn, strlen(prefix), 0, cb_data);\n+}\n+\n+int for_each_fullref_in(const char *prefix, each_ref_fn fn, void *cb_data, unsigned int broken)\n+{\n+\tunsigned int flag = 0;\n+\n+\tif (broken)\n+\t\tflag = DO_FOR_EACH_INCLUDE_BROKEN;\n+\treturn do_for_each_ref(NULL, prefix, fn, 0, flag, cb_data);\n+}\n+\n+int for_each_ref_in_submodule(const char *submodule, const char *prefix,\n+\t\teach_ref_fn fn, void *cb_data)\n+{\n+\treturn do_for_each_ref(submodule, prefix, fn, strlen(prefix), 0, cb_data);\n+}\n+\n+int for_each_replace_ref(each_ref_fn fn, void *cb_data)\n+{\n+\treturn do_for_each_ref(NULL, git_replace_ref_base, fn,\n+\t\t\t strlen(git_replace_ref_base), 0, cb_data);\n+}\n+\n+int for_each_namespaced_ref(each_ref_fn fn, void *cb_data)\n+{\n+\tstruct strbuf buf = STRBUF_INIT;\n+\tint ret;\n+\tstrbuf_addf(&buf, \"%srefs/\", get_git_namespace());\n+\tret = do_for_each_ref(NULL, buf.buf, fn, 0, 0, cb_data);\n+\tstrbuf_release(&buf);\n+\treturn ret;\n+}\n+\n+int for_each_rawref(each_ref_fn fn, void *cb_data)\n+{\n+\treturn do_for_each_ref(NULL, \"\", fn, 0,\n+\t\t\t DO_FOR_EACH_INCLUDE_BROKEN, cb_data);\n+}\ndiff --git a/refs/files-backend.c b/refs/files-backend.c\nindex 2e2a6d9..fd664d6 100644\n--- a/refs/files-backend.c\n+++ b/refs/files-backend.c\n@@ -518,9 +518,6 @@ static void sort_ref_dir(struct ref_dir *dir)\n \tdir->sorted = dir->nr = i;\n }\n \n-/* Include broken references in a do_for_each_ref*() iteration: */\n-#define DO_FOR_EACH_INCLUDE_BROKEN 0x01\n-\n /*\n * Return true iff the reference described by entry can be resolved to\n * an object in the database. Emit a warning if the referred-to\n@@ -1735,10 +1732,13 @@ static int do_for_each_entry(struct ref_cache *refs, const char *base,\n * value, stop the iteration and return that value; otherwise, return\n * 0.\n */\n-static int do_for_each_ref(struct ref_cache *refs, const char *base,\n-\t\t\t each_ref_fn fn, int trim, int flags, void *cb_data)\n+int do_for_each_ref(const char *submodule, const char *base,\n+\t\t each_ref_fn fn, int trim, int flags, void *cb_data)\n {\n \tstruct ref_entry_cb data;\n+\tstruct ref_cache *refs;\n+\n+\trefs = get_ref_cache(submodule);\n \tdata.base = base;\n \tdata.trim = trim;\n \tdata.flags = flags;\n@@ -1753,58 +1753,6 @@ static int do_for_each_ref(struct ref_cache *refs, const char *base,\n \treturn do_for_each_entry(refs, base, do_one_ref, &data);\n }\n \n-int for_each_ref(each_ref_fn fn, void *cb_data)\n-{\n-\treturn do_for_each_ref(&ref_cache, \"\", fn, 0, 0, cb_data);\n-}\n-\n-int for_each_ref_submodule(const char *submodule, each_ref_fn fn, void *cb_data)\n-{\n-\treturn do_for_each_ref(get_ref_cache(submodule), \"\", fn, 0, 0, cb_data);\n-}\n-\n-int for_each_ref_in(const char *prefix, each_ref_fn fn, void *cb_data)\n-{\n-\treturn do_for_each_ref(&ref_cache, prefix, fn, strlen(prefix), 0, cb_data);\n-}\n-\n-int for_each_fullref_in(const char *prefix, each_ref_fn fn, void *cb_data, unsigned int broken)\n-{\n-\tunsigned int flag = 0;\n-\n-\tif (broken)\n-\t\tflag = DO_FOR_EACH_INCLUDE_BROKEN;\n-\treturn do_for_each_ref(&ref_cache, prefix, fn, 0, flag, cb_data);\n-}\n-\n-int for_each_ref_in_submodule(const char *submodule, const char *prefix,\n-\t\teach_ref_fn fn, void *cb_data)\n-{\n-\treturn do_for_each_ref(get_ref_cache(submodule), prefix, fn, strlen(prefix), 0, cb_data);\n-}\n-\n-int for_each_replace_ref(each_ref_fn fn, void *cb_data)\n-{\n-\treturn do_for_each_ref(&ref_cache, git_replace_ref_base, fn,\n-\t\t\t strlen(git_replace_ref_base), 0, cb_data);\n-}\n-\n-int for_each_namespaced_ref(each_ref_fn fn, void *cb_data)\n-{\n-\tstruct strbuf buf = STRBUF_INIT;\n-\tint ret;\n-\tstrbuf_addf(&buf, \"%srefs/\", get_git_namespace());\n-\tret = do_for_each_ref(&ref_cache, buf.buf, fn, 0, 0, cb_data);\n-\tstrbuf_release(&buf);\n-\treturn ret;\n-}\n-\n-int for_each_rawref(each_ref_fn fn, void *cb_data)\n-{\n-\treturn do_for_each_ref(&ref_cache, \"\", fn, 0,\n-\t\t\t DO_FOR_EACH_INCLUDE_BROKEN, cb_data);\n-}\n-\n static void unlock_ref(struct ref_lock *lock)\n {\n \t/* Do not free lock->lk -- atexit() still looks at them */\ndiff --git a/refs/refs-internal.h b/refs/refs-internal.h\nindex c7dded3..92aae80 100644\n--- a/refs/refs-internal.h\n+++ b/refs/refs-internal.h\n@@ -197,4 +197,13 @@ const char *find_descendant_ref(const char *dirname,\n \n int rename_ref_available(const char *oldname, const char *newname);\n \n+\n+/* Include broken references in a do_for_each_ref*() iteration: */\n+#define DO_FOR_EACH_INCLUDE_BROKEN 0x01\n+\n+/*\n+ * The common backend for the for_each_*ref* functions\n+ */\n+int do_for_each_ref(const char *submodule, const char *base,\n+\t\t each_ref_fn fn, int trim, int flags, void *cb_data);\n #endif /* REFS_REFS_INTERNAL_H */\n-- \n2.4.2.767.g62658d5-twtrsrc\n"},{"id":"278552","messageId":"1455772670-21142-4-git-send-email-dturner@twopensource.com","threadId":"41437","inReplyTo":"1455772670-21142-1-git-send-email-dturner@twopensource.com","subject":"[PATCH v5 03/27] refs: add a backend method structure with transaction functions","fromName":"David Turner","fromEmail":"dturner@twopensource.com","sentAt":"2016-02-18T05:17:26Z","receivedAt":"2016-02-18T05:17:26Z","isPatch":true,"sender":{"key":"novalis@novalis.org","avatar":"https://avatars.githubusercontent.com/u/77003?v=4"},"body":"From: Ronnie Sahlberg \n\nAdd a ref structure for storage backend methods. Start by adding a\nmethod pointer for the transaction commit function.\n\nAdd a function set_refs_backend to switch between storage\nbackends. The files based storage backend is the default.\n\nSigned-off-by: Ronnie Sahlberg \nSigned-off-by: David Turner \n---\n refs.c | 40 ++++++++++++++++++++++++++++++++++++++++\n refs.h | 7 +++++++\n refs/files-backend.c | 10 ++++++++--\n refs/refs-internal.h | 14 +++++++++++++-\n 4 files changed, 68 insertions(+), 3 deletions(-)\n\ndiff --git a/refs.c b/refs.c\nindex c38311b..ac885cb 100644\n--- a/refs.c\n+++ b/refs.c\n@@ -10,6 +10,39 @@\n #include \"tag.h\"\n \n /*\n+ * We always have a files backend and it is the default.\n+ */\n+static struct ref_storage_be *the_refs_backend = &refs_be_files;\n+/*\n+ * List of all available backends\n+ */\n+static struct ref_storage_be *refs_backends = &refs_be_files;\n+\n+int set_ref_storage_backend(const char *name)\n+{\n+\tstruct ref_storage_be *be;\n+\n+\tfor (be = refs_backends; be; be = be->next)\n+\t\tif (!strcmp(be->name, name)) {\n+\t\t\tthe_refs_backend = be;\n+\t\t\treturn 0;\n+\t\t}\n+\treturn 1;\n+}\n+\n+int ref_storage_backend_exists(const char *name)\n+{\n+\tstruct ref_storage_be *be;\n+\n+\tfor (be = refs_backends; be; be = be->next)\n+\t\tif (!strcmp(be->name, name)) {\n+\t\t\tthe_refs_backend = be;\n+\t\t\treturn 1;\n+\t\t}\n+\treturn 0;\n+}\n+\n+/*\n * How to handle various characters in refnames:\n * 0: An acceptable character for refs\n * 1: End-of-component\n@@ -1157,3 +1190,10 @@ int for_each_rawref(each_ref_fn fn, void *cb_data)\n \treturn do_for_each_ref(NULL, \"\", fn, 0,\n \t\t\t DO_FOR_EACH_INCLUDE_BROKEN, cb_data);\n }\n+\n+/* backend functions */\n+int ref_transaction_commit(struct ref_transaction *transaction,\n+\t\t\t struct strbuf *err)\n+{\n+\treturn the_refs_backend->transaction_commit(transaction, err);\n+}\ndiff --git a/refs.h b/refs.h\nindex 3c3da29..5bc3fbc 100644\n--- a/refs.h\n+++ b/refs.h\n@@ -508,4 +508,11 @@ extern int reflog_expire(const char *refname, const unsigned char *sha1,\n \t\t\t reflog_expiry_cleanup_fn cleanup_fn,\n \t\t\t void *policy_cb_data);\n \n+/*\n+ * Switch to an alternate ref storage backend.\n+ */\n+int set_ref_storage_backend(const char *name);\n+\n+int ref_storage_backend_exists(const char *name);\n+\n #endif /* REFS_H */\ndiff --git a/refs/files-backend.c b/refs/files-backend.c\nindex fd664d6..caeb478 100644\n--- a/refs/files-backend.c\n+++ b/refs/files-backend.c\n@@ -3066,8 +3066,8 @@ static int ref_update_reject_duplicates(struct string_list *refnames,\n \treturn 0;\n }\n \n-int ref_transaction_commit(struct ref_transaction *transaction,\n-\t\t\t struct strbuf *err)\n+static int files_transaction_commit(struct ref_transaction *transaction,\n+\t\t\t\t struct strbuf *err)\n {\n \tint ret = 0, i;\n \tint n = transaction->nr;\n@@ -3453,3 +3453,9 @@ int reflog_expire(const char *refname, const unsigned char *sha1,\n \tunlock_ref(lock);\n \treturn -1;\n }\n+\n+struct ref_storage_be refs_be_files = {\n+\tNULL,\n+\t\"files\",\n+\tfiles_transaction_commit,\n+};\ndiff --git a/refs/refs-internal.h b/refs/refs-internal.h\nindex 92aae80..c240ca6 100644\n--- a/refs/refs-internal.h\n+++ b/refs/refs-internal.h\n@@ -197,7 +197,6 @@ const char *find_descendant_ref(const char *dirname,\n \n int rename_ref_available(const char *oldname, const char *newname);\n \n-\n /* Include broken references in a do_for_each_ref*() iteration: */\n #define DO_FOR_EACH_INCLUDE_BROKEN 0x01\n \n@@ -206,4 +205,17 @@ int rename_ref_available(const char *oldname, const char *newname);\n */\n int do_for_each_ref(const char *submodule, const char *base,\n \t\t each_ref_fn fn, int trim, int flags, void *cb_data);\n+\n+/* refs backends */\n+typedef int ref_transaction_commit_fn(struct ref_transaction *transaction,\n+\t\t\t\t struct strbuf *err);\n+\n+struct ref_storage_be {\n+\tstruct ref_storage_be *next;\n+\tconst char *name;\n+\tref_transaction_commit_fn *transaction_commit;\n+};\n+\n+extern struct ref_storage_be refs_be_files;\n+\n #endif /* REFS_REFS_INTERNAL_H */\n-- \n2.4.2.767.g62658d5-twtrsrc\n"},{"id":"278533","messageId":"1455772670-21142-5-git-send-email-dturner@twopensource.com","threadId":"41437","inReplyTo":"1455772670-21142-1-git-send-email-dturner@twopensource.com","subject":"[PATCH v5 04/27] refs: add methods for misc ref operations","fromName":"David Turner","fromEmail":"dturner@twopensource.com","sentAt":"2016-02-18T05:17:27Z","receivedAt":"2016-02-18T05:17:27Z","isPatch":true,"sender":{"key":"novalis@novalis.org","avatar":"https://avatars.githubusercontent.com/u/77003?v=4"},"body":"From: Ronnie Sahlberg \n\nAdd ref backend methods for:\nresolve_ref_unsafe, verify_refname_available, pack_refs, peel_ref,\ncreate_symref, resolve_gitlink_ref.\n\nSigned-off-by: Ronnie Sahlberg \nSigned-off-by: David Turner \n---\n refs.c | 36 ++++++++++++++++++++++++++++++++++++\n refs/files-backend.c | 33 +++++++++++++++++++++++----------\n refs/refs-internal.h | 23 +++++++++++++++++++++++\n 3 files changed, 82 insertions(+), 10 deletions(-)\n\ndiff --git a/refs.c b/refs.c\nindex ac885cb..bfe3b4e 100644\n--- a/refs.c\n+++ b/refs.c\n@@ -1197,3 +1197,39 @@ int ref_transaction_commit(struct ref_transaction *transaction,\n {\n \treturn the_refs_backend->transaction_commit(transaction, err);\n }\n+\n+const char *resolve_ref_unsafe(const char *ref, int resolve_flags,\n+\t\t\t unsigned char *sha1, int *flags)\n+{\n+\treturn the_refs_backend->resolve_ref_unsafe(ref, resolve_flags, sha1,\n+\t\t\t\t\t\t flags);\n+}\n+\n+int verify_refname_available(const char *refname, struct string_list *extra,\n+\t\t\t struct string_list *skip, struct strbuf *err)\n+{\n+\treturn the_refs_backend->verify_refname_available(refname, extra, skip, err);\n+}\n+\n+int pack_refs(unsigned int flags)\n+{\n+\treturn the_refs_backend->pack_refs(flags);\n+}\n+\n+int peel_ref(const char *refname, unsigned char *sha1)\n+{\n+\treturn the_refs_backend->peel_ref(refname, sha1);\n+}\n+\n+int create_symref(const char *ref_target, const char *refs_heads_master,\n+\t\t const char *logmsg)\n+{\n+\treturn the_refs_backend->create_symref(ref_target, refs_heads_master,\n+\t\t\t\t\t logmsg);\n+}\n+\n+int resolve_gitlink_ref(const char *path, const char *refname,\n+\t\t\tunsigned char *sha1)\n+{\n+\treturn the_refs_backend->resolve_gitlink_ref(path, refname, sha1);\n+}\ndiff --git a/refs/files-backend.c b/refs/files-backend.c\nindex caeb478..dec8575 100644\n--- a/refs/files-backend.c\n+++ b/refs/files-backend.c\n@@ -1340,7 +1340,8 @@ static int resolve_gitlink_ref_recursive(struct ref_cache *refs,\n \treturn resolve_gitlink_ref_recursive(refs, p, sha1, recursion+1);\n }\n \n-int resolve_gitlink_ref(const char *path, const char *refname, unsigned char *sha1)\n+static int files_resolve_gitlink_ref(const char *path, const char *refname,\n+\t\t\t\t unsigned char *sha1)\n {\n \tint len = strlen(path), retval;\n \tstruct strbuf submodule = STRBUF_INIT;\n@@ -1580,8 +1581,10 @@ static const char *resolve_ref_1(const char *refname,\n \t}\n }\n \n-const char *resolve_ref_unsafe(const char *refname, int resolve_flags,\n-\t\t\t unsigned char *sha1, int *flags)\n+static const char *files_resolve_ref_unsafe(const char *refname,\n+\t\t\t\t\t int resolve_flags,\n+\t\t\t\t\t unsigned char *sha1,\n+\t\t\t\t\t int *flags)\n {\n \tstatic struct strbuf sb_refname = STRBUF_INIT;\n \tstruct strbuf sb_contents = STRBUF_INIT;\n@@ -1630,7 +1633,7 @@ static enum peel_status peel_entry(struct ref_entry *entry, int repeel)\n \treturn status;\n }\n \n-int peel_ref(const char *refname, unsigned char *sha1)\n+static int files_peel_ref(const char *refname, unsigned char *sha1)\n {\n \tint flag;\n \tunsigned char base[20];\n@@ -2190,7 +2193,7 @@ static void prune_refs(struct ref_to_prune *r)\n \t}\n }\n \n-int pack_refs(unsigned int flags)\n+static int files_pack_refs(unsigned int flags)\n {\n \tstruct pack_refs_cb_data cbdata;\n \n@@ -2381,10 +2384,10 @@ out:\n \treturn ret;\n }\n \n-int verify_refname_available(const char *newname,\n-\t\t\t struct string_list *extras,\n-\t\t\t struct string_list *skip,\n-\t\t\t struct strbuf *err)\n+static int files_verify_refname_available(const char *newname,\n+\t\t\t\t\t struct string_list *extras,\n+\t\t\t\t\t struct string_list *skip,\n+\t\t\t\t\t struct strbuf *err)\n {\n \tstruct ref_dir *packed_refs = get_packed_refs(&ref_cache);\n \tstruct ref_dir *loose_refs = get_loose_refs(&ref_cache);\n@@ -2804,7 +2807,9 @@ static int create_symref_locked(struct ref_lock *lock, const char *refname,\n \treturn 0;\n }\n \n-int create_symref(const char *refname, const char *target, const char *logmsg)\n+static int files_create_symref(const char *refname,\n+\t\t\t const char *target,\n+\t\t\t const char *logmsg)\n {\n \tstruct strbuf err = STRBUF_INIT;\n \tstruct ref_lock *lock;\n@@ -3458,4 +3463,12 @@ struct ref_storage_be refs_be_files = {\n \tNULL,\n \t\"files\",\n \tfiles_transaction_commit,\n+\n+\tfiles_pack_refs,\n+\tfiles_peel_ref,\n+\tfiles_create_symref,\n+\n+\tfiles_resolve_ref_unsafe,\n+\tfiles_verify_refname_available,\n+\tfiles_resolve_gitlink_ref,\n };\ndiff --git a/refs/refs-internal.h b/refs/refs-internal.h\nindex c240ca6..ed458fb 100644\n--- a/refs/refs-internal.h\n+++ b/refs/refs-internal.h\n@@ -210,10 +210,33 @@ int do_for_each_ref(const char *submodule, const char *base,\n typedef int ref_transaction_commit_fn(struct ref_transaction *transaction,\n \t\t\t\t struct strbuf *err);\n \n+/* misc methods */\n+typedef int pack_refs_fn(unsigned int flags);\n+typedef int peel_ref_fn(const char *refname, unsigned char *sha1);\n+typedef int create_symref_fn(const char *ref_target,\n+\t\t\t const char *refs_heads_master,\n+\t\t\t const char *logmsg);\n+\n+/* resolution methods */\n+typedef const char *resolve_ref_unsafe_fn(const char *ref,\n+\t\t\t\t\t int resolve_flags,\n+\t\t\t\t\t unsigned char *sha1, int *flags);\n+typedef int verify_refname_available_fn(const char *refname, struct string_list *extra, struct string_list *skip, struct strbuf *err);\n+typedef int resolve_gitlink_ref_fn(const char *path, const char *refname,\n+\t\t\t\t unsigned char *sha1);\n+\n struct ref_storage_be {\n \tstruct ref_storage_be *next;\n \tconst char *name;\n \tref_transaction_commit_fn *transaction_commit;\n+\n+\tpack_refs_fn *pack_refs;\n+\tpeel_ref_fn *peel_ref;\n+\tcreate_symref_fn *create_symref;\n+\n+\tresolve_ref_unsafe_fn *resolve_ref_unsafe;\n+\tverify_refname_available_fn *verify_refname_available;\n+\tresolve_gitlink_ref_fn *resolve_gitlink_ref;\n };\n \n extern struct ref_storage_be refs_be_files;\n-- \n2.4.2.767.g62658d5-twtrsrc\n"},{"id":"278553","messageId":"1455772670-21142-6-git-send-email-dturner@twopensource.com","threadId":"41437","inReplyTo":"1455772670-21142-1-git-send-email-dturner@twopensource.com","subject":"[PATCH v5 05/27] refs: add method for do_for_each_ref","fromName":"David Turner","fromEmail":"dturner@twopensource.com","sentAt":"2016-02-18T05:17:28Z","receivedAt":"2016-02-18T05:17:28Z","isPatch":true,"sender":{"key":"novalis@novalis.org","avatar":"https://avatars.githubusercontent.com/u/77003?v=4"},"body":"Add a ref backend method for do_for_each_ref.\n\nSigned-off-by: David Turner \n---\n refs.c | 8 ++++++++\n refs/files-backend.c | 7 +++++--\n refs/refs-internal.h | 5 +++++\n 3 files changed, 18 insertions(+), 2 deletions(-)\n\ndiff --git a/refs.c b/refs.c\nindex bfe3b4e..253e566 100644\n--- a/refs.c\n+++ b/refs.c\n@@ -1233,3 +1233,11 @@ int resolve_gitlink_ref(const char *path, const char *refname,\n {\n \treturn the_refs_backend->resolve_gitlink_ref(path, refname, sha1);\n }\n+\n+int do_for_each_ref(const char *submodule, const char *base,\n+\t\t each_ref_fn fn, int trim, int flags,\n+\t\t void *cb_data)\n+{\n+\treturn the_refs_backend->do_for_each_ref(submodule, base, fn, trim,\n+\t\t\t\t\t\t flags, cb_data);\n+}\ndiff --git a/refs/files-backend.c b/refs/files-backend.c\nindex dec8575..34c414b 100644\n--- a/refs/files-backend.c\n+++ b/refs/files-backend.c\n@@ -1735,8 +1735,9 @@ static int do_for_each_entry(struct ref_cache *refs, const char *base,\n * value, stop the iteration and return that value; otherwise, return\n * 0.\n */\n-int do_for_each_ref(const char *submodule, const char *base,\n-\t\t each_ref_fn fn, int trim, int flags, void *cb_data)\n+static int files_do_for_each_ref(const char *submodule, const char *base,\n+\t\t\t\t each_ref_fn fn, int trim, int flags,\n+\t\t\t\t void *cb_data)\n {\n \tstruct ref_entry_cb data;\n \tstruct ref_cache *refs;\n@@ -3471,4 +3472,6 @@ struct ref_storage_be refs_be_files = {\n \tfiles_resolve_ref_unsafe,\n \tfiles_verify_refname_available,\n \tfiles_resolve_gitlink_ref,\n+\n+\tfiles_do_for_each_ref,\n };\ndiff --git a/refs/refs-internal.h b/refs/refs-internal.h\nindex ed458fb..1caeb61 100644\n--- a/refs/refs-internal.h\n+++ b/refs/refs-internal.h\n@@ -224,6 +224,9 @@ typedef const char *resolve_ref_unsafe_fn(const char *ref,\n typedef int verify_refname_available_fn(const char *refname, struct string_list *extra, struct string_list *skip, struct strbuf *err);\n typedef int resolve_gitlink_ref_fn(const char *path, const char *refname,\n \t\t\t\t unsigned char *sha1);\n+typedef int do_for_each_ref_fn(const char *submodule, const char *base,\n+\t\t\t each_ref_fn fn, int trim, int flags,\n+\t\t\t void *cb_data);\n \n struct ref_storage_be {\n \tstruct ref_storage_be *next;\n@@ -237,6 +240,8 @@ struct ref_storage_be {\n \tresolve_ref_unsafe_fn *resolve_ref_unsafe;\n \tverify_refname_available_fn *verify_refname_available;\n \tresolve_gitlink_ref_fn *resolve_gitlink_ref;\n+\n+\tdo_for_each_ref_fn *do_for_each_ref;\n };\n \n extern struct ref_storage_be refs_be_files;\n-- \n2.4.2.767.g62658d5-twtrsrc\n"},{"id":"278529","messageId":"1455772670-21142-7-git-send-email-dturner@twopensource.com","threadId":"41437","inReplyTo":"1455772670-21142-1-git-send-email-dturner@twopensource.com","subject":"[PATCH v5 06/27] refs: add do_for_each_per_worktree_ref","fromName":"David Turner","fromEmail":"dturner@twopensource.com","sentAt":"2016-02-18T05:17:29Z","receivedAt":"2016-02-18T05:17:29Z","isPatch":true,"sender":{"key":"novalis@novalis.org","avatar":"https://avatars.githubusercontent.com/u/77003?v=4"},"body":"Alternate refs backends might still use files to store per-worktree\nrefs. So the files backend's ref-loading infrastructure should be\navailable to those backends, just for use on per-worktree refs. Add\ndo_for_each_per_worktree_ref, which iterates over per-worktree refs.\n\nSigned-off-by: David Turner \n---\n refs/files-backend.c | 16 ++++++++++++++++\n refs/refs-internal.h | 7 +++++++\n 2 files changed, 23 insertions(+)\n\ndiff --git a/refs/files-backend.c b/refs/files-backend.c\nindex 34c414b..e94960a 100644\n--- a/refs/files-backend.c\n+++ b/refs/files-backend.c\n@@ -565,6 +565,10 @@ static int do_one_ref(struct ref_entry *entry, void *cb_data)\n \tstruct ref_entry *old_current_ref;\n \tint retval;\n \n+\tif (data->flags & DO_FOR_EACH_PER_WORKTREE_ONLY &&\n+\t ref_type(entry->name) != REF_TYPE_PER_WORKTREE)\n+\t\treturn 0;\n+\n \tif (!starts_with(entry->name, data->base))\n \t\treturn 0;\n \n@@ -1757,6 +1761,18 @@ static int files_do_for_each_ref(const char *submodule, const char *base,\n \treturn do_for_each_entry(refs, base, do_one_ref, &data);\n }\n \n+int do_for_each_per_worktree_ref(const char *submodule, const char *base,\n+\t\t\t\t each_ref_fn fn, int trim, int flags,\n+\t\t\t\t void *cb_data)\n+{\n+\t/*\n+\t * It's important that this one use the files backend, since\n+\t * that's what controls the per-worktree refs\n+\t */\n+\treturn files_do_for_each_ref(submodule, base, fn, trim,\n+\t\t\t\t flags | DO_FOR_EACH_PER_WORKTREE_ONLY, cb_data);\n+}\n+\n static void unlock_ref(struct ref_lock *lock)\n {\n \t/* Do not free lock->lk -- atexit() still looks at them */\ndiff --git a/refs/refs-internal.h b/refs/refs-internal.h\nindex 1caeb61..87b9d80 100644\n--- a/refs/refs-internal.h\n+++ b/refs/refs-internal.h\n@@ -200,6 +200,13 @@ int rename_ref_available(const char *oldname, const char *newname);\n /* Include broken references in a do_for_each_ref*() iteration: */\n #define DO_FOR_EACH_INCLUDE_BROKEN 0x01\n \n+/* Only include per-worktree refs in a do_for_each_ref*() iteration */\n+#define DO_FOR_EACH_PER_WORKTREE_ONLY 0x02\n+\n+int do_for_each_per_worktree_ref(const char *submodule, const char *base,\n+\t\t\t\t each_ref_fn fn, int trim, int flags,\n+\t\t\t\t void *cb_data);\n+\n /*\n * The common backend for the for_each_*ref* functions\n */\n-- \n2.4.2.767.g62658d5-twtrsrc\n"},{"id":"278550","messageId":"1455772670-21142-8-git-send-email-dturner@twopensource.com","threadId":"41437","inReplyTo":"1455772670-21142-1-git-send-email-dturner@twopensource.com","subject":"[PATCH v5 07/27] refs: add methods for reflog","fromName":"David Turner","fromEmail":"dturner@twopensource.com","sentAt":"2016-02-18T05:17:30Z","receivedAt":"2016-02-18T05:17:30Z","isPatch":true,"sender":{"key":"novalis@novalis.org","avatar":"https://avatars.githubusercontent.com/u/77003?v=4"},"body":"In the file-based backend, the reflog piggybacks on the ref lock.\nSince other backends won't have the same sort of ref lock, ref backends\nmust also handle reflogs.\n\nSigned-off-by: Ronnie Sahlberg \nSigned-off-by: David Turner \n---\n refs.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++\n refs/files-backend.c | 36 ++++++++++++++++++++++++------------\n refs/refs-internal.h | 27 +++++++++++++++++++++++++++\n 3 files changed, 97 insertions(+), 12 deletions(-)\n\ndiff --git a/refs.c b/refs.c\nindex 253e566..4733935 100644\n--- a/refs.c\n+++ b/refs.c\n@@ -1241,3 +1241,49 @@ int do_for_each_ref(const char *submodule, const char *base,\n \treturn the_refs_backend->do_for_each_ref(submodule, base, fn, trim,\n \t\t\t\t\t\t flags, cb_data);\n }\n+\n+int for_each_reflog_ent_reverse(const char *refname, each_reflog_ent_fn fn,\n+\t\t\t\tvoid *cb_data)\n+{\n+\treturn the_refs_backend->for_each_reflog_ent_reverse(refname, fn,\n+\t\t\t\t\t\t\t cb_data);\n+}\n+\n+int for_each_reflog_ent(const char *refname, each_reflog_ent_fn fn,\n+\t\t\tvoid *cb_data)\n+{\n+\treturn the_refs_backend->for_each_reflog_ent(refname, fn, cb_data);\n+}\n+\n+int for_each_reflog(each_ref_fn fn, void *cb_data)\n+{\n+\treturn the_refs_backend->for_each_reflog(fn, cb_data);\n+}\n+\n+int reflog_exists(const char *refname)\n+{\n+\treturn the_refs_backend->reflog_exists(refname);\n+}\n+\n+int safe_create_reflog(const char *refname, int force_create,\n+\t\t struct strbuf *err)\n+{\n+\treturn the_refs_backend->create_reflog(refname, force_create, err);\n+}\n+\n+int delete_reflog(const char *refname)\n+{\n+\treturn the_refs_backend->delete_reflog(refname);\n+}\n+\n+int reflog_expire(const char *refname, const unsigned char *sha1,\n+\t\t unsigned int flags,\n+\t\t reflog_expiry_prepare_fn prepare_fn,\n+\t\t reflog_expiry_should_prune_fn should_prune_fn,\n+\t\t reflog_expiry_cleanup_fn cleanup_fn,\n+\t\t void *policy_cb_data)\n+{\n+\treturn the_refs_backend->reflog_expire(refname, sha1, flags,\n+\t\t\t\t\t prepare_fn, should_prune_fn,\n+\t\t\t\t\t cleanup_fn, policy_cb_data);\n+}\ndiff --git a/refs/files-backend.c b/refs/files-backend.c\nindex e94960a..149f6a2 100644\n--- a/refs/files-backend.c\n+++ b/refs/files-backend.c\n@@ -2589,7 +2589,8 @@ static int log_ref_setup(const char *refname, struct strbuf *logfile, struct str\n }\n \n \n-int safe_create_reflog(const char *refname, int force_create, struct strbuf *err)\n+static int files_create_reflog(const char *refname, int force_create,\n+\t\t\t struct strbuf *err)\n {\n \tint ret;\n \tstruct strbuf sb = STRBUF_INIT;\n@@ -2845,7 +2846,7 @@ static int files_create_symref(const char *refname,\n \treturn ret;\n }\n \n-int reflog_exists(const char *refname)\n+static int files_reflog_exists(const char *refname)\n {\n \tstruct stat st;\n \n@@ -2853,7 +2854,7 @@ int reflog_exists(const char *refname)\n \t\tS_ISREG(st.st_mode);\n }\n \n-int delete_reflog(const char *refname)\n+static int files_delete_reflog(const char *refname)\n {\n \treturn remove_path(git_path(\"logs/%s\", refname));\n }\n@@ -2897,7 +2898,9 @@ static char *find_beginning_of_line(char *bob, char *scan)\n \treturn scan;\n }\n \n-int for_each_reflog_ent_reverse(const char *refname, each_reflog_ent_fn fn, void *cb_data)\n+static int files_for_each_reflog_ent_reverse(const char *refname,\n+\t\t\t\t\t each_reflog_ent_fn fn,\n+\t\t\t\t\t void *cb_data)\n {\n \tstruct strbuf sb = STRBUF_INIT;\n \tFILE *logfp;\n@@ -2999,7 +3002,8 @@ int for_each_reflog_ent_reverse(const char *refname, each_reflog_ent_fn fn, void\n \treturn ret;\n }\n \n-int for_each_reflog_ent(const char *refname, each_reflog_ent_fn fn, void *cb_data)\n+static int files_for_each_reflog_ent(const char *refname,\n+\t\t\t\t each_reflog_ent_fn fn, void *cb_data)\n {\n \tFILE *logfp;\n \tstruct strbuf sb = STRBUF_INIT;\n@@ -3061,7 +3065,7 @@ static int do_for_each_reflog(struct strbuf *name, each_ref_fn fn, void *cb_data\n \treturn retval;\n }\n \n-int for_each_reflog(each_ref_fn fn, void *cb_data)\n+static int files_for_each_reflog(each_ref_fn fn, void *cb_data)\n {\n \tint retval;\n \tstruct strbuf name;\n@@ -3371,12 +3375,12 @@ static int expire_reflog_ent(unsigned char *osha1, unsigned char *nsha1,\n \treturn 0;\n }\n \n-int reflog_expire(const char *refname, const unsigned char *sha1,\n-\t\t unsigned int flags,\n-\t\t reflog_expiry_prepare_fn prepare_fn,\n-\t\t reflog_expiry_should_prune_fn should_prune_fn,\n-\t\t reflog_expiry_cleanup_fn cleanup_fn,\n-\t\t void *policy_cb_data)\n+static int files_reflog_expire(const char *refname, const unsigned char *sha1,\n+\t\t\t unsigned int flags,\n+\t\t\t reflog_expiry_prepare_fn prepare_fn,\n+\t\t\t reflog_expiry_should_prune_fn should_prune_fn,\n+\t\t\t reflog_expiry_cleanup_fn cleanup_fn,\n+\t\t\t void *policy_cb_data)\n {\n \tstatic struct lock_file reflog_lock;\n \tstruct expire_reflog_cb cb;\n@@ -3481,6 +3485,14 @@ struct ref_storage_be refs_be_files = {\n \t\"files\",\n \tfiles_transaction_commit,\n \n+\tfiles_for_each_reflog_ent,\n+\tfiles_for_each_reflog_ent_reverse,\n+\tfiles_for_each_reflog,\n+\tfiles_reflog_exists,\n+\tfiles_create_reflog,\n+\tfiles_delete_reflog,\n+\tfiles_reflog_expire,\n+\n \tfiles_pack_refs,\n \tfiles_peel_ref,\n \tfiles_create_symref,\ndiff --git a/refs/refs-internal.h b/refs/refs-internal.h\nindex 87b9d80..8b5bbdf 100644\n--- a/refs/refs-internal.h\n+++ b/refs/refs-internal.h\n@@ -217,6 +217,25 @@ int do_for_each_ref(const char *submodule, const char *base,\n typedef int ref_transaction_commit_fn(struct ref_transaction *transaction,\n \t\t\t\t struct strbuf *err);\n \n+/* reflog functions */\n+typedef int for_each_reflog_ent_fn(const char *refname,\n+\t\t\t\t each_reflog_ent_fn fn,\n+\t\t\t\t void *cb_data);\n+typedef int for_each_reflog_ent_reverse_fn(const char *refname,\n+\t\t\t\t\t each_reflog_ent_fn fn,\n+\t\t\t\t\t void *cb_data);\n+typedef int for_each_reflog_fn(each_ref_fn fn, void *cb_data);\n+typedef int reflog_exists_fn(const char *refname);\n+typedef int create_reflog_fn(const char *refname, int force_create,\n+\t\t\t struct strbuf *err);\n+typedef int delete_reflog_fn(const char *refname);\n+typedef int reflog_expire_fn(const char *refname, const unsigned char *sha1,\n+\t\t\t unsigned int flags,\n+\t\t\t reflog_expiry_prepare_fn prepare_fn,\n+\t\t\t reflog_expiry_should_prune_fn should_prune_fn,\n+\t\t\t reflog_expiry_cleanup_fn cleanup_fn,\n+\t\t\t void *policy_cb_data);\n+\n /* misc methods */\n typedef int pack_refs_fn(unsigned int flags);\n typedef int peel_ref_fn(const char *refname, unsigned char *sha1);\n@@ -240,6 +259,14 @@ struct ref_storage_be {\n \tconst char *name;\n \tref_transaction_commit_fn *transaction_commit;\n \n+\tfor_each_reflog_ent_fn *for_each_reflog_ent;\n+\tfor_each_reflog_ent_reverse_fn *for_each_reflog_ent_reverse;\n+\tfor_each_reflog_fn *for_each_reflog;\n+\treflog_exists_fn *reflog_exists;\n+\tcreate_reflog_fn *create_reflog;\n+\tdelete_reflog_fn *delete_reflog;\n+\treflog_expire_fn *reflog_expire;\n+\n \tpack_refs_fn *pack_refs;\n \tpeel_ref_fn *peel_ref;\n \tcreate_symref_fn *create_symref;\n-- \n2.4.2.767.g62658d5-twtrsrc\n"},{"id":"278530","messageId":"1455772670-21142-9-git-send-email-dturner@twopensource.com","threadId":"41437","inReplyTo":"1455772670-21142-1-git-send-email-dturner@twopensource.com","subject":"[PATCH v5 08/27] refs: add method for initial ref transaction commit","fromName":"David Turner","fromEmail":"dturner@twopensource.com","sentAt":"2016-02-18T05:17:31Z","receivedAt":"2016-02-18T05:17:31Z","isPatch":true,"sender":{"key":"novalis@novalis.org","avatar":"https://avatars.githubusercontent.com/u/77003?v=4"},"body":"Signed-off-by: Ronnie Sahlberg \nSigned-off-by: David Turner \n---\n refs.c | 6 ++++++\n refs/files-backend.c | 5 +++--\n refs/refs-internal.h | 1 +\n 3 files changed, 10 insertions(+), 2 deletions(-)\n\ndiff --git a/refs.c b/refs.c\nindex 4733935..970729c 100644\n--- a/refs.c\n+++ b/refs.c\n@@ -1287,3 +1287,9 @@ int reflog_expire(const char *refname, const unsigned char *sha1,\n \t\t\t\t\t prepare_fn, should_prune_fn,\n \t\t\t\t\t cleanup_fn, policy_cb_data);\n }\n+\n+int initial_ref_transaction_commit(struct ref_transaction *transaction,\n+\t\t\t\t struct strbuf *err)\n+{\n+\treturn the_refs_backend->initial_transaction_commit(transaction, err);\n+}\ndiff --git a/refs/files-backend.c b/refs/files-backend.c\nindex 149f6a2..2a663af 100644\n--- a/refs/files-backend.c\n+++ b/refs/files-backend.c\n@@ -3259,8 +3259,8 @@ static int ref_present(const char *refname,\n \treturn string_list_has_string(affected_refnames, refname);\n }\n \n-int initial_ref_transaction_commit(struct ref_transaction *transaction,\n-\t\t\t\t struct strbuf *err)\n+static int files_initial_transaction_commit(struct ref_transaction *transaction,\n+\t\t\t\t\t struct strbuf *err)\n {\n \tint ret = 0, i;\n \tint n = transaction->nr;\n@@ -3484,6 +3484,7 @@ struct ref_storage_be refs_be_files = {\n \tNULL,\n \t\"files\",\n \tfiles_transaction_commit,\n+\tfiles_initial_transaction_commit,\n \n \tfiles_for_each_reflog_ent,\n \tfiles_for_each_reflog_ent_reverse,\ndiff --git a/refs/refs-internal.h b/refs/refs-internal.h\nindex 8b5bbdf..f9acd36 100644\n--- a/refs/refs-internal.h\n+++ b/refs/refs-internal.h\n@@ -258,6 +258,7 @@ struct ref_storage_be {\n \tstruct ref_storage_be *next;\n \tconst char *name;\n \tref_transaction_commit_fn *transaction_commit;\n+\tref_transaction_commit_fn *initial_transaction_commit;\n \n \tfor_each_reflog_ent_fn *for_each_reflog_ent;\n \tfor_each_reflog_ent_reverse_fn *for_each_reflog_ent_reverse;\n-- \n2.4.2.767.g62658d5-twtrsrc\n"},{"id":"278532","messageId":"1455772670-21142-10-git-send-email-dturner@twopensource.com","threadId":"41437","inReplyTo":"1455772670-21142-1-git-send-email-dturner@twopensource.com","subject":"[PATCH v5 09/27] refs: add method for delete_refs","fromName":"David Turner","fromEmail":"dturner@twopensource.com","sentAt":"2016-02-18T05:17:32Z","receivedAt":"2016-02-18T05:17:32Z","isPatch":true,"sender":{"key":"novalis@novalis.org","avatar":"https://avatars.githubusercontent.com/u/77003?v=4"},"body":"In the file-based backend, delete_refs has some special optimization\nto deal with packed refs. In other backends, we might be able to make\nref deletion faster by putting all deletions into a single\ntransaction. So we need a special backend function for this.\n\nSigned-off-by: David Turner \n---\n refs.c | 5 +++++\n refs/files-backend.c | 3 ++-\n refs/refs-internal.h | 2 ++\n 3 files changed, 9 insertions(+), 1 deletion(-)\n\ndiff --git a/refs.c b/refs.c\nindex 970729c..1a24046 100644\n--- a/refs.c\n+++ b/refs.c\n@@ -1293,3 +1293,8 @@ int initial_ref_transaction_commit(struct ref_transaction *transaction,\n {\n \treturn the_refs_backend->initial_transaction_commit(transaction, err);\n }\n+\n+int delete_refs(struct string_list *refnames)\n+{\n+\treturn the_refs_backend->delete_refs(refnames);\n+}\ndiff --git a/refs/files-backend.c b/refs/files-backend.c\nindex 2a663af..e3e2b03 100644\n--- a/refs/files-backend.c\n+++ b/refs/files-backend.c\n@@ -2302,7 +2302,7 @@ static int delete_ref_loose(struct ref_lock *lock, int flag, struct strbuf *err)\n \treturn 0;\n }\n \n-int delete_refs(struct string_list *refnames)\n+static int files_delete_refs(struct string_list *refnames)\n {\n \tstruct strbuf err = STRBUF_INIT;\n \tint i, result = 0;\n@@ -3497,6 +3497,7 @@ struct ref_storage_be refs_be_files = {\n \tfiles_pack_refs,\n \tfiles_peel_ref,\n \tfiles_create_symref,\n+\tfiles_delete_refs,\n \n \tfiles_resolve_ref_unsafe,\n \tfiles_verify_refname_available,\ndiff --git a/refs/refs-internal.h b/refs/refs-internal.h\nindex f9acd36..466dd34 100644\n--- a/refs/refs-internal.h\n+++ b/refs/refs-internal.h\n@@ -242,6 +242,7 @@ typedef int peel_ref_fn(const char *refname, unsigned char *sha1);\n typedef int create_symref_fn(const char *ref_target,\n \t\t\t const char *refs_heads_master,\n \t\t\t const char *logmsg);\n+typedef int delete_refs_fn(struct string_list *refnames);\n \n /* resolution methods */\n typedef const char *resolve_ref_unsafe_fn(const char *ref,\n@@ -271,6 +272,7 @@ struct ref_storage_be {\n \tpack_refs_fn *pack_refs;\n \tpeel_ref_fn *peel_ref;\n \tcreate_symref_fn *create_symref;\n+\tdelete_refs_fn *delete_refs;\n \n \tresolve_ref_unsafe_fn *resolve_ref_unsafe;\n \tverify_refname_available_fn *verify_refname_available;\n-- \n2.4.2.767.g62658d5-twtrsrc\n"},{"id":"278534","messageId":"1455772670-21142-11-git-send-email-dturner@twopensource.com","threadId":"41437","inReplyTo":"1455772670-21142-1-git-send-email-dturner@twopensource.com","subject":"[PATCH v5 10/27] refs: add methods to init refs db","fromName":"David Turner","fromEmail":"dturner@twopensource.com","sentAt":"2016-02-18T05:17:33Z","receivedAt":"2016-02-18T05:17:33Z","isPatch":true,"sender":{"key":"novalis@novalis.org","avatar":"https://avatars.githubusercontent.com/u/77003?v=4"},"body":"Alternate refs backends might not need the refs/heads directory and so\non, so we make ref db initialization part of the backend.\n\nSigned-off-by: David Turner \n---\n builtin/init-db.c | 20 ++++++++++----------\n refs.c | 5 +++++\n refs.h | 2 ++\n refs/files-backend.c | 16 ++++++++++++++++\n refs/refs-internal.h | 2 ++\n 5 files changed, 35 insertions(+), 10 deletions(-)\n\ndiff --git a/builtin/init-db.c b/builtin/init-db.c\nindex 07229d6..0c8f4ac 100644\n--- a/builtin/init-db.c\n+++ b/builtin/init-db.c\n@@ -177,13 +177,7 @@ static int create_default_files(const char *template_path)\n \tchar junk[2];\n \tint reinit;\n \tint filemode;\n-\n-\t/*\n-\t * Create .git/refs/{heads,tags}\n-\t */\n-\tsafe_create_dir(git_path_buf(&buf, \"refs\"), 1);\n-\tsafe_create_dir(git_path_buf(&buf, \"refs/heads\"), 1);\n-\tsafe_create_dir(git_path_buf(&buf, \"refs/tags\"), 1);\n+\tstruct strbuf err = STRBUF_INIT;\n \n \t/* Just look for `init.templatedir` */\n \tgit_config(git_init_db_config, NULL);\n@@ -207,12 +201,18 @@ static int create_default_files(const char *template_path)\n \t */\n \tif (shared_repository) {\n \t\tadjust_shared_perm(get_git_dir());\n-\t\tadjust_shared_perm(git_path_buf(&buf, \"refs\"));\n-\t\tadjust_shared_perm(git_path_buf(&buf, \"refs/heads\"));\n-\t\tadjust_shared_perm(git_path_buf(&buf, \"refs/tags\"));\n \t}\n \n \t/*\n+\t * We need to create a \"refs\" dir in any case so that older\n+\t * versions of git can tell that this is a repository.\n+\t */\n+\tsafe_create_dir(git_path(\"refs\"), 1);\n+\n+\tif (refs_init_db(shared_repository, &err))\n+\t\tdie(\"failed to set up refs db: %s\", err.buf);\n+\n+\t/*\n \t * Create the default symlink from \".git/HEAD\" to the \"master\"\n \t * branch, if it does not exist yet.\n \t */\ndiff --git a/refs.c b/refs.c\nindex 1a24046..e222d02 100644\n--- a/refs.c\n+++ b/refs.c\n@@ -1192,6 +1192,11 @@ int for_each_rawref(each_ref_fn fn, void *cb_data)\n }\n \n /* backend functions */\n+int refs_init_db(int shared, struct strbuf *err)\n+{\n+\treturn the_refs_backend->init_db(shared, err);\n+}\n+\n int ref_transaction_commit(struct ref_transaction *transaction,\n \t\t\t struct strbuf *err)\n {\ndiff --git a/refs.h b/refs.h\nindex 5bc3fbc..feff82e 100644\n--- a/refs.h\n+++ b/refs.h\n@@ -66,6 +66,8 @@ extern int ref_exists(const char *refname);\n \n extern int is_branch(const char *refname);\n \n+extern int refs_init_db(int shared, struct strbuf *err);\n+\n /*\n * If refname is a non-symbolic reference that refers to a tag object,\n * and the tag can be (recursively) dereferenced to a non-tag object,\ndiff --git a/refs/files-backend.c b/refs/files-backend.c\nindex e3e2b03..5377e3f 100644\n--- a/refs/files-backend.c\n+++ b/refs/files-backend.c\n@@ -3480,9 +3480,25 @@ static int files_reflog_expire(const char *refname, const unsigned char *sha1,\n \treturn -1;\n }\n \n+static int files_init_db(int shared, struct strbuf *err)\n+{\n+\t/*\n+\t * Create .git/refs/{heads,tags}\n+\t */\n+\tsafe_create_dir(git_path(\"refs/heads\"), 1);\n+\tsafe_create_dir(git_path(\"refs/tags\"), 1);\n+\tif (shared) {\n+\t\tadjust_shared_perm(git_path(\"refs\"));\n+\t\tadjust_shared_perm(git_path(\"refs/heads\"));\n+\t\tadjust_shared_perm(git_path(\"refs/tags\"));\n+\t}\n+\treturn 0;\n+}\n+\n struct ref_storage_be refs_be_files = {\n \tNULL,\n \t\"files\",\n+\tfiles_init_db,\n \tfiles_transaction_commit,\n \tfiles_initial_transaction_commit,\n \ndiff --git a/refs/refs-internal.h b/refs/refs-internal.h\nindex 466dd34..94227cf 100644\n--- a/refs/refs-internal.h\n+++ b/refs/refs-internal.h\n@@ -214,6 +214,7 @@ int do_for_each_ref(const char *submodule, const char *base,\n \t\t each_ref_fn fn, int trim, int flags, void *cb_data);\n \n /* refs backends */\n+typedef int ref_init_db_fn(int shared, struct strbuf *err);\n typedef int ref_transaction_commit_fn(struct ref_transaction *transaction,\n \t\t\t\t struct strbuf *err);\n \n@@ -258,6 +259,7 @@ typedef int do_for_each_ref_fn(const char *submodule, const char *base,\n struct ref_storage_be {\n \tstruct ref_storage_be *next;\n \tconst char *name;\n+\tref_init_db_fn *init_db;\n \tref_transaction_commit_fn *transaction_commit;\n \tref_transaction_commit_fn *initial_transaction_commit;\n \n-- \n2.4.2.767.g62658d5-twtrsrc\n"},{"id":"278551","messageId":"1455772670-21142-12-git-send-email-dturner@twopensource.com","threadId":"41437","inReplyTo":"1455772670-21142-1-git-send-email-dturner@twopensource.com","subject":"[PATCH v5 11/27] refs: add method to rename refs","fromName":"David Turner","fromEmail":"dturner@twopensource.com","sentAt":"2016-02-18T05:17:34Z","receivedAt":"2016-02-18T05:17:34Z","isPatch":true,"sender":{"key":"novalis@novalis.org","avatar":"https://avatars.githubusercontent.com/u/77003?v=4"},"body":"Signed-off-by: David Turner \n---\n refs.c | 5 +++++\n refs/files-backend.c | 4 +++-\n refs/refs-internal.h | 8 ++++++++\n 3 files changed, 16 insertions(+), 1 deletion(-)\n\ndiff --git a/refs.c b/refs.c\nindex e222d02..f5754f2 100644\n--- a/refs.c\n+++ b/refs.c\n@@ -1303,3 +1303,8 @@ int delete_refs(struct string_list *refnames)\n {\n \treturn the_refs_backend->delete_refs(refnames);\n }\n+\n+int rename_ref(const char *oldref, const char *newref, const char *logmsg)\n+{\n+\treturn the_refs_backend->rename_ref(oldref, newref, logmsg);\n+}\ndiff --git a/refs/files-backend.c b/refs/files-backend.c\nindex 5377e3f..d38acd6 100644\n--- a/refs/files-backend.c\n+++ b/refs/files-backend.c\n@@ -2424,7 +2424,8 @@ static int commit_ref_update(struct ref_lock *lock,\n \t\t\t const unsigned char *sha1, const char *logmsg,\n \t\t\t int flags, struct strbuf *err);\n \n-int rename_ref(const char *oldrefname, const char *newrefname, const char *logmsg)\n+static int files_rename_ref(const char *oldrefname, const char *newrefname,\n+\t\t\t const char *logmsg)\n {\n \tunsigned char sha1[20], orig_sha1[20];\n \tint flag = 0, logmoved = 0;\n@@ -3514,6 +3515,7 @@ struct ref_storage_be refs_be_files = {\n \tfiles_peel_ref,\n \tfiles_create_symref,\n \tfiles_delete_refs,\n+\tfiles_rename_ref,\n \n \tfiles_resolve_ref_unsafe,\n \tfiles_verify_refname_available,\ndiff --git a/refs/refs-internal.h b/refs/refs-internal.h\nindex 94227cf..10a4e4d 100644\n--- a/refs/refs-internal.h\n+++ b/refs/refs-internal.h\n@@ -195,6 +195,11 @@ const char *find_descendant_ref(const char *dirname,\n \t\t\t\tconst struct string_list *extras,\n \t\t\t\tconst struct string_list *skip);\n \n+/*\n+ * Check if the new name does not conflict with any existing refs\n+ * (other than possibly the old ref). Return 0 if the ref can be\n+ * renamed to the new name.\n+ */\n int rename_ref_available(const char *oldname, const char *newname);\n \n /* Include broken references in a do_for_each_ref*() iteration: */\n@@ -244,6 +249,8 @@ typedef int create_symref_fn(const char *ref_target,\n \t\t\t const char *refs_heads_master,\n \t\t\t const char *logmsg);\n typedef int delete_refs_fn(struct string_list *refnames);\n+typedef int rename_ref_fn(const char *oldref, const char *newref,\n+\t\t\t const char *logmsg);\n \n /* resolution methods */\n typedef const char *resolve_ref_unsafe_fn(const char *ref,\n@@ -275,6 +282,7 @@ struct ref_storage_be {\n \tpeel_ref_fn *peel_ref;\n \tcreate_symref_fn *create_symref;\n \tdelete_refs_fn *delete_refs;\n+\trename_ref_fn *rename_ref;\n \n \tresolve_ref_unsafe_fn *resolve_ref_unsafe;\n \tverify_refname_available_fn *verify_refname_available;\n-- \n2.4.2.767.g62658d5-twtrsrc\n"},{"id":"278548","messageId":"1455772670-21142-13-git-send-email-dturner@twopensource.com","threadId":"41437","inReplyTo":"1455772670-21142-1-git-send-email-dturner@twopensource.com","subject":"[PATCH v5 12/27] refs: forbid cross-backend ref renames","fromName":"David Turner","fromEmail":"dturner@twopensource.com","sentAt":"2016-02-18T05:17:35Z","receivedAt":"2016-02-18T05:17:35Z","isPatch":true,"sender":{"key":"novalis@novalis.org","avatar":"https://avatars.githubusercontent.com/u/77003?v=4"},"body":"This would be pretty weird, but since it will break, we should prevent\nit.\n\nSigned-off-by: David Turner \n---\n refs.c | 6 ++++++\n 1 file changed, 6 insertions(+)\n\ndiff --git a/refs.c b/refs.c\nindex f5754f2..8eb04da 100644\n--- a/refs.c\n+++ b/refs.c\n@@ -1306,5 +1306,11 @@ int delete_refs(struct string_list *refnames)\n \n int rename_ref(const char *oldref, const char *newref, const char *logmsg)\n {\n+\tif ((ref_type(oldref) == REF_TYPE_NORMAL) !=\n+\t (ref_type(newref) == REF_TYPE_NORMAL)) {\n+\t\terror(_(\"Both ref arguments to rename_ref must be normal \"\n+\t\t\t\"(or both must be per-worktree/pseudorefs)\"));\n+\t\treturn -1;\n+\t}\n \treturn the_refs_backend->rename_ref(oldref, newref, logmsg);\n }\n-- \n2.4.2.767.g62658d5-twtrsrc\n"},{"id":"278531","messageId":"1455772670-21142-14-git-send-email-dturner@twopensource.com","threadId":"41437","inReplyTo":"1455772670-21142-1-git-send-email-dturner@twopensource.com","subject":"[PATCH v5 13/27] refs: make lock generic","fromName":"David Turner","fromEmail":"dturner@twopensource.com","sentAt":"2016-02-18T05:17:36Z","receivedAt":"2016-02-18T05:17:36Z","isPatch":true,"sender":{"key":"novalis@novalis.org","avatar":"https://avatars.githubusercontent.com/u/77003?v=4"},"body":"Instead of using a files-backend-specific struct ref_lock, the generic\nref_transaction struct should provide a void pointer that backends can use\nfor their own lock data.\n\nSigned-off-by: David Turner \n---\n refs/files-backend.c | 29 ++++++++++++++++-------------\n refs/refs-internal.h | 2 +-\n 2 files changed, 17 insertions(+), 14 deletions(-)\n\ndiff --git a/refs/files-backend.c b/refs/files-backend.c\nindex d38acd6..9011b7c 100644\n--- a/refs/files-backend.c\n+++ b/refs/files-backend.c\n@@ -3130,11 +3130,12 @@ static int files_transaction_commit(struct ref_transaction *transaction,\n \t */\n \tfor (i = 0; i < n; i++) {\n \t\tstruct ref_update *update = updates[i];\n+\t\tstruct ref_lock *lock;\n \n \t\tif ((update->flags & REF_HAVE_NEW) &&\n \t\t is_null_sha1(update->new_sha1))\n \t\t\tupdate->flags |= REF_DELETING;\n-\t\tupdate->lock = lock_ref_sha1_basic(\n+\t\tlock = lock_ref_sha1_basic(\n \t\t\t\tupdate->refname,\n \t\t\t\t((update->flags & REF_HAVE_OLD) ?\n \t\t\t\t update->old_sha1 : NULL),\n@@ -3142,7 +3143,8 @@ static int files_transaction_commit(struct ref_transaction *transaction,\n \t\t\t\tupdate->flags,\n \t\t\t\t&update->type,\n \t\t\t\terr);\n-\t\tif (!update->lock) {\n+\t\tupdate->backend_data = lock;\n+\t\tif (!lock) {\n \t\t\tchar *reason;\n \n \t\t\tret = (errno == ENOTDIR)\n@@ -3160,12 +3162,12 @@ static int files_transaction_commit(struct ref_transaction *transaction,\n \t\t\t\t\t\t (update->flags & REF_NODEREF));\n \n \t\t\tif (!overwriting_symref &&\n-\t\t\t !hashcmp(update->lock->old_oid.hash, update->new_sha1)) {\n+\t\t\t !hashcmp(lock->old_oid.hash, update->new_sha1)) {\n \t\t\t\t/*\n \t\t\t\t * The reference already has the desired\n \t\t\t\t * value, so we don't need to write it.\n \t\t\t\t */\n-\t\t\t} else if (write_ref_to_lockfile(update->lock,\n+\t\t\t} else if (write_ref_to_lockfile(lock,\n \t\t\t\t\t\t\t update->new_sha1,\n \t\t\t\t\t\t\t err)) {\n \t\t\t\tchar *write_err = strbuf_detach(err, NULL);\n@@ -3174,7 +3176,7 @@ static int files_transaction_commit(struct ref_transaction *transaction,\n \t\t\t\t * The lock was freed upon failure of\n \t\t\t\t * write_ref_to_lockfile():\n \t\t\t\t */\n-\t\t\t\tupdate->lock = NULL;\n+\t\t\t\tupdate->backend_data = NULL;\n \t\t\t\tstrbuf_addf(err,\n \t\t\t\t\t \"cannot update the ref '%s': %s\",\n \t\t\t\t\t update->refname, write_err);\n@@ -3190,7 +3192,7 @@ static int files_transaction_commit(struct ref_transaction *transaction,\n \t\t\t * We didn't have to write anything to the lockfile.\n \t\t\t * Close it to free up the file descriptor:\n \t\t\t */\n-\t\t\tif (close_ref(update->lock)) {\n+\t\t\tif (close_ref(lock)) {\n \t\t\t\tstrbuf_addf(err, \"Couldn't close %s.lock\",\n \t\t\t\t\t update->refname);\n \t\t\t\tgoto cleanup;\n@@ -3203,16 +3205,16 @@ static int files_transaction_commit(struct ref_transaction *transaction,\n \t\tstruct ref_update *update = updates[i];\n \n \t\tif (update->flags & REF_NEEDS_COMMIT) {\n-\t\t\tif (commit_ref_update(update->lock,\n+\t\t\tif (commit_ref_update(update->backend_data,\n \t\t\t\t\t update->new_sha1, update->msg,\n \t\t\t\t\t update->flags, err)) {\n \t\t\t\t/* freed by commit_ref_update(): */\n-\t\t\t\tupdate->lock = NULL;\n+\t\t\t\tupdate->backend_data = NULL;\n \t\t\t\tret = TRANSACTION_GENERIC_ERROR;\n \t\t\t\tgoto cleanup;\n \t\t\t} else {\n \t\t\t\t/* freed by commit_ref_update(): */\n-\t\t\t\tupdate->lock = NULL;\n+\t\t\t\tupdate->backend_data = NULL;\n \t\t\t}\n \t\t}\n \t}\n@@ -3220,16 +3222,17 @@ static int files_transaction_commit(struct ref_transaction *transaction,\n \t/* Perform deletes now that updates are safely completed */\n \tfor (i = 0; i < n; i++) {\n \t\tstruct ref_update *update = updates[i];\n+\t\tstruct ref_lock *lock = update->backend_data;\n \n \t\tif (update->flags & REF_DELETING) {\n-\t\t\tif (delete_ref_loose(update->lock, update->type, err)) {\n+\t\t\tif (delete_ref_loose(lock, update->type, err)) {\n \t\t\t\tret = TRANSACTION_GENERIC_ERROR;\n \t\t\t\tgoto cleanup;\n \t\t\t}\n \n \t\t\tif (!(update->flags & REF_ISPRUNING))\n \t\t\t\tstring_list_append(&refs_to_delete,\n-\t\t\t\t\t\t update->lock->ref_name);\n+\t\t\t\t\t\t lock->ref_name);\n \t\t}\n \t}\n \n@@ -3245,8 +3248,8 @@ cleanup:\n \ttransaction->state = REF_TRANSACTION_CLOSED;\n \n \tfor (i = 0; i < n; i++)\n-\t\tif (updates[i]->lock)\n-\t\t\tunlock_ref(updates[i]->lock);\n+\t\tif (updates[i]->backend_data)\n+\t\t\tunlock_ref(updates[i]->backend_data);\n \tstring_list_clear(&refs_to_delete, 0);\n \tstring_list_clear(&affected_refnames, 0);\n \treturn ret;\ndiff --git a/refs/refs-internal.h b/refs/refs-internal.h\nindex 10a4e4d..546183d 100644\n--- a/refs/refs-internal.h\n+++ b/refs/refs-internal.h\n@@ -144,7 +144,7 @@ struct ref_update {\n \t * REF_DELETING, and REF_ISPRUNING:\n \t */\n \tunsigned int flags;\n-\tstruct ref_lock *lock;\n+\tvoid *backend_data;\n \tint type;\n \tchar *msg;\n \tconst char refname[FLEX_ARRAY];\n-- \n2.4.2.767.g62658d5-twtrsrc\n"},{"id":"278539","messageId":"1455772670-21142-15-git-send-email-dturner@twopensource.com","threadId":"41437","inReplyTo":"1455772670-21142-1-git-send-email-dturner@twopensource.com","subject":"[PATCH v5 14/27] refs: move duplicate check to common code","fromName":"David Turner","fromEmail":"dturner@twopensource.com","sentAt":"2016-02-18T05:17:37Z","receivedAt":"2016-02-18T05:17:37Z","isPatch":true,"sender":{"key":"novalis@novalis.org","avatar":"https://avatars.githubusercontent.com/u/77003?v=4"},"body":"The check for duplicate refnames in a transaction is needed for\nall backends, so move it to the common code.\n\nref_transaction_commit_fn gains a new argument, the sorted\nstring_list of affected refnames.\n\nSigned-off-by: David Turner \n---\n refs.c | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++--\n refs/files-backend.c | 57 ++++---------------------------------------\n refs/refs-internal.h | 1 +\n 3 files changed, 73 insertions(+), 54 deletions(-)\n\ndiff --git a/refs.c b/refs.c\nindex 8eb04da..c9fa34d 100644\n--- a/refs.c\n+++ b/refs.c\n@@ -1139,6 +1139,36 @@ int head_ref(each_ref_fn fn, void *cb_data)\n \treturn head_ref_submodule(NULL, fn, cb_data);\n }\n \n+/*\n+ * Return 1 if there are any duplicate refnames in the updates in\n+ * `transaction`, and fill in err with an appropriate error message.\n+ * Fill in `refnames` with the refnames from the transaction.\n+ */\n+static int get_affected_refnames(struct ref_transaction *transaction,\n+\t\t\t\t struct string_list *refnames,\n+\t\t\t\t struct strbuf *err)\n+{\n+\tint i, n = transaction->nr;\n+\tstruct ref_update **updates;\n+\n+\tassert(err);\n+\n+\tupdates = transaction->updates;\n+\t/* Fail if a refname appears more than once in the transaction: */\n+\tfor (i = 0; i < n; i++)\n+\t\tstring_list_append(refnames, updates[i]->refname);\n+\tstring_list_sort(refnames);\n+\n+\tfor (i = 1; i < n; i++)\n+\t\tif (!strcmp(refnames->items[i - 1].string, refnames->items[i].string)) {\n+\t\t\tstrbuf_addf(err,\n+\t\t\t\t \"Multiple updates for ref '%s' not allowed.\",\n+\t\t\t\t refnames->items[i].string);\n+\t\t\treturn 1;\n+\t\t}\n+\treturn 0;\n+}\n+\n int for_each_ref(each_ref_fn fn, void *cb_data)\n {\n \treturn do_for_each_ref(NULL, \"\", fn, 0, 0, cb_data);\n@@ -1200,7 +1230,29 @@ int refs_init_db(int shared, struct strbuf *err)\n int ref_transaction_commit(struct ref_transaction *transaction,\n \t\t\t struct strbuf *err)\n {\n-\treturn the_refs_backend->transaction_commit(transaction, err);\n+\tint ret = -1;\n+\tstruct string_list affected_refnames = STRING_LIST_INIT_NODUP;\n+\n+\tassert(err);\n+\n+\tif (transaction->state != REF_TRANSACTION_OPEN)\n+\t\tdie(\"BUG: commit called for transaction that is not open\");\n+\n+\tif (!transaction->nr) {\n+\t\ttransaction->state = REF_TRANSACTION_CLOSED;\n+\t\treturn 0;\n+\t}\n+\n+\tif (get_affected_refnames(transaction, &affected_refnames, err)) {\n+\t\tret = TRANSACTION_GENERIC_ERROR;\n+\t\tgoto done;\n+\t}\n+\n+\tret = the_refs_backend->transaction_commit(transaction,\n+\t\t\t\t\t\t &affected_refnames, err);\n+done:\n+\tstring_list_clear(&affected_refnames, 0);\n+\treturn ret;\n }\n \n const char *resolve_ref_unsafe(const char *ref, int resolve_flags,\n@@ -1296,7 +1348,20 @@ int reflog_expire(const char *refname, const unsigned char *sha1,\n int initial_ref_transaction_commit(struct ref_transaction *transaction,\n \t\t\t\t struct strbuf *err)\n {\n-\treturn the_refs_backend->initial_transaction_commit(transaction, err);\n+\tstruct string_list affected_refnames = STRING_LIST_INIT_NODUP;\n+\tint ret;\n+\n+\tif (get_affected_refnames(transaction,\n+\t\t\t\t &affected_refnames, err)) {\n+\t\tret = TRANSACTION_GENERIC_ERROR;\n+\t\tgoto done;\n+\t}\n+\tret = the_refs_backend->initial_transaction_commit(transaction,\n+\t\t\t\t\t\t\t &affected_refnames,\n+\t\t\t\t\t\t\t err);\n+done:\n+\tstring_list_clear(&affected_refnames, 0);\n+\treturn ret;\n }\n \n int delete_refs(struct string_list *refnames)\ndiff --git a/refs/files-backend.c b/refs/files-backend.c\nindex 9011b7c..da06408 100644\n--- a/refs/files-backend.c\n+++ b/refs/files-backend.c\n@@ -3076,24 +3076,8 @@ static int files_for_each_reflog(each_ref_fn fn, void *cb_data)\n \treturn retval;\n }\n \n-static int ref_update_reject_duplicates(struct string_list *refnames,\n-\t\t\t\t\tstruct strbuf *err)\n-{\n-\tint i, n = refnames->nr;\n-\n-\tassert(err);\n-\n-\tfor (i = 1; i < n; i++)\n-\t\tif (!strcmp(refnames->items[i - 1].string, refnames->items[i].string)) {\n-\t\t\tstrbuf_addf(err,\n-\t\t\t\t \"Multiple updates for ref '%s' not allowed.\",\n-\t\t\t\t refnames->items[i].string);\n-\t\t\treturn 1;\n-\t\t}\n-\treturn 0;\n-}\n-\n static int files_transaction_commit(struct ref_transaction *transaction,\n+\t\t\t\t struct string_list *affected_refnames,\n \t\t\t\t struct strbuf *err)\n {\n \tint ret = 0, i;\n@@ -3101,26 +3085,6 @@ static int files_transaction_commit(struct ref_transaction *transaction,\n \tstruct ref_update **updates = transaction->updates;\n \tstruct string_list refs_to_delete = STRING_LIST_INIT_NODUP;\n \tstruct string_list_item *ref_to_delete;\n-\tstruct string_list affected_refnames = STRING_LIST_INIT_NODUP;\n-\n-\tassert(err);\n-\n-\tif (transaction->state != REF_TRANSACTION_OPEN)\n-\t\tdie(\"BUG: commit called for transaction that is not open\");\n-\n-\tif (!n) {\n-\t\ttransaction->state = REF_TRANSACTION_CLOSED;\n-\t\treturn 0;\n-\t}\n-\n-\t/* Fail if a refname appears more than once in the transaction: */\n-\tfor (i = 0; i < n; i++)\n-\t\tstring_list_append(&affected_refnames, updates[i]->refname);\n-\tstring_list_sort(&affected_refnames);\n-\tif (ref_update_reject_duplicates(&affected_refnames, err)) {\n-\t\tret = TRANSACTION_GENERIC_ERROR;\n-\t\tgoto cleanup;\n-\t}\n \n \t/*\n \t * Acquire all locks, verify old values if provided, check\n@@ -3139,7 +3103,7 @@ static int files_transaction_commit(struct ref_transaction *transaction,\n \t\t\t\tupdate->refname,\n \t\t\t\t((update->flags & REF_HAVE_OLD) ?\n \t\t\t\t update->old_sha1 : NULL),\n-\t\t\t\t&affected_refnames, NULL,\n+\t\t\t\taffected_refnames, NULL,\n \t\t\t\tupdate->flags,\n \t\t\t\t&update->type,\n \t\t\t\terr);\n@@ -3251,7 +3215,6 @@ cleanup:\n \t\tif (updates[i]->backend_data)\n \t\t\tunlock_ref(updates[i]->backend_data);\n \tstring_list_clear(&refs_to_delete, 0);\n-\tstring_list_clear(&affected_refnames, 0);\n \treturn ret;\n }\n \n@@ -3264,27 +3227,18 @@ static int ref_present(const char *refname,\n }\n \n static int files_initial_transaction_commit(struct ref_transaction *transaction,\n+\t\t\t\t\t struct string_list *affected_refnames,\n \t\t\t\t\t struct strbuf *err)\n {\n \tint ret = 0, i;\n \tint n = transaction->nr;\n \tstruct ref_update **updates = transaction->updates;\n-\tstruct string_list affected_refnames = STRING_LIST_INIT_NODUP;\n \n \tassert(err);\n \n \tif (transaction->state != REF_TRANSACTION_OPEN)\n \t\tdie(\"BUG: commit called for transaction that is not open\");\n \n-\t/* Fail if a refname appears more than once in the transaction: */\n-\tfor (i = 0; i < n; i++)\n-\t\tstring_list_append(&affected_refnames, updates[i]->refname);\n-\tstring_list_sort(&affected_refnames);\n-\tif (ref_update_reject_duplicates(&affected_refnames, err)) {\n-\t\tret = TRANSACTION_GENERIC_ERROR;\n-\t\tgoto cleanup;\n-\t}\n-\n \t/*\n \t * It's really undefined to call this function in an active\n \t * repository or when there are existing references: we are\n@@ -3297,7 +3251,7 @@ static int files_initial_transaction_commit(struct ref_transaction *transaction,\n \t * so here we really only check that none of the references\n \t * that we are creating already exists.\n \t */\n-\tif (for_each_rawref(ref_present, &affected_refnames))\n+\tif (for_each_rawref(ref_present, affected_refnames))\n \t\tdie(\"BUG: initial ref transaction called with existing refs\");\n \n \tfor (i = 0; i < n; i++) {\n@@ -3307,7 +3261,7 @@ static int files_initial_transaction_commit(struct ref_transaction *transaction,\n \t\t !is_null_sha1(update->old_sha1))\n \t\t\tdie(\"BUG: initial ref transaction with old_sha1 set\");\n \t\tif (verify_refname_available(update->refname,\n-\t\t\t\t\t &affected_refnames, NULL,\n+\t\t\t\t\t affected_refnames, NULL,\n \t\t\t\t\t err)) {\n \t\t\tret = TRANSACTION_NAME_CONFLICT;\n \t\t\tgoto cleanup;\n@@ -3338,7 +3292,6 @@ static int files_initial_transaction_commit(struct ref_transaction *transaction,\n \n cleanup:\n \ttransaction->state = REF_TRANSACTION_CLOSED;\n-\tstring_list_clear(&affected_refnames, 0);\n \treturn ret;\n }\n \ndiff --git a/refs/refs-internal.h b/refs/refs-internal.h\nindex 546183d..efdde82 100644\n--- a/refs/refs-internal.h\n+++ b/refs/refs-internal.h\n@@ -221,6 +221,7 @@ int do_for_each_ref(const char *submodule, const char *base,\n /* refs backends */\n typedef int ref_init_db_fn(int shared, struct strbuf *err);\n typedef int ref_transaction_commit_fn(struct ref_transaction *transaction,\n+\t\t\t\t struct string_list *affected_refnames,\n \t\t\t\t struct strbuf *err);\n \n /* reflog functions */\n-- \n2.4.2.767.g62658d5-twtrsrc\n"},{"id":"278535","messageId":"1455772670-21142-16-git-send-email-dturner@twopensource.com","threadId":"41437","inReplyTo":"1455772670-21142-1-git-send-email-dturner@twopensource.com","subject":"[PATCH v5 15/27] refs: allow log-only updates","fromName":"David Turner","fromEmail":"dturner@twopensource.com","sentAt":"2016-02-18T05:17:38Z","receivedAt":"2016-02-18T05:17:38Z","isPatch":true,"sender":{"key":"novalis@novalis.org","avatar":"https://avatars.githubusercontent.com/u/77003?v=4"},"body":"The refs infrastructure learns about log-only ref updates, which only\nupdate the reflog. Later, we will use this to separate symbolic\nreference resolution from ref updating.\n\nSigned-off-by: David Turner \n---\n refs/files-backend.c | 15 ++++++++++-----\n refs/refs-internal.h | 7 +++++++\n 2 files changed, 17 insertions(+), 5 deletions(-)\n\ndiff --git a/refs/files-backend.c b/refs/files-backend.c\nindex da06408..592d0ff 100644\n--- a/refs/files-backend.c\n+++ b/refs/files-backend.c\n@@ -2767,7 +2767,7 @@ static int commit_ref_update(struct ref_lock *lock,\n \t\t\t}\n \t\t}\n \t}\n-\tif (commit_ref(lock)) {\n+\tif (!(flags & REF_LOG_ONLY) && commit_ref(lock)) {\n \t\terror(\"Couldn't set %s\", lock->ref_name);\n \t\tunlock_ref(lock);\n \t\treturn -1;\n@@ -3121,7 +3121,8 @@ static int files_transaction_commit(struct ref_transaction *transaction,\n \t\t\tgoto cleanup;\n \t\t}\n \t\tif ((update->flags & REF_HAVE_NEW) &&\n-\t\t !(update->flags & REF_DELETING)) {\n+\t\t !(update->flags & REF_DELETING) &&\n+\t\t !(update->flags & REF_LOG_ONLY)) {\n \t\t\tint overwriting_symref = ((update->type & REF_ISSYMREF) &&\n \t\t\t\t\t\t (update->flags & REF_NODEREF));\n \n@@ -3151,7 +3152,9 @@ static int files_transaction_commit(struct ref_transaction *transaction,\n \t\t\t\tupdate->flags |= REF_NEEDS_COMMIT;\n \t\t\t}\n \t\t}\n-\t\tif (!(update->flags & REF_NEEDS_COMMIT)) {\n+\n+\t\tif (!(update->flags & REF_LOG_ONLY) &&\n+\t\t !(update->flags & REF_NEEDS_COMMIT)) {\n \t\t\t/*\n \t\t\t * We didn't have to write anything to the lockfile.\n \t\t\t * Close it to free up the file descriptor:\n@@ -3168,7 +3171,8 @@ static int files_transaction_commit(struct ref_transaction *transaction,\n \tfor (i = 0; i < n; i++) {\n \t\tstruct ref_update *update = updates[i];\n \n-\t\tif (update->flags & REF_NEEDS_COMMIT) {\n+\t\tif (update->flags & REF_NEEDS_COMMIT ||\n+\t\t update->flags & REF_LOG_ONLY) {\n \t\t\tif (commit_ref_update(update->backend_data,\n \t\t\t\t\t update->new_sha1, update->msg,\n \t\t\t\t\t update->flags, err)) {\n@@ -3188,7 +3192,8 @@ static int files_transaction_commit(struct ref_transaction *transaction,\n \t\tstruct ref_update *update = updates[i];\n \t\tstruct ref_lock *lock = update->backend_data;\n \n-\t\tif (update->flags & REF_DELETING) {\n+\t\tif (update->flags & REF_DELETING &&\n+\t\t !(update->flags & REF_LOG_ONLY)) {\n \t\t\tif (delete_ref_loose(lock, update->type, err)) {\n \t\t\t\tret = TRANSACTION_GENERIC_ERROR;\n \t\t\t\tgoto cleanup;\ndiff --git a/refs/refs-internal.h b/refs/refs-internal.h\nindex efdde82..283f71f 100644\n--- a/refs/refs-internal.h\n+++ b/refs/refs-internal.h\n@@ -43,6 +43,13 @@\n */\n \n /*\n+ * Used as a flag in ref_update::flags when we want to log a ref\n+ * update but not actually perform it. This is used when a symbolic\n+ * ref update is split up.\n+ */\n+#define REF_LOG_ONLY 0x80\n+\n+/*\n * Return true iff refname is minimally safe. \"Safe\" here means that\n * deleting a loose reference by this name will not do any damage, for\n * example by causing a file that is not a reference to be deleted.\n-- \n2.4.2.767.g62658d5-twtrsrc\n"},{"id":"278538","messageId":"1455772670-21142-17-git-send-email-dturner@twopensource.com","threadId":"41437","inReplyTo":"1455772670-21142-1-git-send-email-dturner@twopensource.com","subject":"[PATCH v5 16/27] refs: don't dereference on rename","fromName":"David Turner","fromEmail":"dturner@twopensource.com","sentAt":"2016-02-18T05:17:39Z","receivedAt":"2016-02-18T05:17:39Z","isPatch":true,"sender":{"key":"novalis@novalis.org","avatar":"https://avatars.githubusercontent.com/u/77003?v=4"},"body":"When renaming refs, don't dereference either the origin or the destination\nbefore renaming.\n\nThe origin does not need to be dereferenced because it is presently\nforbidden to rename symbolic refs.\n\nNot dereferencing the destination fixes a bug where renaming on top of\na broken symref would use the pointed-to ref name for the moved\nreflog.\n\nAdd a test for the reflog bug.\n\nSigned-off-by: David Turner \n---\n refs/files-backend.c | 15 +++++++++------\n t/t3200-branch.sh | 9 +++++++++\n 2 files changed, 18 insertions(+), 6 deletions(-)\n\ndiff --git a/refs/files-backend.c b/refs/files-backend.c\nindex 592d0ff..4863b21 100644\n--- a/refs/files-backend.c\n+++ b/refs/files-backend.c\n@@ -2428,7 +2428,7 @@ static int files_rename_ref(const char *oldrefname, const char *newrefname,\n \t\t\t const char *logmsg)\n {\n \tunsigned char sha1[20], orig_sha1[20];\n-\tint flag = 0, logmoved = 0;\n+\tint flag = 0, logmoved = 0, resolve_flags;\n \tstruct ref_lock *lock;\n \tstruct stat loginfo;\n \tint log = !lstat(git_path(\"logs/%s\", oldrefname), &loginfo);\n@@ -2438,7 +2438,8 @@ static int files_rename_ref(const char *oldrefname, const char *newrefname,\n \tif (log && S_ISLNK(loginfo.st_mode))\n \t\treturn error(\"reflog for %s is a symlink\", oldrefname);\n \n-\tsymref = resolve_ref_unsafe(oldrefname, RESOLVE_REF_READING,\n+\tresolve_flags = RESOLVE_REF_READING | RESOLVE_REF_NO_RECURSE;\n+\tsymref = resolve_ref_unsafe(oldrefname, resolve_flags,\n \t\t\t\t orig_sha1, &flag);\n \tif (flag & REF_ISSYMREF)\n \t\treturn error(\"refname %s is a symbolic ref, renaming it is not supported\",\n@@ -2458,8 +2459,8 @@ static int files_rename_ref(const char *oldrefname, const char *newrefname,\n \t\tgoto rollback;\n \t}\n \n-\tif (!read_ref_full(newrefname, RESOLVE_REF_READING, sha1, NULL) &&\n-\t delete_ref(newrefname, sha1, REF_NODEREF)) {\n+\tif (!read_ref_full(newrefname, resolve_flags, sha1, NULL) &&\n+\t delete_ref(newrefname, NULL, REF_NODEREF)) {\n \t\tif (errno==EISDIR) {\n \t\t\tstruct strbuf path = STRBUF_INIT;\n \t\t\tint result;\n@@ -2483,7 +2484,8 @@ static int files_rename_ref(const char *oldrefname, const char *newrefname,\n \n \tlogmoved = log;\n \n-\tlock = lock_ref_sha1_basic(newrefname, NULL, NULL, NULL, 0, NULL, &err);\n+\tlock = lock_ref_sha1_basic(newrefname, NULL, NULL, NULL, REF_NODEREF,\n+\t\t\t\t NULL, &err);\n \tif (!lock) {\n \t\terror(\"unable to rename '%s' to '%s': %s\", oldrefname, newrefname, err.buf);\n \t\tstrbuf_release(&err);\n@@ -2501,7 +2503,8 @@ static int files_rename_ref(const char *oldrefname, const char *newrefname,\n \treturn 0;\n \n rollback:\n-\tlock = lock_ref_sha1_basic(oldrefname, NULL, NULL, NULL, 0, NULL, &err);\n+\tlock = lock_ref_sha1_basic(oldrefname, NULL, NULL, NULL, REF_NODEREF,\n+\t\t\t\t NULL, &err);\n \tif (!lock) {\n \t\terror(\"unable to lock %s for rollback: %s\", oldrefname, err.buf);\n \t\tstrbuf_release(&err);\ndiff --git a/t/t3200-branch.sh b/t/t3200-branch.sh\nindex cdaf6f6..07e9749 100755\n--- a/t/t3200-branch.sh\n+++ b/t/t3200-branch.sh\n@@ -79,6 +79,15 @@ test_expect_success 'git branch -m dumps usage' '\n \ttest_i18ngrep \"branch name required\" err\n '\n \n+test_expect_success 'git branch -m m broken_symref should work' '\n+\ttest_when_finished \"git branch -D broken_symref\" &&\n+\tgit branch -l m &&\n+\tgit symbolic-ref refs/heads/broken_symref refs/heads/i_am_broken &&\n+\tgit branch -m m broken_symref &&\n+\tgit reflog exists refs/heads/broken_symref &&\n+\ttest_must_fail git reflog exists refs/heads/i_am_broken\n+'\n+\n test_expect_success 'git branch -m m m/m should work' '\n \tgit branch -l m &&\n \tgit branch -m m m/m &&\n-- \n2.4.2.767.g62658d5-twtrsrc\n"},{"id":"278537","messageId":"1455772670-21142-18-git-send-email-dturner@twopensource.com","threadId":"41437","inReplyTo":"1455772670-21142-1-git-send-email-dturner@twopensource.com","subject":"[PATCH v5 17/27] refs: on symref reflog expire, lock symref not referrent","fromName":"David Turner","fromEmail":"dturner@twopensource.com","sentAt":"2016-02-18T05:17:40Z","receivedAt":"2016-02-18T05:17:40Z","isPatch":true,"sender":{"key":"novalis@novalis.org","avatar":"https://avatars.githubusercontent.com/u/77003?v=4"},"body":"When locking a symbolic ref to expire a reflog, lock the symbolic\nref (using REF_NODEREF) instead of its referent.\n\nAdd a test for this.\n\nSigned-off-by: David Turner \n---\n refs/files-backend.c | 3 ++-\n t/t1410-reflog.sh | 10 ++++++++++\n 2 files changed, 12 insertions(+), 1 deletion(-)\n\ndiff --git a/refs/files-backend.c b/refs/files-backend.c\nindex 4863b21..42f2d5b 100644\n--- a/refs/files-backend.c\n+++ b/refs/files-backend.c\n@@ -3365,7 +3365,8 @@ static int files_reflog_expire(const char *refname, const unsigned char *sha1,\n \t * reference itself, plus we might need to update the\n \t * reference if --updateref was specified:\n \t */\n-\tlock = lock_ref_sha1_basic(refname, sha1, NULL, NULL, 0, &type, &err);\n+\tlock = lock_ref_sha1_basic(refname, sha1, NULL, NULL, REF_NODEREF,\n+\t\t\t\t &type, &err);\n \tif (!lock) {\n \t\terror(\"cannot lock ref '%s': %s\", refname, err.buf);\n \t\tstrbuf_release(&err);\ndiff --git a/t/t1410-reflog.sh b/t/t1410-reflog.sh\nindex c623824..9cf91dc 100755\n--- a/t/t1410-reflog.sh\n+++ b/t/t1410-reflog.sh\n@@ -338,4 +338,14 @@ test_expect_failure 'reflog with non-commit entries displays all entries' '\n \ttest_line_count = 3 actual\n '\n \n+test_expect_success 'reflog expire operates on symref not referrent' '\n+\tgit branch -l the_symref &&\n+\tgit branch -l referrent &&\n+\tgit update-ref referrent HEAD &&\n+\tgit symbolic-ref refs/heads/the_symref refs/heads/referrent &&\n+\ttest_when_finished \"rm -f .git/refs/heads/referrent.lock\" &&\n+\ttouch .git/refs/heads/referrent.lock &&\n+\tgit reflog expire --expire=all the_symref\n+'\n+\n test_done\n-- \n2.4.2.767.g62658d5-twtrsrc\n"},{"id":"278544","messageId":"1455772670-21142-19-git-send-email-dturner@twopensource.com","threadId":"41437","inReplyTo":"1455772670-21142-1-git-send-email-dturner@twopensource.com","subject":"[PATCH v5 18/27] refs: resolve symbolic refs first","fromName":"David Turner","fromEmail":"dturner@twopensource.com","sentAt":"2016-02-18T05:17:41Z","receivedAt":"2016-02-18T05:17:41Z","isPatch":true,"sender":{"key":"novalis@novalis.org","avatar":"https://avatars.githubusercontent.com/u/77003?v=4"},"body":"Before committing ref updates, split symbolic ref updates into two\nparts: an update to the underlying ref, and a log-only update to the\nsymbolic ref. This ensures that both references are locked correctly\nwhile their reflogs are updated.\n\nIt is still possible to confuse git by concurrent updates, since the\nsplitting of symbolic refs does not happen under lock. So a symbolic ref\ncould be replaced by a plain ref in the middle of this operation, which\nwould lead to reflog discontinuities and missed old-ref checks.\n\nAll callers to lock_ref_sha1_basic outside of ref_transaction_commit\nnow set REF_NODEREF. And ref_transaction_commit only happens on\nalready-derefernced refs. So we can assume REF_NODEREF when resolving\ninside this function.\n\nSigned-off-by: David Turner \n---\n refs.c | 69 ++++++++++++++++++++++++++\n refs/files-backend.c | 137 ++++++++++++++++++++++++++-------------------------\n refs/refs-internal.h | 8 +++\n 3 files changed, 148 insertions(+), 66 deletions(-)\n\ndiff --git a/refs.c b/refs.c\nindex c9fa34d..01cf6c3 100644\n--- a/refs.c\n+++ b/refs.c\n@@ -1227,6 +1227,71 @@ int refs_init_db(int shared, struct strbuf *err)\n \treturn the_refs_backend->init_db(shared, err);\n }\n \n+/*\n+ * Special case for symbolic refs when REF_NODEREF is not turned on.\n+ * Dereference them here, mark them REF_LOG_ONLY, and add an update\n+ * for the underlying ref.\n+ */\n+static int dereference_symrefs(struct ref_transaction *transaction,\n+\t\t\t struct strbuf *err)\n+{\n+\tint i;\n+\tint nr = transaction->nr;\n+\n+\tfor (i = 0; i < nr; i++) {\n+\t\tstruct ref_update *update = transaction->updates[i];\n+\t\tconst char *resolved;\n+\t\tunsigned char sha1[20];\n+\t\tint resolve_flags = 0;\n+\t\tint mustexist = update->flags & REF_HAVE_OLD &&\n+\t\t\t!is_null_sha1(update->old_sha1);\n+\t\tint deleting = (update->flags & REF_HAVE_NEW) &&\n+\t\t\tis_null_sha1(update->new_sha1);\n+\n+\t\tif (mustexist)\n+\t\t\tresolve_flags |= RESOLVE_REF_READING;\n+\t\tif (deleting)\n+\t\t\tresolve_flags |= RESOLVE_REF_ALLOW_BAD_NAME |\n+\t\t\t\tRESOLVE_REF_NO_RECURSE;\n+\n+\t\tif (strcmp(update->refname, \"HEAD\"))\n+\t\t\tupdate->flags |= REF_IS_NOT_HEAD;\n+\n+\t\tresolved = resolve_ref_unsafe(update->refname, resolve_flags,\n+\t\t\t\t\t sha1, &update->type);\n+\t\tif (!resolved) {\n+\t\t\t/*\n+\t\t\t * We may notice this breakage later and die\n+\t\t\t * with a sensible error message\n+\t\t\t */\n+\t\t\tupdate->type |= REF_ISBROKEN;\n+\t\t\tcontinue;\n+\t\t}\n+\n+\t\thashcpy(update->read_sha1, sha1);\n+\n+\t\tif (update->flags & REF_NODEREF ||\n+\t\t !(update->type & REF_ISSYMREF))\n+\t\t\tcontinue;\n+\n+\t\t/* Create a new transaction for the underlying ref */\n+\t\tif (ref_transaction_update(transaction,\n+\t\t\t\t\t resolved,\n+\t\t\t\t\t update->new_sha1,\n+\t\t\t\t\t (update->flags & REF_HAVE_OLD) ?\n+\t\t\t\t\t update->old_sha1 : NULL,\n+\t\t\t\t\t update->flags & ~REF_IS_NOT_HEAD,\n+\t\t\t\t\t update->msg, err))\n+\t\t\treturn -1;\n+\n+\t\t/* Make the symbolic ref update non-recursive */\n+\t\tupdate->flags |= REF_LOG_ONLY | REF_NODEREF;\n+\t\tupdate->flags &= ~REF_HAVE_OLD;\n+\t}\n+\n+\treturn 0;\n+}\n+\n int ref_transaction_commit(struct ref_transaction *transaction,\n \t\t\t struct strbuf *err)\n {\n@@ -1243,6 +1308,10 @@ int ref_transaction_commit(struct ref_transaction *transaction,\n \t\treturn 0;\n \t}\n \n+\tret = dereference_symrefs(transaction, err);\n+\tif (ret)\n+\t\tgoto done;\n+\n \tif (get_affected_refnames(transaction, &affected_refnames, err)) {\n \t\tret = TRANSACTION_GENERIC_ERROR;\n \t\tgoto done;\ndiff --git a/refs/files-backend.c b/refs/files-backend.c\nindex 42f2d5b..b3cca8e 100644\n--- a/refs/files-backend.c\n+++ b/refs/files-backend.c\n@@ -7,7 +7,6 @@\n \n struct ref_lock {\n \tchar *ref_name;\n-\tchar *orig_ref_name;\n \tstruct lock_file *lk;\n \tstruct object_id old_oid;\n };\n@@ -1779,7 +1778,6 @@ static void unlock_ref(struct ref_lock *lock)\n \tif (lock->lk)\n \t\trollback_lock_file(lock->lk);\n \tfree(lock->ref_name);\n-\tfree(lock->orig_ref_name);\n \tfree(lock);\n }\n \n@@ -1835,6 +1833,7 @@ static int remove_empty_directories(struct strbuf *path)\n */\n static struct ref_lock *lock_ref_sha1_basic(const char *refname,\n \t\t\t\t\t const unsigned char *old_sha1,\n+\t\t\t\t\t const unsigned char *read_sha1,\n \t\t\t\t\t const struct string_list *extras,\n \t\t\t\t\t const struct string_list *skip,\n \t\t\t\t\t unsigned int flags, int *type_p,\n@@ -1842,14 +1841,14 @@ static struct ref_lock *lock_ref_sha1_basic(const char *refname,\n {\n \tstruct strbuf ref_file = STRBUF_INIT;\n \tstruct strbuf orig_ref_file = STRBUF_INIT;\n-\tconst char *orig_refname = refname;\n \tstruct ref_lock *lock;\n \tint last_errno = 0;\n \tint type;\n \tint lflags = 0;\n \tint mustexist = (old_sha1 && !is_null_sha1(old_sha1));\n-\tint resolve_flags = 0;\n+\tint resolve_flags = RESOLVE_REF_NO_RECURSE;\n \tint attempts_remaining = 3;\n+\tint resolved;\n \n \tassert(err);\n \n@@ -1859,65 +1858,65 @@ static struct ref_lock *lock_ref_sha1_basic(const char *refname,\n \t\tresolve_flags |= RESOLVE_REF_READING;\n \tif (flags & REF_DELETING)\n \t\tresolve_flags |= RESOLVE_REF_ALLOW_BAD_NAME;\n-\tif (flags & REF_NODEREF) {\n-\t\tresolve_flags |= RESOLVE_REF_NO_RECURSE;\n+\tif (flags & REF_NODEREF)\n \t\tlflags |= LOCK_NO_DEREF;\n-\t}\n \n-\trefname = resolve_ref_unsafe(refname, resolve_flags,\n-\t\t\t\t lock->old_oid.hash, &type);\n-\tif (!refname && errno == EISDIR) {\n-\t\t/*\n-\t\t * we are trying to lock foo but we used to\n-\t\t * have foo/bar which now does not exist;\n-\t\t * it is normal for the empty directory 'foo'\n-\t\t * to remain.\n-\t\t */\n-\t\tstrbuf_git_path(&orig_ref_file, \"%s\", orig_refname);\n-\t\tif (remove_empty_directories(&orig_ref_file)) {\n+\tif (type_p && *type_p & REF_ISSYMREF) {\n+\t\thashcpy(lock->old_oid.hash, read_sha1);\n+\t} else {\n+\t\tresolved = !!resolve_ref_unsafe(refname, resolve_flags,\n+\t\t\t\t\t\tlock->old_oid.hash, &type);\n+\t\tif (!resolved && errno == EISDIR) {\n+\t\t\t/*\n+\t\t\t * we are trying to lock foo but we used to\n+\t\t\t * have foo/bar which now does not exist;\n+\t\t\t * it is normal for the empty directory 'foo'\n+\t\t\t * to remain.\n+\t\t\t */\n+\t\t\tstrbuf_git_path(&orig_ref_file, \"%s\", refname);\n+\t\t\tif (remove_empty_directories(&orig_ref_file)) {\n+\t\t\t\tstruct ref_dir *loose_refs;\n+\t\t\t\tloose_refs = get_loose_refs(&ref_cache);\n+\t\t\t\tlast_errno = errno;\n+\t\t\t\tif (!verify_refname_available_dir(refname, extras, skip,\n+\t\t\t\t\t\t\t\t loose_refs, err))\n+\t\t\t\t\tstrbuf_addf(err, \"there are still refs under '%s'\",\n+\t\t\t\t\t\t refname);\n+\t\t\t\tgoto error_return;\n+\t\t\t}\n+\t\t\tresolved = !!resolve_ref_unsafe(refname, resolve_flags,\n+\t\t\t\t\t\t\tlock->old_oid.hash, &type);\n+\t\t}\n+\n+\t\tif (type_p)\n+\t\t\t*type_p = type;\n+\t\tif (!resolved) {\n \t\t\tlast_errno = errno;\n-\t\t\tif (!verify_refname_available_dir(orig_refname, extras, skip,\n+\t\t\tif (last_errno != ENOTDIR ||\n+\t\t\t !verify_refname_available_dir(refname, extras, skip,\n \t\t\t\t\t\t\t get_loose_refs(&ref_cache), err))\n-\t\t\t\tstrbuf_addf(err, \"there are still refs under '%s'\",\n-\t\t\t\t\t orig_refname);\n+\t\t\t\tstrbuf_addf(err,\n+\t\t\t\t\t \"unable to resolve reference %s: %s\",\n+\t\t\t\t\t refname, strerror(last_errno));\n+\n+\t\t\tgoto error_return;\n+\t\t}\n+\t\t/*\n+\t\t * If the ref did not exist and we are creating it, make sure\n+\t\t * there is no existing packed ref whose name begins with our\n+\t\t * refname, nor a packed ref whose name is a proper prefix of\n+\t\t * our refname.\n+\t\t */\n+\t\tif (is_null_oid(&lock->old_oid) &&\n+\t\t verify_refname_available_dir(refname, extras, skip,\n+\t\t\t\t\t\t get_packed_refs(&ref_cache), err)) {\n+\t\t\tlast_errno = ENOTDIR;\n \t\t\tgoto error_return;\n \t\t}\n-\t\trefname = resolve_ref_unsafe(orig_refname, resolve_flags,\n-\t\t\t\t\t lock->old_oid.hash, &type);\n-\t}\n-\tif (type_p)\n-\t *type_p = type;\n-\tif (!refname) {\n-\t\tlast_errno = errno;\n-\t\tif (last_errno != ENOTDIR ||\n-\t\t !verify_refname_available_dir(orig_refname, extras, skip,\n-\t\t\t\t\t\t get_loose_refs(&ref_cache), err))\n-\t\t\tstrbuf_addf(err, \"unable to resolve reference %s: %s\",\n-\t\t\t\t orig_refname, strerror(last_errno));\n-\n-\t\tgoto error_return;\n-\t}\n-\n-\tif (flags & REF_NODEREF)\n-\t\trefname = orig_refname;\n-\n-\t/*\n-\t * If the ref did not exist and we are creating it, make sure\n-\t * there is no existing packed ref whose name begins with our\n-\t * refname, nor a packed ref whose name is a proper prefix of\n-\t * our refname.\n-\t */\n-\tif (is_null_oid(&lock->old_oid) &&\n-\t verify_refname_available_dir(refname, extras, skip,\n-\t\t\t\t\t get_packed_refs(&ref_cache), err)) {\n-\t\tlast_errno = ENOTDIR;\n-\t\tgoto error_return;\n \t}\n-\n \tlock->lk = xcalloc(1, sizeof(struct lock_file));\n \n \tlock->ref_name = xstrdup(refname);\n-\tlock->orig_ref_name = xstrdup(orig_refname);\n \tstrbuf_git_path(&ref_file, \"%s\", refname);\n \n retry:\n@@ -1949,7 +1948,13 @@ static struct ref_lock *lock_ref_sha1_basic(const char *refname,\n \t\t\tgoto error_return;\n \t\t}\n \t}\n-\tif (verify_lock(lock, old_sha1, mustexist, err)) {\n+\n+\tif (type_p && *type_p & REF_ISSYMREF && !(*type_p & REF_ISBROKEN)) {\n+\t\t/*\n+\t\t * Old hash verification for symrefs happens on their\n+\t\t * base ref.\n+\t\t */\n+\t} else if (verify_lock(lock, old_sha1, mustexist, err)) {\n \t\tlast_errno = errno;\n \t\tgoto error_return;\n \t}\n@@ -2484,8 +2489,8 @@ static int files_rename_ref(const char *oldrefname, const char *newrefname,\n \n \tlogmoved = log;\n \n-\tlock = lock_ref_sha1_basic(newrefname, NULL, NULL, NULL, REF_NODEREF,\n-\t\t\t\t NULL, &err);\n+\tlock = lock_ref_sha1_basic(newrefname, NULL, NULL, NULL, NULL,\n+\t\t\t\t REF_NODEREF, NULL, &err);\n \tif (!lock) {\n \t\terror(\"unable to rename '%s' to '%s': %s\", oldrefname, newrefname, err.buf);\n \t\tstrbuf_release(&err);\n@@ -2503,8 +2508,9 @@ static int files_rename_ref(const char *oldrefname, const char *newrefname,\n \treturn 0;\n \n rollback:\n-\tlock = lock_ref_sha1_basic(oldrefname, NULL, NULL, NULL, REF_NODEREF,\n-\t\t\t\t NULL, &err);\n+\tlock = lock_ref_sha1_basic(oldrefname, NULL, NULL, NULL, NULL,\n+\t\t\t\t REF_NODEREF, NULL, &err);\n+\n \tif (!lock) {\n \t\terror(\"unable to lock %s for rollback: %s\", oldrefname, err.buf);\n \t\tstrbuf_release(&err);\n@@ -2732,9 +2738,7 @@ static int commit_ref_update(struct ref_lock *lock,\n \t\t\t int flags, struct strbuf *err)\n {\n \tclear_loose_ref_cache(&ref_cache);\n-\tif (log_ref_write(lock->ref_name, lock->old_oid.hash, sha1, logmsg, flags, err) < 0 ||\n-\t (strcmp(lock->ref_name, lock->orig_ref_name) &&\n-\t log_ref_write(lock->orig_ref_name, lock->old_oid.hash, sha1, logmsg, flags, err) < 0)) {\n+\tif (log_ref_write(lock->ref_name, lock->old_oid.hash, sha1, logmsg, flags, err) < 0) {\n \t\tchar *old_msg = strbuf_detach(err, NULL);\n \t\tstrbuf_addf(err, \"Cannot update the ref '%s': %s\",\n \t\t\t lock->ref_name, old_msg);\n@@ -2742,7 +2746,7 @@ static int commit_ref_update(struct ref_lock *lock,\n \t\tunlock_ref(lock);\n \t\treturn -1;\n \t}\n-\tif (strcmp(lock->orig_ref_name, \"HEAD\") != 0) {\n+\tif (flags & REF_IS_NOT_HEAD) {\n \t\t/*\n \t\t * Special hack: If a branch is updated directly and HEAD\n \t\t * points to it (may happen on the remote side of a push\n@@ -2837,8 +2841,8 @@ static int files_create_symref(const char *refname,\n \tstruct ref_lock *lock;\n \tint ret;\n \n-\tlock = lock_ref_sha1_basic(refname, NULL, NULL, NULL, REF_NODEREF, NULL,\n-\t\t\t\t &err);\n+\tlock = lock_ref_sha1_basic(refname, NULL, NULL, NULL, NULL, REF_NODEREF,\n+\t\t\t\t NULL, &err);\n \tif (!lock) {\n \t\terror(\"%s\", err.buf);\n \t\tstrbuf_release(&err);\n@@ -3106,6 +3110,7 @@ static int files_transaction_commit(struct ref_transaction *transaction,\n \t\t\t\tupdate->refname,\n \t\t\t\t((update->flags & REF_HAVE_OLD) ?\n \t\t\t\t update->old_sha1 : NULL),\n+\t\t\t\tupdate->read_sha1,\n \t\t\t\taffected_refnames, NULL,\n \t\t\t\tupdate->flags,\n \t\t\t\t&update->type,\n@@ -3352,7 +3357,7 @@ static int files_reflog_expire(const char *refname, const unsigned char *sha1,\n \tstruct ref_lock *lock;\n \tchar *log_file;\n \tint status = 0;\n-\tint type;\n+\tint type = 0;\n \tstruct strbuf err = STRBUF_INIT;\n \n \tmemset(&cb, 0, sizeof(cb));\n@@ -3365,7 +3370,7 @@ static int files_reflog_expire(const char *refname, const unsigned char *sha1,\n \t * reference itself, plus we might need to update the\n \t * reference if --updateref was specified:\n \t */\n-\tlock = lock_ref_sha1_basic(refname, sha1, NULL, NULL, REF_NODEREF,\n+\tlock = lock_ref_sha1_basic(refname, sha1, NULL, NULL, NULL, REF_NODEREF,\n \t\t\t\t &type, &err);\n \tif (!lock) {\n \t\terror(\"cannot lock ref '%s': %s\", refname, err.buf);\ndiff --git a/refs/refs-internal.h b/refs/refs-internal.h\nindex 283f71f..0337d2e 100644\n--- a/refs/refs-internal.h\n+++ b/refs/refs-internal.h\n@@ -49,6 +49,8 @@\n */\n #define REF_LOG_ONLY 0x80\n \n+#define REF_IS_NOT_HEAD 0x100\n+\n /*\n * Return true iff refname is minimally safe. \"Safe\" here means that\n * deleting a loose reference by this name will not do any damage, for\n@@ -147,6 +149,12 @@ struct ref_update {\n \t */\n \tunsigned char old_sha1[20];\n \t/*\n+\t * During the symbolic ref split stage, we resolve refs.\n+\t * We'll re-resolve non-symbolic refs once they are locked,\n+\t * but we store this to avoid re-resolving symbolic refs.\n+\t */\n+\tunsigned char read_sha1[20];\n+\t/*\n \t * One or more of REF_HAVE_NEW, REF_HAVE_OLD, REF_NODEREF,\n \t * REF_DELETING, and REF_ISPRUNING:\n \t */\n-- \n2.4.2.767.g62658d5-twtrsrc\n"},{"id":"278536","messageId":"1455772670-21142-20-git-send-email-dturner@twopensource.com","threadId":"41437","inReplyTo":"1455772670-21142-1-git-send-email-dturner@twopensource.com","subject":"[PATCH v5 19/27] refs: always handle non-normal refs in files backend","fromName":"David Turner","fromEmail":"dturner@twopensource.com","sentAt":"2016-02-18T05:17:42Z","receivedAt":"2016-02-18T05:17:42Z","isPatch":true,"sender":{"key":"novalis@novalis.org","avatar":"https://avatars.githubusercontent.com/u/77003?v=4"},"body":"Always handle non-normal (per-worktree or pseudo) refs in the files\nbackend instead of alternate backends.\n\nSometimes a ref transaction will update both a per-worktree ref and a\nnormal ref. For instance, an ordinary commit might update\nrefs/heads/master and HEAD (or at least HEAD's reflog).\n\nUpdates to normal refs continue to go through the chosen backend.\n\nUpdates to non-normal refs are moved to a separate files backend\ntransaction.\n\nSigned-off-by: David Turner \n---\n refs.c | 110 +++++++++++++++++++++++++++++++++++++++++++++++++++++------------\n 1 file changed, 90 insertions(+), 20 deletions(-)\n\ndiff --git a/refs.c b/refs.c\nindex 01cf6c3..85e1793 100644\n--- a/refs.c\n+++ b/refs.c\n@@ -9,6 +9,11 @@\n #include \"object.h\"\n #include \"tag.h\"\n \n+static const char split_transaction_fail_warning[] = N_(\n+\t\"A ref transaction was split across two refs backends. Part of the \"\n+\t\"transaction succeeded, but then the update to the per-worktree refs \"\n+\t\"failed. Your repository may be in an inconsistent state.\");\n+\n /*\n * We always have a files backend and it is the default.\n */\n@@ -791,6 +796,13 @@ void ref_transaction_free(struct ref_transaction *transaction)\n \tfree(transaction);\n }\n \n+static void add_update_obj(struct ref_transaction *transaction,\n+\t\t\t struct ref_update *update)\n+{\n+\tALLOC_GROW(transaction->updates, transaction->nr + 1, transaction->alloc);\n+\ttransaction->updates[transaction->nr++] = update;\n+}\n+\n static struct ref_update *add_update(struct ref_transaction *transaction,\n \t\t\t\t const char *refname)\n {\n@@ -798,8 +810,7 @@ static struct ref_update *add_update(struct ref_transaction *transaction,\n \tstruct ref_update *update = xcalloc(1, sizeof(*update) + len);\n \n \tmemcpy((char *)update->refname, refname, len); /* includes NUL */\n-\tALLOC_GROW(transaction->updates, transaction->nr + 1, transaction->alloc);\n-\ttransaction->updates[transaction->nr++] = update;\n+\tadd_update_obj(transaction, update);\n \treturn update;\n }\n \n@@ -1292,11 +1303,37 @@ static int dereference_symrefs(struct ref_transaction *transaction,\n \treturn 0;\n }\n \n-int ref_transaction_commit(struct ref_transaction *transaction,\n-\t\t\t struct strbuf *err)\n+/*\n+ * Move all non-normal ref updates into a specially-created\n+ * files-backend transaction\n+ */\n+static int move_abnormal_ref_updates(struct ref_transaction *transaction,\n+\t\t\t\t struct ref_transaction *files_transaction,\n+\t\t\t\t struct strbuf *err)\n+{\n+\tint i, normal_nr = 0;\n+\n+\tfor (i = 0; i < transaction->nr; i++) {\n+\t\tstruct ref_update *update = transaction->updates[i];\n+\n+\t\tif (ref_type(update->refname) == REF_TYPE_NORMAL)\n+\t\t\ttransaction->updates[normal_nr++] = update;\n+\t\telse\n+\t\t\tadd_update_obj(files_transaction, update);\n+\t}\n+\n+\ttransaction->nr = normal_nr;\n+\treturn 0;\n+}\n+\n+static int do_ref_transaction_commit(struct ref_transaction *transaction,\n+\t\t\t\t struct strbuf *err,\n+\t\t\t\t ref_transaction_commit_fn *commit_fn)\n {\n \tint ret = -1;\n \tstruct string_list affected_refnames = STRING_LIST_INIT_NODUP;\n+\tstruct string_list files_affected_refnames = STRING_LIST_INIT_NODUP;\n+\tstruct ref_transaction *files_transaction = NULL;\n \n \tassert(err);\n \n@@ -1312,18 +1349,60 @@ int ref_transaction_commit(struct ref_transaction *transaction,\n \tif (ret)\n \t\tgoto done;\n \n+\tif (the_refs_backend != &refs_be_files) {\n+\t\tfiles_transaction = ref_transaction_begin(err);\n+\t\tif (!files_transaction)\n+\t\t\tgoto done;\n+\n+\t\tret = move_abnormal_ref_updates(transaction, files_transaction,\n+\t\t\t\t\t\terr);\n+\t\tif (ret)\n+\t\t\tgoto done;\n+\n+\t\t/* files backend commit */\n+\t\tif (get_affected_refnames(files_transaction,\n+\t\t\t\t\t\t &files_affected_refnames,\n+\t\t\t\t\t\t err)) {\n+\t\t\tret = TRANSACTION_GENERIC_ERROR;\n+\t\t\tgoto done;\n+\t\t}\n+\t}\n+\n+\t/* main backend commit */\n \tif (get_affected_refnames(transaction, &affected_refnames, err)) {\n \t\tret = TRANSACTION_GENERIC_ERROR;\n \t\tgoto done;\n \t}\n \n-\tret = the_refs_backend->transaction_commit(transaction,\n-\t\t\t\t\t\t &affected_refnames, err);\n+\tret = commit_fn(transaction, &affected_refnames, err);\n+\tif (ret)\n+\t\tgoto done;\n+\n+\tif (files_transaction) {\n+\t\tret = refs_be_files.transaction_commit(files_transaction,\n+\t\t\t\t\t\t &files_affected_refnames,\n+\t\t\t\t\t\t err);\n+\t\tif (ret) {\n+\t\t\twarning(split_transaction_fail_warning);\n+\t\t\tgoto done;\n+\t\t}\n+\t}\n+\n done:\n \tstring_list_clear(&affected_refnames, 0);\n+\tstring_list_clear(&files_affected_refnames, 0);\n+\tif (files_transaction)\n+\t\tref_transaction_free(files_transaction);\n \treturn ret;\n }\n \n+int ref_transaction_commit(struct ref_transaction *transaction,\n+\t\t\t struct strbuf *err)\n+{\n+\treturn do_ref_transaction_commit(transaction, err,\n+\t\t\t\t\t the_refs_backend->transaction_commit);\n+}\n+\n const char *resolve_ref_unsafe(const char *ref, int resolve_flags,\n \t\t\t unsigned char *sha1, int *flags)\n {\n@@ -1350,6 +1429,9 @@ int peel_ref(const char *refname, unsigned char *sha1)\n int create_symref(const char *ref_target, const char *refs_heads_master,\n \t\t const char *logmsg)\n {\n+\tif (ref_type(ref_target) != REF_TYPE_NORMAL)\n+\t\treturn refs_be_files.create_symref(ref_target, refs_heads_master,\n+\t\t\t\t\t\t logmsg);\n \treturn the_refs_backend->create_symref(ref_target, refs_heads_master,\n \t\t\t\t\t logmsg);\n }\n@@ -1417,20 +1499,8 @@ int reflog_expire(const char *refname, const unsigned char *sha1,\n int initial_ref_transaction_commit(struct ref_transaction *transaction,\n \t\t\t\t struct strbuf *err)\n {\n-\tstruct string_list affected_refnames = STRING_LIST_INIT_NODUP;\n-\tint ret;\n-\n-\tif (get_affected_refnames(transaction,\n-\t\t\t\t &affected_refnames, err)) {\n-\t\tret = TRANSACTION_GENERIC_ERROR;\n-\t\tgoto done;\n-\t}\n-\tret = the_refs_backend->initial_transaction_commit(transaction,\n-\t\t\t\t\t\t\t &affected_refnames,\n-\t\t\t\t\t\t\t err);\n-done:\n-\tstring_list_clear(&affected_refnames, 0);\n-\treturn ret;\n+\treturn do_ref_transaction_commit(transaction, err,\n+\t\t\t\t\t the_refs_backend->initial_transaction_commit);\n }\n \n int delete_refs(struct string_list *refnames)\n-- \n2.4.2.767.g62658d5-twtrsrc\n"},{"id":"278549","messageId":"1455772670-21142-21-git-send-email-dturner@twopensource.com","threadId":"41437","inReplyTo":"1455772670-21142-1-git-send-email-dturner@twopensource.com","subject":"[PATCH v5 20/27] init: allow alternate ref strorage to be set for new repos","fromName":"David Turner","fromEmail":"dturner@twopensource.com","sentAt":"2016-02-18T05:17:43Z","receivedAt":"2016-02-18T05:17:43Z","isPatch":true,"sender":{"key":"novalis@novalis.org","avatar":"https://avatars.githubusercontent.com/u/77003?v=4"},"body":"git init learns a new argument --ref-storage. Presently, only\n\"files\" is supported, but later we will add other storage backends.\n\nWhen this argument is used, the repository's extensions.refStorage\nconfiguration value is set (as well as core.repositoryformatversion),\nand the ref storage backend's initdb function is used to set up the\nref database.\n\nSigned-off-by: David Turner \nSigned-off-by: SZEDER Gábor \n---\n Documentation/git-init-db.txt | 2 +-\n Documentation/git-init.txt | 7 +++++-\n builtin/init-db.c | 44 +++++++++++++++++++++++++++-------\n cache.h | 2 ++\n contrib/completion/git-completion.bash | 3 ++-\n path.c | 29 ++++++++++++++++++++--\n refs.c | 8 +++++++\n refs.h | 8 +++++++\n setup.c | 12 ++++++++++\n t/t0001-init.sh | 25 +++++++++++++++++++\n 10 files changed, 127 insertions(+), 13 deletions(-)\n\ndiff --git a/Documentation/git-init-db.txt b/Documentation/git-init-db.txt\nindex 648a6cd..d03fb69 100644\n--- a/Documentation/git-init-db.txt\n+++ b/Documentation/git-init-db.txt\n@@ -9,7 +9,7 @@ git-init-db - Creates an empty Git repository\n SYNOPSIS\n --------\n [verse]\n-'git init-db' [-q | --quiet] [--bare] [--template=] [--separate-git-dir ] [--shared[=]]\n+'git init-db' [-q | --quiet] [--bare] [--template=] [--separate-git-dir ] [--shared[=]] [--ref-storage=]\n \n \n DESCRIPTION\ndiff --git a/Documentation/git-init.txt b/Documentation/git-init.txt\nindex 8174d27..93f8d0c 100644\n--- a/Documentation/git-init.txt\n+++ b/Documentation/git-init.txt\n@@ -12,7 +12,7 @@ SYNOPSIS\n 'git init' [-q | --quiet] [--bare] [--template=]\n \t [--separate-git-dir ]\n \t [--shared[=]] [directory]\n-\n+\t [--ref-storage=]\n \n DESCRIPTION\n -----------\n@@ -113,6 +113,11 @@ does not exist, it will be created.\n \n --\n \n+--ref-storage=::\n+Type of refs storage backend. Default is to use the original \"files\"\n+storage, which stores ref data in files in `$GIT_DIR/refs` and\n+`$GIT_DIR/packed-refs`.\n+\n TEMPLATE DIRECTORY\n ------------------\n \ndiff --git a/builtin/init-db.c b/builtin/init-db.c\nindex 0c8f4ac..753cb1c 100644\n--- a/builtin/init-db.c\n+++ b/builtin/init-db.c\n@@ -23,6 +23,7 @@ static int init_is_bare_repository = 0;\n static int init_shared_repository = -1;\n static const char *init_db_template_dir;\n static const char *git_link;\n+static char *requested_ref_storage_backend;\n \n static void copy_templates_1(struct strbuf *path, struct strbuf *template,\n \t\t\t DIR *dir)\n@@ -178,6 +179,7 @@ static int create_default_files(const char *template_path)\n \tint reinit;\n \tint filemode;\n \tstruct strbuf err = STRBUF_INIT;\n+\tint repo_version = 0;\n \n \t/* Just look for `init.templatedir` */\n \tgit_config(git_init_db_config, NULL);\n@@ -204,6 +206,32 @@ static int create_default_files(const char *template_path)\n \t}\n \n \t/*\n+\t * Create the default symref from \".git/HEAD\" to the \"master\"\n+\t * branch, if it does not exist yet.\n+\t */\n+\tpath = git_path_buf(&buf, \"HEAD\");\n+\treinit = (!access(path, R_OK)\n+\t\t || readlink(path, junk, sizeof(junk)-1) != -1);\n+\tif (reinit) {\n+\t\tif (requested_ref_storage_backend &&\n+\t\t strcmp(ref_storage_backend, requested_ref_storage_backend))\n+\t\t\tdie(_(\"You can't change the refs storage type (was %s; you requested %s)\"),\n+\t\t\t ref_storage_backend,\n+\t\t\t requested_ref_storage_backend);\n+\t}\n+\n+\tif (requested_ref_storage_backend)\n+\t\tref_storage_backend = requested_ref_storage_backend;\n+\tif (strcmp(ref_storage_backend, \"files\")) {\n+\t\tgit_config_set(\"extensions.refStorage\", ref_storage_backend);\n+\t\tgit_config_set(\"core.repositoryformatversion\", ref_storage_backend);\n+\t\tif (set_ref_storage_backend(ref_storage_backend))\n+\t\t\tdie(_(\"Unknown ref storage backend %s\"),\n+\t\t\t ref_storage_backend);\n+\t\trepo_version = 1;\n+\t}\n+\n+\t/*\n \t * We need to create a \"refs\" dir in any case so that older\n \t * versions of git can tell that this is a repository.\n \t */\n@@ -212,13 +240,6 @@ static int create_default_files(const char *template_path)\n \tif (refs_init_db(shared_repository, &err))\n \t\tdie(\"failed to set up refs db: %s\", err.buf);\n \n-\t/*\n-\t * Create the default symlink from \".git/HEAD\" to the \"master\"\n-\t * branch, if it does not exist yet.\n-\t */\n-\tpath = git_path_buf(&buf, \"HEAD\");\n-\treinit = (!access(path, R_OK)\n-\t\t || readlink(path, junk, sizeof(junk)-1) != -1);\n \tif (!reinit) {\n \t\tif (create_symref(\"HEAD\", \"refs/heads/master\", NULL) < 0)\n \t\t\texit(1);\n@@ -226,7 +247,7 @@ static int create_default_files(const char *template_path)\n \n \t/* This forces creation of new config file */\n \txsnprintf(repo_version_string, sizeof(repo_version_string),\n-\t\t \"%d\", GIT_REPO_VERSION);\n+\t\t \"%d\", repo_version);\n \tgit_config_set(\"core.repositoryformatversion\", repo_version_string);\n \n \t/* Check filemode trustability */\n@@ -474,11 +495,18 @@ int cmd_init_db(int argc, const char **argv, const char *prefix)\n \t\tOPT_BIT('q', \"quiet\", &flags, N_(\"be quiet\"), INIT_DB_QUIET),\n \t\tOPT_STRING(0, \"separate-git-dir\", &real_git_dir, N_(\"gitdir\"),\n \t\t\t N_(\"separate git dir from working tree\")),\n+\t\tOPT_STRING(0, \"ref-storage\", &requested_ref_storage_backend,\n+\t\t\t N_(\"name\"), N_(\"name of backend type to use\")),\n \t\tOPT_END()\n \t};\n \n \targc = parse_options(argc, argv, prefix, init_db_options, init_db_usage, 0);\n \n+\tif (requested_ref_storage_backend &&\n+\t !ref_storage_backend_exists(requested_ref_storage_backend))\n+\t\tdie(_(\"Unknown ref storage backend %s\"),\n+\t\t requested_ref_storage_backend);\n+\n \tif (real_git_dir && !is_absolute_path(real_git_dir))\n \t\treal_git_dir = xstrdup(real_path(real_git_dir));\n \ndiff --git a/cache.h b/cache.h\nindex 4307174..a54c97b 100644\n--- a/cache.h\n+++ b/cache.h\n@@ -734,6 +734,8 @@ extern enum object_creation_mode object_creation_mode;\n \n extern char *notes_ref_name;\n \n+extern const char *ref_storage_backend;\n+\n extern int grafts_replace_parents;\n \n /*\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex 45ec47f..0138d03 100644\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -1362,7 +1362,8 @@ _git_init ()\n \t\treturn\n \t\t;;\n \t--*)\n-\t\t__gitcomp \"--quiet --bare --template= --shared --shared=\"\n+\t\t__gitcomp \"--quiet --bare --template= --shared --shared=\n+\t\t\t--ref-storage=\"\n \t\treturn\n \t\t;;\n \tesac\ndiff --git a/path.c b/path.c\nindex 8b7e168..2e67a2b 100644\n--- a/path.c\n+++ b/path.c\n@@ -2,6 +2,7 @@\n * Utilities for paths and pathnames\n */\n #include \"cache.h\"\n+#include \"refs.h\"\n #include \"strbuf.h\"\n #include \"string-list.h\"\n #include \"dir.h\"\n@@ -511,8 +512,32 @@ int validate_headref(const char *path)\n \tint fd;\n \tssize_t len;\n \n-\tif (lstat(path, &st) < 0)\n-\t\treturn -1;\n+\tif (lstat(path, &st) < 0) {\n+\t\tint backend_type_set;\n+\t\tstruct strbuf config_path = STRBUF_INIT;\n+\t\tchar *pathdup = xstrdup(path);\n+\t\tchar *git_dir = dirname(pathdup);\n+\t\tchar *storage = NULL;\n+\n+\t\tstrbuf_addf(&config_path, \"%s/%s\", git_dir, \"config\");\n+\t\tfree(pathdup);\n+\n+\t\tif (git_config_from_file(ref_storage_backend_config,\n+\t\t\t\t\t config_path.buf, &storage)) {\n+\t\t\tstrbuf_release(&config_path);\n+\t\t\treturn -1;\n+\t\t}\n+\n+\t\tbackend_type_set = !!storage;\n+\t\tfree((void *)storage);\n+\t\tstrbuf_release(&config_path);\n+\t\t/*\n+\t\t * Alternate backends are assumed to keep HEAD\n+\t\t * in a valid state, so there's no need to do\n+\t\t * further validation.\n+\t\t */\n+\t\treturn backend_type_set ? 0 : -1;\n+\t}\n \n \t/* Make sure it is a \"refs/..\" symlink */\n \tif (S_ISLNK(st.st_mode)) {\ndiff --git a/refs.c b/refs.c\nindex 85e1793..64d4150 100644\n--- a/refs.c\n+++ b/refs.c\n@@ -23,6 +23,14 @@ static struct ref_storage_be *the_refs_backend = &refs_be_files;\n */\n static struct ref_storage_be *refs_backends = &refs_be_files;\n \n+const char *ref_storage_backend = \"files\";\n+\n+void register_ref_storage_backend(struct ref_storage_be *be)\n+{\n+\tbe->next = refs_backends;\n+\trefs_backends = be;\n+}\n+\n int set_ref_storage_backend(const char *name)\n {\n \tstruct ref_storage_be *be;\ndiff --git a/refs.h b/refs.h\nindex feff82e..4992aa4 100644\n--- a/refs.h\n+++ b/refs.h\n@@ -511,10 +511,18 @@ extern int reflog_expire(const char *refname, const unsigned char *sha1,\n \t\t\t void *policy_cb_data);\n \n /*\n+ * Read the refdb storage backend name out of the config file\n+ */\n+int ref_storage_backend_config(const char *var, const char *value, void *ptr);\n+\n+struct ref_storage_be;\n+/*\n * Switch to an alternate ref storage backend.\n */\n int set_ref_storage_backend(const char *name);\n \n int ref_storage_backend_exists(const char *name);\n \n+void register_ref_storage_backend(struct ref_storage_be *be);\n+\n #endif /* REFS_H */\ndiff --git a/setup.c b/setup.c\nindex 0deb022..1a62277 100644\n--- a/setup.c\n+++ b/setup.c\n@@ -1,5 +1,6 @@\n #include \"cache.h\"\n #include \"dir.h\"\n+#include \"refs.h\"\n #include \"string-list.h\"\n \n static int inside_git_dir = -1;\n@@ -263,6 +264,15 @@ int get_common_dir_noenv(struct strbuf *sb, const char *gitdir)\n \treturn ret;\n }\n \n+int ref_storage_backend_config(const char *var, const char *value, void *ptr)\n+{\n+\tchar **cdata = ptr;\n+\n+\tif (!strcmp(var, \"extensions.refstorage\"))\n+\t\t*cdata = xstrdup(value);\n+\treturn 0;\n+}\n+\n /*\n * Test if it looks like we're at a git directory.\n * We want to see:\n@@ -390,6 +400,8 @@ static int check_repo_format(const char *var, const char *value, void *cb)\n \t\t\t;\n \t\telse if (!strcmp(ext, \"preciousobjects\"))\n \t\t\trepository_format_precious_objects = git_config_bool(var, value);\n+\t\telse if (!strcmp(ext, \"refstorage\"))\n+\t\t\tref_storage_backend = xstrdup(value);\n \t\telse\n \t\t\tstring_list_append(&unknown_extensions, ext);\n \t}\ndiff --git a/t/t0001-init.sh b/t/t0001-init.sh\nindex 295aa59..31c8279 100755\n--- a/t/t0001-init.sh\n+++ b/t/t0001-init.sh\n@@ -174,6 +174,31 @@ test_expect_success 'reinit' '\n \ttest_i18ncmp again/empty again/err2\n '\n \n+test_expect_success 'init with bogus storage backend fails' '\n+\n+\t(\n+\t\tmkdir again2 &&\n+\t\tcd again2 &&\n+\t\ttest_must_fail git init --ref-storage=test >out2 2>err2 &&\n+\t\ttest_i18ngrep \"Unknown ref storage backend test\" err2\n+\t)\n+'\n+\n+test_expect_failure 'reinit with changed storage backend fails' '\n+\n+\t(\n+\t\tmkdir again3 &&\n+\t\tcd again3 &&\n+\t\tgit init >out1 2>err1 &&\n+\t\tgit init --ref-storage=test >out2 2>err2\n+\t) &&\n+\ttest_i18ngrep \"Initialized empty\" again3/out1 &&\n+\ttest_i18ngrep \"Reinitialized existing\" again3/out2 &&\n+\t>again3/empty &&\n+\ttest_i18ncmp again3/empty again3/err1 &&\n+\ttest_i18ncmp again3/empty again3/err2\n+'\n+\n test_expect_success 'init with --template' '\n \tmkdir template-source &&\n \techo content >template-source/file &&\n-- \n2.4.2.767.g62658d5-twtrsrc\n"},{"id":"278547","messageId":"1455772670-21142-22-git-send-email-dturner@twopensource.com","threadId":"41437","inReplyTo":"1455772670-21142-1-git-send-email-dturner@twopensource.com","subject":"[PATCH v5 21/27] refs: check submodules' ref storage config","fromName":"David Turner","fromEmail":"dturner@twopensource.com","sentAt":"2016-02-18T05:17:44Z","receivedAt":"2016-02-18T05:17:44Z","isPatch":true,"sender":{"key":"novalis@novalis.org","avatar":"https://avatars.githubusercontent.com/u/77003?v=4"},"body":"All submodules must have the same ref storage (for now). Confirm that\nthis is so before attempting to do anything with submodule refs.\n\nSigned-off-by: David Turner \n---\n refs.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++\n refs.h | 2 +-\n refs/files-backend.c | 8 ++------\n 3 files changed, 57 insertions(+), 7 deletions(-)\n\ndiff --git a/refs.c b/refs.c\nindex 64d4150..ea7e0eb 100644\n--- a/refs.c\n+++ b/refs.c\n@@ -308,6 +308,54 @@ int for_each_tag_ref(each_ref_fn fn, void *cb_data)\n \treturn for_each_ref_in(\"refs/tags/\", fn, cb_data);\n }\n \n+static int submodule_backend(const char *key, const char *value, void *data)\n+{\n+\tconst char **path = data;\n+\tchar **old_path = data;\n+\tif (!strcmp(key, \"extensions.refstorage\") &&\n+\t !git_config_string(path, key, \"extensions.refstorage\"))\n+\t\t\tfree(*old_path);\n+\n+\treturn 0;\n+}\n+\n+/*\n+ * Check that a submodule exists. If its ref storage backend differs\n+ * from the current backend, die. If the submodule exists, return\n+ * 0. Else return -1.\n+ */\n+static int check_submodule_backend(const char *submodule)\n+{\n+\tstruct strbuf sb = STRBUF_INIT;\n+\tchar *submodule_storage_backend;\n+\tint result = -1;\n+\n+\tif (!submodule)\n+\t\treturn 0;\n+\n+\tsubmodule_storage_backend = xstrdup(\"files\");\n+\n+\tstrbuf_addstr(&sb, submodule);\n+\tif (!is_nonbare_repository_dir(&sb))\n+\t\tgoto done;\n+\n+\tstrbuf_reset(&sb);\n+\tstrbuf_git_path_submodule(&sb, submodule, \"config\");\n+\n+\tgit_config_from_file(submodule_backend, sb.buf,\n+\t\t\t &submodule_storage_backend);\n+\tif (strcmp(submodule_storage_backend, ref_storage_backend))\n+\t\tdie(_(\"Ref storage '%s' for submodule '%s' does not match our storage, '%s'\"),\n+\t\t submodule_storage_backend, submodule, ref_storage_backend);\n+\n+\tresult = 0;\n+done:\n+\tfree(submodule_storage_backend);\n+\tstrbuf_release(&sb);\n+\n+\treturn result;\n+}\n+\n int for_each_tag_ref_submodule(const char *submodule, each_ref_fn fn, void *cb_data)\n {\n \treturn for_each_ref_in_submodule(submodule, \"refs/tags/\", fn, cb_data);\n@@ -320,6 +368,7 @@ int for_each_branch_ref(each_ref_fn fn, void *cb_data)\n \n int for_each_branch_ref_submodule(const char *submodule, each_ref_fn fn, void *cb_data)\n {\n+\tcheck_submodule_backend(submodule);\n \treturn for_each_ref_in_submodule(submodule, \"refs/heads/\", fn, cb_data);\n }\n \n@@ -330,6 +379,7 @@ int for_each_remote_ref(each_ref_fn fn, void *cb_data)\n \n int for_each_remote_ref_submodule(const char *submodule, each_ref_fn fn, void *cb_data)\n {\n+\tcheck_submodule_backend(submodule);\n \treturn for_each_ref_in_submodule(submodule, \"refs/remotes/\", fn, cb_data);\n }\n \n@@ -1141,6 +1191,7 @@ int head_ref_submodule(const char *submodule, each_ref_fn fn, void *cb_data)\n \tint flag;\n \n \tif (submodule) {\n+\t\tcheck_submodule_backend(submodule);\n \t\tif (resolve_gitlink_ref(submodule, \"HEAD\", oid.hash) == 0)\n \t\t\treturn fn(\"HEAD\", &oid, 0, cb_data);\n \n@@ -1447,6 +1498,9 @@ int create_symref(const char *ref_target, const char *refs_heads_master,\n int resolve_gitlink_ref(const char *path, const char *refname,\n \t\t\tunsigned char *sha1)\n {\n+\tif (check_submodule_backend(path))\n+\t\treturn -1;\n+\n \treturn the_refs_backend->resolve_gitlink_ref(path, refname, sha1);\n }\n \ndiff --git a/refs.h b/refs.h\nindex 4992aa4..e659882 100644\n--- a/refs.h\n+++ b/refs.h\n@@ -511,7 +511,7 @@ extern int reflog_expire(const char *refname, const unsigned char *sha1,\n \t\t\t void *policy_cb_data);\n \n /*\n- * Read the refdb storage backend name out of the config file\n+ * Read the ref storage backend name out of the config file\n */\n int ref_storage_backend_config(const char *var, const char *value, void *ptr);\n \ndiff --git a/refs/files-backend.c b/refs/files-backend.c\nindex b3cca8e..4bddfb3 100644\n--- a/refs/files-backend.c\n+++ b/refs/files-backend.c\n@@ -1357,13 +1357,9 @@ static int files_resolve_gitlink_ref(const char *path, const char *refname,\n \n \tstrbuf_add(&submodule, path, len);\n \trefs = lookup_ref_cache(submodule.buf);\n-\tif (!refs) {\n-\t\tif (!is_nonbare_repository_dir(&submodule)) {\n-\t\t\tstrbuf_release(&submodule);\n-\t\t\treturn -1;\n-\t\t}\n+\tif (!refs)\n \t\trefs = create_ref_cache(submodule.buf);\n-\t}\n+\n \tstrbuf_release(&submodule);\n \n \tretval = resolve_gitlink_ref_recursive(refs, refname, sha1, 0);\n-- \n2.4.2.767.g62658d5-twtrsrc\n"},{"id":"278545","messageId":"1455772670-21142-23-git-send-email-dturner@twopensource.com","threadId":"41437","inReplyTo":"1455772670-21142-1-git-send-email-dturner@twopensource.com","subject":"[PATCH v5 22/27] clone: allow ref storage backend to be set for clone","fromName":"David Turner","fromEmail":"dturner@twopensource.com","sentAt":"2016-02-18T05:17:45Z","receivedAt":"2016-02-18T05:17:45Z","isPatch":true,"sender":{"key":"novalis@novalis.org","avatar":"https://avatars.githubusercontent.com/u/77003?v=4"},"body":"Add a new option, --ref-storage, to allow the ref storage backend to\nbe set on new clones.\n\nSubmodules must use the same ref storage as the parent repository, so\nwe also pass the --ref-storage option option when cloning\nsubmodules.\n\nSigned-off-by: David Turner \nSigned-off-by: SZEDER Gábor \n---\n Documentation/git-clone.txt | 5 +++++\n builtin/clone.c | 5 +++++\n builtin/submodule--helper.c | 2 +-\n contrib/completion/git-completion.bash | 1 +\n git-submodule.sh | 13 +++++++++++++\n 5 files changed, 25 insertions(+), 1 deletion(-)\n\ndiff --git a/Documentation/git-clone.txt b/Documentation/git-clone.txt\nindex 45d74be..68f56a7 100644\n--- a/Documentation/git-clone.txt\n+++ b/Documentation/git-clone.txt\n@@ -14,6 +14,7 @@ SYNOPSIS\n \t [-o ] [-b ] [-u ] [--reference ]\n \t [--dissociate] [--separate-git-dir ]\n \t [--depth ] [--[no-]single-branch]\n+\t [--ref-storage=]\n \t [--recursive | --recurse-submodules] [--jobs ] [--] \n \t []\n \n@@ -224,6 +225,10 @@ objects from the source repository into a pack in the cloned repository.\n \tThe number of submodules fetched at the same time.\n \tDefaults to the `submodule.fetchJobs` option.\n \n+--ref-storage=::\n+\tType of ref storage backend. Default is to use the original files\n+\tbased ref storage.\n+\n ::\n \tThe (possibly remote) repository to clone from. See the\n \t<> section below for more information on specifying\ndiff --git a/builtin/clone.c b/builtin/clone.c\nindex 191f522..5ba0514 100644\n--- a/builtin/clone.c\n+++ b/builtin/clone.c\n@@ -95,6 +95,8 @@ static struct option builtin_clone_options[] = {\n \t\t N_(\"separate git dir from working tree\")),\n \tOPT_STRING_LIST('c', \"config\", &option_config, N_(\"key=value\"),\n \t\t\tN_(\"set config inside the new repository\")),\n+\tOPT_STRING(0, \"ref-storage\", &ref_storage_backend,\n+\t\t N_(\"name\"), N_(\"name of backend type to use\")),\n \tOPT_END()\n };\n \n@@ -733,6 +735,9 @@ static int checkout(void)\n \t\tif (max_jobs != -1)\n \t\t\targv_array_pushf(&args, \"--jobs=%d\", max_jobs);\n \n+\t\targv_array_pushl(&args, \"--ref-storage\",\n+\t\t\t\t ref_storage_backend, NULL);\n+\n \t\terr = run_command_v_opt(args.argv, RUN_GIT_CMD);\n \t\targv_array_clear(&args);\n \t}\ndiff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c\nindex 689c354..879d6fb 100644\n--- a/builtin/submodule--helper.c\n+++ b/builtin/submodule--helper.c\n@@ -457,7 +457,7 @@ static int clone_submodule(const char *path, const char *gitdir, const char *url\n \t\targv_array_pushl(&cp.args, \"--reference\", reference, NULL);\n \tif (gitdir && *gitdir)\n \t\targv_array_pushl(&cp.args, \"--separate-git-dir\", gitdir, NULL);\n-\n+\targv_array_pushl(&cp.args, \"--ref-storage\", ref_storage_backend, NULL);\n \targv_array_push(&cp.args, url);\n \targv_array_push(&cp.args, path);\n \ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex 0138d03..cb9c473 100644\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -1092,6 +1092,7 @@ _git_clone ()\n \t\t\t--depth\n \t\t\t--single-branch\n \t\t\t--branch\n+\t\t\t--ref-storage=\n \t\t\t\"\n \t\treturn\n \t\t;;\ndiff --git a/git-submodule.sh b/git-submodule.sh\nindex 6fce0dc..e7ac98b 100755\n--- a/git-submodule.sh\n+++ b/git-submodule.sh\n@@ -527,6 +527,14 @@ cmd_update()\n \t\t--checkout)\n \t\t\tupdate=\"checkout\"\n \t\t\t;;\n+\t\t--ref-storage=*)\n+\t\t\tref_storage=\"$1\"\n+\t\t\t;;\n+\t\t--ref-storage)\n+\t\t\tcase \"$2\" in '') usage ;; esac\n+\t\t\tref_storage=\"$2\"\n+\t\t\tshift\n+\t\t\t;;\n \t\t--depth)\n \t\t\tcase \"$2\" in '') usage ;; esac\n \t\t\tdepth=\"--depth=$2\"\n@@ -560,6 +568,11 @@ cmd_update()\n \tif test -n \"$init\"\n \tthen\n \t\tcmd_init \"--\" \"$@\" || return\n+\telse\n+\t\tif test -n \"$ref_storage\"\n+\t\tthen\n+\t\t\tusage\n+\t\tfi\n \tfi\n \n \tgit submodule--helper update-clone ${GIT_QUIET:+--quiet} \\\n-- \n2.4.2.767.g62658d5-twtrsrc\n"},{"id":"278541","messageId":"1455772670-21142-24-git-send-email-dturner@twopensource.com","threadId":"41437","inReplyTo":"1455772670-21142-1-git-send-email-dturner@twopensource.com","subject":"[PATCH v5 23/27] svn: learn ref-storage argument","fromName":"David Turner","fromEmail":"dturner@twopensource.com","sentAt":"2016-02-18T05:17:46Z","receivedAt":"2016-02-18T05:17:46Z","isPatch":true,"sender":{"key":"novalis@novalis.org","avatar":"https://avatars.githubusercontent.com/u/77003?v=4"},"body":"git svn learns to pass the ref-storage command-line argument (to init\nand clone) through to git init.\n\nSigned-off-by: David Turner \nSigned-off-by: SZEDER Gábor \n---\n contrib/completion/git-completion.bash | 2 +-\n git-svn.perl | 6 +++++-\n 2 files changed, 6 insertions(+), 2 deletions(-)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex cb9c473..ba4137d 100644\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -2477,7 +2477,7 @@ _git_svn ()\n \t\t\t--branches= --stdlayout --minimize-url\n \t\t\t--no-metadata --use-svm-props --use-svnsync-props\n \t\t\t--rewrite-root= --prefix= --use-log-author\n-\t\t\t--add-author-from $remote_opts\n+\t\t\t--add-author-from --ref-storage= $remote_opts\n \t\t\t\"\n \t\tlocal cmt_opts=\"\n \t\t\t--edit --rmdir --find-copies-harder --copy-similarity=\ndiff --git a/git-svn.perl b/git-svn.perl\nindex fa5f253..15d1544 100755\n--- a/git-svn.perl\n+++ b/git-svn.perl\n@@ -141,7 +141,7 @@ my %fc_opts = ( 'follow-parent|follow!' => \\$Git::SVN::_follow_parent,\n \t\t'localtime' => \\$Git::SVN::_localtime,\n \t\t%remote_opts );\n \n-my ($_trunk, @_tags, @_branches, $_stdlayout);\n+my ($_trunk, @_tags, @_branches, $_stdlayout, $_ref_storage);\n my %icv;\n my %init_opts = ( 'template=s' => \\$_template, 'shared:s' => \\$_shared,\n 'trunk|T=s' => \\$_trunk, 'tags|t=s@' => \\@_tags,\n@@ -153,6 +153,7 @@ my %init_opts = ( 'template=s' => \\$_template, 'shared:s' => \\$_shared,\n \t\t 'use-svnsync-props' => sub { $icv{useSvnsyncProps} = 1 },\n \t\t 'rewrite-root=s' => sub { $icv{rewriteRoot} = $_[1] },\n \t\t 'rewrite-uuid=s' => sub { $icv{rewriteUUID} = $_[1] },\n+\t\t 'ref-storage=s' => \\$_ref_storage,\n %remote_opts );\n my %cmt_opts = ( 'edit|e' => \\$_edit,\n \t\t'rmdir' => \\$Git::SVN::Editor::_rmdir,\n@@ -469,6 +470,9 @@ sub do_git_init_db {\n \t\t\t\tpush @init_db, \"--shared\";\n \t\t\t}\n \t\t}\n+\t\tif (defined $_ref_storage) {\n+\t\t push @init_db, \"--ref-storage=\" . $_ref_storage;\n+\t\t}\n \t\tcommand_noisy(@init_db);\n \t\t$_repository = Git->repository(Repository => \".git\");\n \t}\n-- \n2.4.2.767.g62658d5-twtrsrc\n"},{"id":"278540","messageId":"1455772670-21142-25-git-send-email-dturner@twopensource.com","threadId":"41437","inReplyTo":"1455772670-21142-1-git-send-email-dturner@twopensource.com","subject":"[PATCH v5 24/27] refs: add register_ref_storage_backends()","fromName":"David Turner","fromEmail":"dturner@twopensource.com","sentAt":"2016-02-18T05:17:47Z","receivedAt":"2016-02-18T05:17:47Z","isPatch":true,"sender":{"key":"novalis@novalis.org","avatar":"https://avatars.githubusercontent.com/u/77003?v=4"},"body":"This new function will register all known ref storage backends... once\nthere are any other than the default. For now, it's a no-op.\n\nSigned-off-by: David Turner \n---\n builtin/init-db.c | 3 +++\n config.c | 25 +++++++++++++++++++++++++\n refs.c | 13 +++++++++----\n refs.h | 2 ++\n 4 files changed, 39 insertions(+), 4 deletions(-)\n\ndiff --git a/builtin/init-db.c b/builtin/init-db.c\nindex 753cb1c..9bd98eb 100644\n--- a/builtin/init-db.c\n+++ b/builtin/init-db.c\n@@ -225,6 +225,7 @@ static int create_default_files(const char *template_path)\n \tif (strcmp(ref_storage_backend, \"files\")) {\n \t\tgit_config_set(\"extensions.refStorage\", ref_storage_backend);\n \t\tgit_config_set(\"core.repositoryformatversion\", ref_storage_backend);\n+\t\tregister_ref_storage_backends();\n \t\tif (set_ref_storage_backend(ref_storage_backend))\n \t\t\tdie(_(\"Unknown ref storage backend %s\"),\n \t\t\t ref_storage_backend);\n@@ -502,6 +503,8 @@ int cmd_init_db(int argc, const char **argv, const char *prefix)\n \n \targc = parse_options(argc, argv, prefix, init_db_options, init_db_usage, 0);\n \n+\tregister_ref_storage_backends();\n+\n \tif (requested_ref_storage_backend &&\n \t !ref_storage_backend_exists(requested_ref_storage_backend))\n \t\tdie(_(\"Unknown ref storage backend %s\"),\ndiff --git a/config.c b/config.c\nindex b95ac3a..025a1ee 100644\n--- a/config.c\n+++ b/config.c\n@@ -11,6 +11,7 @@\n #include \"strbuf.h\"\n #include \"quote.h\"\n #include \"hashmap.h\"\n+#include \"refs.h\"\n #include \"string-list.h\"\n #include \"utf8.h\"\n \n@@ -1207,6 +1208,30 @@ int git_config_early(config_fn_t fn, void *data, const char *repo_config)\n \t}\n \n \tif (repo_config && !access_or_die(repo_config, R_OK, 0)) {\n+\t\tchar *storage = NULL;\n+\n+\t\t/*\n+\t\t * make sure we always read the ref storage config\n+\t\t * from the extensions section on startup\n+\t\t */\n+\t\tret += git_config_from_file(ref_storage_backend_config,\n+\t\t\t\t\t repo_config, &storage);\n+\n+\t\tregister_ref_storage_backends();\n+\t\tif (!storage)\n+\t\t\tstorage = xstrdup(\"\");\n+\n+\t\tif (!*storage ||\n+\t\t !strcmp(storage, \"files\")) {\n+\t\t\t/* default backend, nothing to do */\n+\t\t\tfree(storage);\n+\t\t} else {\n+\t\t\tref_storage_backend = storage;\n+\t\t\tif (set_ref_storage_backend(ref_storage_backend))\n+\t\t\t\tdie(_(\"Unknown ref storage backend %s\"),\n+\t\t\t\t ref_storage_backend);\n+\t\t}\n+\n \t\tret += git_config_from_file(fn, repo_config, data);\n \t\tfound += 1;\n \t}\ndiff --git a/refs.c b/refs.c\nindex ea7e0eb..dec7b5c 100644\n--- a/refs.c\n+++ b/refs.c\n@@ -14,14 +14,11 @@ static const char split_transaction_fail_warning[] = N_(\n \t\"transaction succeeded, but then the update to the per-worktree refs \"\n \t\"failed. Your repository may be in an inconsistent state.\");\n \n-/*\n- * We always have a files backend and it is the default.\n- */\n static struct ref_storage_be *the_refs_backend = &refs_be_files;\n /*\n * List of all available backends\n */\n-static struct ref_storage_be *refs_backends = &refs_be_files;\n+static struct ref_storage_be *refs_backends = NULL;\n \n const char *ref_storage_backend = \"files\";\n \n@@ -1580,3 +1577,11 @@ int rename_ref(const char *oldref, const char *newref, const char *logmsg)\n \t}\n \treturn the_refs_backend->rename_ref(oldref, newref, logmsg);\n }\n+\n+void register_ref_storage_backends(void) {\n+\t/*\n+\t * Add register_ref_storage_backend(ptr-to-backend)\n+\t * entries below when you add a new backend.\n+\t */\n+\tregister_ref_storage_backend(&refs_be_files);\n+}\ndiff --git a/refs.h b/refs.h\nindex e659882..363c6ee 100644\n--- a/refs.h\n+++ b/refs.h\n@@ -525,4 +525,6 @@ int ref_storage_backend_exists(const char *name);\n \n void register_ref_storage_backend(struct ref_storage_be *be);\n \n+void register_ref_storage_backends(void);\n+\n #endif /* REFS_H */\n-- \n2.4.2.767.g62658d5-twtrsrc\n"},{"id":"278546","messageId":"1455772670-21142-26-git-send-email-dturner@twopensource.com","threadId":"41437","inReplyTo":"1455772670-21142-1-git-send-email-dturner@twopensource.com","subject":"[PATCH v5 25/27] refs: add LMDB refs storage backend","fromName":"David Turner","fromEmail":"dturner@twopensource.com","sentAt":"2016-02-18T05:17:48Z","receivedAt":"2016-02-18T05:17:48Z","isPatch":true,"sender":{"key":"novalis@novalis.org","avatar":"https://avatars.githubusercontent.com/u/77003?v=4"},"body":"Add a database backend for refs using LMDB. This backend runs git\nfor-each-ref about 30% faster than the files backend with fully-packed\nrefs on a repo with ~120k refs. It's also about 4x faster than using\nfully-unpacked refs. In addition, and perhaps more importantly, it\navoids case-conflict issues on OS X.\n\nLMDB has a few features that make it suitable for usage in git:\n\n1. It is licensed under the OpenLDAP Public License, which is\nGPL-compatible [1].\n\n[1] http://www.gnu.org/licenses/license-list.en.html#newOpenLDAP\n\n2. It is relatively lightweight; it requires only one header file, and\nthe library code takes under 64k at runtime.\n\n3. It is well-tested: it's been used in OpenLDAP for years.\n\n4. It's very fast. LMDB's benchmarks show that it is among\nthe fastest key-value stores.\n\n5. It has a relatively simple concurrency story; readers don't\nblock writers and writers don't block readers.\n\nRonnie Sahlberg's original version of this patchset used tdb. The\nmajor disadvantage of tdb is that tdb is hard to build on OS X. It's\nalso not in homebrew. So lmdb seemed simpler.\n\nTo test this backend's correctness, I hacked test-lib.sh and\ntest-lib-functions.sh to run all tests under the refs backend. Dozens\nof tests use manual ref/reflog reading/writing, or create submodules\nwithout passing --ref-storage to git init. If those tests are\nchanged to use the update-ref machinery or test-refs-lmdb-backend (or,\nin the case of packed-refs, corrupt refs, and dumb fetch tests, are\nskipped), the only remaining failing tests are the git-new-workdir\ntests and the gitweb tests.\n\nSigned-off-by: David Turner \n---\n .gitignore | 1 +\n Documentation/config.txt | 9 +\n Documentation/git-clone.txt | 3 +-\n Documentation/git-init.txt | 3 +-\n Documentation/technical/refs-lmdb-backend.txt | 52 +\n Documentation/technical/repository-version.txt | 5 +\n Makefile | 12 +\n configure.ac | 33 +\n contrib/workdir/git-new-workdir | 3 +\n path.c | 1 +\n refs.c | 9 +-\n refs.h | 2 +\n refs/lmdb-backend.c | 1927 ++++++++++++++++++++++++\n setup.c | 11 +-\n test-refs-lmdb-backend.c | 64 +\n transport.c | 7 +-\n 16 files changed, 2133 insertions(+), 9 deletions(-)\n create mode 100644 Documentation/technical/refs-lmdb-backend.txt\n create mode 100644 refs/lmdb-backend.c\n create mode 100644 test-refs-lmdb-backend.c\n\ndiff --git a/.gitignore b/.gitignore\nindex 1c2f832..87d45a2 100644\n--- a/.gitignore\n+++ b/.gitignore\n@@ -199,6 +199,7 @@\n /test-path-utils\n /test-prio-queue\n /test-read-cache\n+/test-refs-lmdb-backend\n /test-regex\n /test-revision-walking\n /test-run-command\ndiff --git a/Documentation/config.txt b/Documentation/config.txt\nindex 06d3659..43d67b1 100644\n--- a/Documentation/config.txt\n+++ b/Documentation/config.txt\n@@ -1153,6 +1153,15 @@ difftool..cmd::\n difftool.prompt::\n \tPrompt before each invocation of the diff tool.\n \n+extensions.refStorage::\n+\tType of ref storage backend. Default is to use the original\n+ files based ref storage. When set to \"lmdb\", refs are stored\n+ in an LMDB database. This setting reflects the refs storage\n+ backend that was chosen via the --ref-storage option when the\n+ repository was originally created. It is currently not\n+ possible to change the refs storage backend of an existing\n+ repository.\n+\n fetch.recurseSubmodules::\n \tThis option can be either set to a boolean value or to 'on-demand'.\n \tSetting it to a boolean changes the behavior of fetch and pull to\ndiff --git a/Documentation/git-clone.txt b/Documentation/git-clone.txt\nindex 68f56a7..e5873fe 100644\n--- a/Documentation/git-clone.txt\n+++ b/Documentation/git-clone.txt\n@@ -227,7 +227,8 @@ objects from the source repository into a pack in the cloned repository.\n \n --ref-storage=::\n \tType of ref storage backend. Default is to use the original files\n-\tbased ref storage.\n+\tbased ref storage. Set to \"lmdb\" to store refs in the LMDB database\n+\tbackend.\n \n ::\n \tThe (possibly remote) repository to clone from. See the\ndiff --git a/Documentation/git-init.txt b/Documentation/git-init.txt\nindex 93f8d0c..129702b 100644\n--- a/Documentation/git-init.txt\n+++ b/Documentation/git-init.txt\n@@ -116,7 +116,8 @@ does not exist, it will be created.\n --ref-storage=::\n Type of refs storage backend. Default is to use the original \"files\"\n storage, which stores ref data in files in `$GIT_DIR/refs` and\n-`$GIT_DIR/packed-refs`.\n+`$GIT_DIR/packed-refs`. Set to \"lmdb\" to activate the LMDB storage\n+backend.\n \n TEMPLATE DIRECTORY\n ------------------\ndiff --git a/Documentation/technical/refs-lmdb-backend.txt b/Documentation/technical/refs-lmdb-backend.txt\nnew file mode 100644\nindex 0000000..eb81465\n--- /dev/null\n+++ b/Documentation/technical/refs-lmdb-backend.txt\n@@ -0,0 +1,52 @@\n+Notes on the LMDB refs backend\n+==============================\n+\n+Design:\n+------\n+\n+Refs and reflogs are stored in a lmdb database in .git/refs.lmdb. All\n+keys and values are \\0-terminated.\n+\n+Keys for refs are the name of the ref (e.g. refs/heads/master).\n+Values are the value of the ref, in hex\n+(e.g. 61f23eb0f81357c19fa91e2b8c6f3906c3a8f9b0).\n+\n+All per-worktree refs (refs/bisect/* and HEAD) are stored using\n+the traditional files-based backend.\n+\n+Reflogs are stored as a series of database entries.\n+\n+For non-empty reflogs, there is one entry per logged ref update. The\n+key format is logs/[refname]\\0[timestamp]. The timestamp is a 64-bit\n+unsigned integer number of nanoseconds since 1/1/1970, stored in\n+network byte order. This means that reflog entries are\n+chronologically ordered. Because LMDB is a btree database, we can\n+efficiently iterate over these keys.\n+\n+For an empty reflog, there is a \"header\" entry to show that a reflog\n+exists. The header has the same format as an ordinary reflog, but with\n+a timestamp of all zeros and an empty value.\n+\n+Reflog values are in the same format as the original files-based\n+reflog, including the trailing LF. The date in the reflog value\n+matches the date in the timestamp field.\n+\n+Weaknesses:\n+-----------\n+\n+The reflog format is somewhat inefficient: a binary format could store\n+reflog date/time information in somewhat less space.\n+\n+The rsync and file:// transports don't work yet, because they\n+don't use the refs API.\n+\n+git new-workdir is incompatible with the lmdb backend. Fortunately,\n+git new-workdir is deprecated, and worktrees work fine.\n+\n+LMDB locks the entire database for write. Any other writer waits\n+until the first writer is done before beginning. Readers do not wait\n+for writers, and writers do not wait for readers. The underlying\n+scheme is approximately MVCC; each reader's queries see the state of\n+the database as-of the time that the reader acquired its read lock.\n+This is not too far off from the files backend, which loads all refs\n+into memory when one is requested.\ndiff --git a/Documentation/technical/repository-version.txt b/Documentation/technical/repository-version.txt\nindex 00ad379..fca5ecd 100644\n--- a/Documentation/technical/repository-version.txt\n+++ b/Documentation/technical/repository-version.txt\n@@ -86,3 +86,8 @@ for testing format-1 compatibility.\n When the config key `extensions.preciousObjects` is set to `true`,\n objects in the repository MUST NOT be deleted (e.g., by `git-prune` or\n `git repack -d`).\n+\n+`refStorage`\n+~~~~~~~~~~~~\n+This extension allows the use of alternate ref storage backends. The\n+only defined value is `lmdb`.\ndiff --git a/Makefile b/Makefile\nindex 10566d6..fd80e94 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -1042,6 +1042,17 @@ ifdef USE_LIBPCRE\n \tEXTLIBS += -lpcre\n endif\n \n+ifdef USE_LIBLMDB\n+\tBASIC_CFLAGS += -DUSE_LIBLMDB\n+\tifdef LIBLMDBDIR\n+\t\tBASIC_CFLAGS += -I$(LIBLMDBDIR)/include\n+\t\tEXTLIBS += -L$(LIBLMDBDIR)/$(lib) $(CC_LD_DYNPATH)$(LIBLMDBDIR)/$(lib)\n+\tendif\n+\tEXTLIBS += -llmdb\n+\tLIB_OBJS += refs/lmdb-backend.o\n+\tTEST_PROGRAMS_NEED_X += test-refs-lmdb-backend\n+endif\n+\n ifdef HAVE_ALLOCA_H\n \tBASIC_CFLAGS += -DHAVE_ALLOCA_H\n endif\n@@ -2140,6 +2151,7 @@ GIT-BUILD-OPTIONS: FORCE\n \t@echo NO_CURL=\\''$(subst ','\\'',$(subst ','\\'',$(NO_CURL)))'\\' >>$@+\n \t@echo NO_EXPAT=\\''$(subst ','\\'',$(subst ','\\'',$(NO_EXPAT)))'\\' >>$@+\n \t@echo USE_LIBPCRE=\\''$(subst ','\\'',$(subst ','\\'',$(USE_LIBPCRE)))'\\' >>$@+\n+\t@echo USE_LIBLMDB=\\''$(subst ','\\'',$(subst ','\\'',$(USE_LIBLMDB)))'\\' >>$@+\n \t@echo NO_PERL=\\''$(subst ','\\'',$(subst ','\\'',$(NO_PERL)))'\\' >>$@+\n \t@echo NO_PYTHON=\\''$(subst ','\\'',$(subst ','\\'',$(NO_PYTHON)))'\\' >>$@+\n \t@echo NO_UNIX_SOCKETS=\\''$(subst ','\\'',$(subst ','\\'',$(NO_UNIX_SOCKETS)))'\\' >>$@+\ndiff --git a/configure.ac b/configure.ac\nindex 89e2590..3853bec 100644\n--- a/configure.ac\n+++ b/configure.ac\n@@ -271,6 +271,24 @@ AS_HELP_STRING([], [ARG can be also prefix for libpcre library and hea\n dnl it yet.\n \tGIT_CONF_SUBST([LIBPCREDIR])\n fi)\n+\n+USE_LIBLMDB=YesPlease\n+AC_ARG_WITH(liblmdb,\n+AS_HELP_STRING([--with-liblmdb],[support lmdb (default is YES])\n+AS_HELP_STRING([], [ARG can be also prefix for liblmdb library and headers]),\n+ if test \"$withval\" = \"no\"; then\n+\tUSE_LIBLMDB=\n+ elif test \"$withval\" = \"yes\"; then\n+\tUSE_LIBLMDB=YesPlease\n+ else\n+\tUSE_LIBLMDB=YesPlease\n+\tLIBLMDBDIR=$withval\n+\tAC_MSG_NOTICE([Setting LIBLMDBDIR to $LIBLMDBDIR])\n+ dnl USE_LIBLMDB can still be modified below, so don't substitute\n+ dnl it yet.\n+\tGIT_CONF_SUBST([LIBLMDBDIR])\n+ fi)\n+\n #\n # Define HAVE_ALLOCA_H if you have working alloca(3) defined in that header.\n AC_FUNC_ALLOCA\n@@ -510,6 +528,21 @@ GIT_CONF_SUBST([USE_LIBPCRE])\n \n fi\n \n+if test -n \"$USE_LIBLMDB\"; then\n+\n+GIT_STASH_FLAGS($LIBLMDBDIR)\n+\n+AC_CHECK_LIB([lmdb], [mdb_env_open],\n+[USE_LIBLMDB=YesPlease],\n+[USE_LIBLMDB=])\n+\n+GIT_UNSTASH_FLAGS($LIBLMDBDIR)\n+\n+GIT_CONF_SUBST([USE_LIBLMDB])\n+\n+fi\n+\n+\n #\n # Define NO_CURL if you do not have libcurl installed. git-http-pull and\n # git-http-push are not built, and you cannot use http:// and https://\ndiff --git a/contrib/workdir/git-new-workdir b/contrib/workdir/git-new-workdir\nindex 888c34a..d153ddf 100755\n--- a/contrib/workdir/git-new-workdir\n+++ b/contrib/workdir/git-new-workdir\n@@ -28,6 +28,9 @@ git_dir=$(cd \"$orig_git\" 2>/dev/null &&\n git rev-parse --git-dir 2>/dev/null) ||\n die \"Not a git repository: \\\"$orig_git\\\"\"\n \n+ref_storage=$(git config extensions.refstorage || echo \"files\")\n+test \"$ref_storage\" != \"files\" && die \"git-new-workdir is incompatible with ref storage other than 'files'\"\n+\n case \"$git_dir\" in\n .git)\n \tgit_dir=\"$orig_git/.git\"\ndiff --git a/path.c b/path.c\nindex 2e67a2b..347aba4 100644\n--- a/path.c\n+++ b/path.c\n@@ -112,6 +112,7 @@ static struct common_dir common_list[] = {\n \t{ 0, 1, 0, \"lost-found\" },\n \t{ 0, 1, 0, \"objects\" },\n \t{ 0, 1, 0, \"refs\" },\n+\t{ 0, 1, 0, \"refs.lmdb\" },\n \t{ 0, 1, 1, \"refs/bisect\" },\n \t{ 0, 1, 0, \"remotes\" },\n \t{ 0, 1, 0, \"worktrees\" },\ndiff --git a/refs.c b/refs.c\nindex dec7b5c..1b6815a 100644\n--- a/refs.c\n+++ b/refs.c\n@@ -310,8 +310,10 @@ static int submodule_backend(const char *key, const char *value, void *data)\n \tconst char **path = data;\n \tchar **old_path = data;\n \tif (!strcmp(key, \"extensions.refstorage\") &&\n-\t !git_config_string(path, key, \"extensions.refstorage\"))\n-\t\t\tfree(*old_path);\n+\t !git_config_string(path, key, \"extensions.refstorage\")) {\n+\t\tfree(*old_path);\n+\t\t*path = xstrdup(value);\n+\t}\n \n \treturn 0;\n }\n@@ -1584,4 +1586,7 @@ void register_ref_storage_backends(void) {\n \t * entries below when you add a new backend.\n \t */\n \tregister_ref_storage_backend(&refs_be_files);\n+#ifdef USE_LIBLMDB\n+\tregister_ref_storage_backend(&refs_be_lmdb);\n+#endif\n }\ndiff --git a/refs.h b/refs.h\nindex 363c6ee..ad6d097 100644\n--- a/refs.h\n+++ b/refs.h\n@@ -516,6 +516,8 @@ extern int reflog_expire(const char *refname, const unsigned char *sha1,\n int ref_storage_backend_config(const char *var, const char *value, void *ptr);\n \n struct ref_storage_be;\n+\n+extern struct ref_storage_be refs_be_lmdb;\n /*\n * Switch to an alternate ref storage backend.\n */\ndiff --git a/refs/lmdb-backend.c b/refs/lmdb-backend.c\nnew file mode 100644\nindex 0000000..6c0d7fb\n--- /dev/null\n+++ b/refs/lmdb-backend.c\n@@ -0,0 +1,1927 @@\n+/*\n+ * This file implements a lmdb backend for refs.\n+ *\n+ * The design of this backend relies on lmdb's write lock -- that is, any\n+ * write transaction blocks all other writers. Thus, as soon as a ref\n+ * transaction is opened, we know that any values we read won't\n+ * change out from under us, and we have a fully-consistent view of the\n+ * database.\n+ *\n+ * We store the content of refs including the trailing \\0 so that\n+ * standard C string functions can handle them. Just like struct\n+ * strbuf.\n+ */\n+#include \"../cache.h\"\n+#include \n+#include \"../object.h\"\n+#include \"../refs.h\"\n+#include \"refs-internal.h\"\n+#include \"../tag.h\"\n+#include \"../lockfile.h\"\n+\n+static MDB_env *env;\n+\n+static char *db_path;\n+\n+struct lmdb_transaction {\n+\tMDB_txn *txn;\n+\tMDB_dbi dbi;\n+\tMDB_cursor *cursor;\n+\tconst char *submodule;\n+\tint flags;\n+};\n+\n+struct lmdb_transaction transaction;\n+\n+static int in_write_transaction(void)\n+{\n+\treturn transaction.txn && !(transaction.flags & MDB_RDONLY);\n+}\n+\n+static void init_env(MDB_env **env, const char *path)\n+{\n+\tint ret;\n+\tif (*env)\n+\t\treturn;\n+\n+\tassert(path);\n+\n+\tret = mdb_env_create(env);\n+\tif (ret)\n+\t\tdie(\"BUG: mdb_env_create failed: %s\", mdb_strerror(ret));\n+\tret = mdb_env_set_maxreaders(*env, 1000);\n+\tif (ret)\n+\t\tdie(\"BUG: mdb_env_set_maxreaders failed: %s\", mdb_strerror(ret));\n+\tret = mdb_env_set_mapsize(*env, (1<<30));\n+\tif (ret)\n+\t\tdie(\"BUG: mdb_set_mapsize failed: %s\", mdb_strerror(ret));\n+\tret = mdb_env_open(*env, path, 0 , 0664);\n+\tif (ret)\n+\t\tdie(\"BUG: mdb_env_open (%s) failed: %s\", path,\n+\t\t mdb_strerror(ret));\n+}\n+\n+static int lmdb_init_db(int shared, struct strbuf *err)\n+{\n+\t/*\n+\t * To create a db, all we need to do is make a directory for\n+\t * it to live in; lmdb will do the rest.\n+\t */\n+\n+\tif (!db_path)\n+\t\tdb_path = xstrdup(real_path(git_path(\"refs.lmdb\")));\n+\n+\tif (mkdir(db_path, 0775) && errno != EEXIST) {\n+\t\tstrbuf_addf(err, \"%s\", strerror(errno));\n+\t\treturn -1;\n+\t}\n+\n+\treturn 0;\n+}\n+\n+static void mdb_cursor_open_or_die(struct lmdb_transaction *transaction,\n+\t\t\t\t MDB_cursor **cursor)\n+{\n+\tint ret = mdb_cursor_open(transaction->txn, transaction->dbi, cursor);\n+\tif (ret)\n+\t\tdie(\"BUG: mdb_cursor_open failed: %s\", mdb_strerror(ret));\n+}\n+\n+static void submodule_path(struct strbuf *sb, const char *submodule,\n+\t\t\t const char *refname)\n+{\n+\tif (submodule)\n+\t\tstrbuf_git_path_submodule(sb, submodule, \"%s\", refname);\n+\telse\n+\t\tstrbuf_git_path(sb, \"%s\", refname);\n+}\n+\n+static int read_per_worktree_ref(const char *submodule, const char *refname,\n+\t\t\t\t struct MDB_val *val, int *needs_free)\n+{\n+\tstruct strbuf sb = STRBUF_INIT;\n+\tstruct strbuf path = STRBUF_INIT;\n+\tstruct stat st;\n+\tint ret = -1;\n+\n+\tsubmodule_path(&path, submodule, refname);\n+\n+#ifndef NO_SYMLINK_HEAD\n+\tif (lstat(path.buf, &st)) {\n+\t\tif (errno == ENOENT)\n+\t\t\tret = MDB_NOTFOUND;\n+\t\tgoto done;\n+\t}\n+\tif (S_ISLNK(st.st_mode)) {\n+\t\tstrbuf_readlink(&sb, path.buf, 0);\n+\t\tif (starts_with(sb.buf, \"refs/\") &&\n+\t\t !check_refname_format(sb.buf, 0)) {\n+\t\t\tval->mv_data = xstrfmt(\"ref: %s\", sb.buf);\n+\t\t\tval->mv_size = strlen(val->mv_data) + 1;\n+\t\t\tret = 0;\n+\t\t} else {\n+\t\t\tret = MDB_NOTFOUND;\n+\t\t}\n+\t\tstrbuf_release(&sb);\n+\t\tgoto done;\n+\t}\n+#endif\n+\n+\tif (strbuf_read_file(&sb, path.buf, 200) < 0) {\n+\t\tstrbuf_release(&sb);\n+\t\tif (errno == ENOENT)\n+\t\t\tret = MDB_NOTFOUND;\n+\t\tgoto done;\n+\t}\n+\tstrbuf_rtrim(&sb);\n+\n+\tval->mv_data = strbuf_detach(&sb, &val->mv_size);\n+\tval->mv_size++;\n+\n+\tret = 0;\n+done:\n+\tstrbuf_release(&path);\n+\t*needs_free = !ret;\n+\treturn ret;\n+}\n+\n+static void write_per_worktree_ref(const char *submodule, const char *refname,\n+\t\t\t\t MDB_val *val)\n+{\n+\tstatic struct lock_file lock;\n+\tint fd;\n+\tint len = val->mv_size - 1;\n+\tstruct strbuf path = STRBUF_INIT;\n+\n+\tsubmodule_path(&path, submodule, refname);\n+\tsafe_create_leading_directories(path.buf);\n+\n+\tfd = hold_lock_file_for_update(&lock, path.buf, LOCK_DIE_ON_ERROR);\n+\tstrbuf_release(&path);\n+\n+\tif (write_in_full(fd, val->mv_data, len) != len ||\n+\t write_in_full(fd, \"\\n\", 1) != 1)\n+\t\tdie_errno(_(\"failed to write new HEAD\"));\n+\n+\tif (commit_lock_file(&lock))\n+\t\tdie_errno(_(\"failed to write new HEAD\"));\n+}\n+\n+static int del_per_worktree_ref(const char *submodule, const char *refname,\n+\t\t\t\tMDB_val *val)\n+{\n+\tstruct strbuf path = STRBUF_INIT;\n+\tint result;\n+\n+\t/*\n+\t * Returning deleted ref data is not yet implemented, but no\n+\t * callers need it.\n+\t */\n+\tassert(val == NULL);\n+\n+\tsubmodule_path(&path, submodule, refname);\n+\n+\tresult = unlink(path.buf);\n+\tstrbuf_release(&path);\n+\tif (result && errno != ENOENT)\n+\t\treturn 1;\n+\n+\treturn 0;\n+}\n+\n+/*\n+ * Read a ref. If the ref is a per-worktree ref, read it from disk.\n+ * Otherwise, read it from LMDB. LMDB manages its own memory, so the\n+ * data returned in *val will ordinarily not need to be freed. But\n+ * when a per-worktree ref is (successfully) read, non-LMDB memory is\n+ * allocated. In this case, *needs_free is set so that the caller can\n+ * free the memory when it is done with it.\n+ */\n+static int mdb_get_or_die(struct lmdb_transaction *transaction, MDB_val *key,\n+\t\t\t MDB_val *val, int *needs_free)\n+{\n+\tint ret;\n+\n+\tif (ref_type(key->mv_data) != REF_TYPE_NORMAL)\n+\t\treturn read_per_worktree_ref(transaction->submodule,\n+\t\t\t\t\t key->mv_data, val, needs_free);\n+\n+\t*needs_free = 0;\n+\tret = mdb_get(transaction->txn, transaction->dbi, key, val);\n+\tif (ret) {\n+\t\tif (ret != MDB_NOTFOUND)\n+\t\t\tdie(\"BUG: mdb_get failed: %s\", mdb_strerror(ret));\n+\t\treturn ret;\n+\t}\n+\treturn 0;\n+}\n+\n+static int mdb_del_or_die(struct lmdb_transaction *transaction, MDB_val *key,\n+\t\t\t MDB_val *val)\n+{\n+\tint ret;\n+\n+\tif (ref_type(key->mv_data) != REF_TYPE_NORMAL)\n+\t\tdie(\"BUG: this backend should only try to delete normal refs\");\n+\n+\tret = mdb_del(transaction->txn, transaction->dbi, key, val);\n+\tif (ret) {\n+\t\tif (ret != MDB_NOTFOUND)\n+\t\t\tdie(\"BUG: mdb_del failed: %s\", mdb_strerror(ret));\n+\t\treturn ret;\n+\t}\n+\treturn 0;\n+}\n+\n+static void mdb_put_or_die(struct lmdb_transaction *transaction, MDB_val *key,\n+\t\t\t MDB_val *val, int mode)\n+{\n+\tint ret;\n+\n+\tif (ref_type(key->mv_data) != REF_TYPE_NORMAL)\n+\t\tdie(\"BUG: this backend should only try to write normal refs\");\n+\n+\tret = mdb_put(transaction->txn, transaction->dbi, key, val, mode);\n+\tif (ret) {\n+\t\tif (ret == MDB_BAD_VALSIZE)\n+\t\t\tdie(_(\"Ref name %s too long (max size is %d)\"),\n+\t\t\t (const char *)key->mv_data,\n+\t\t\t mdb_env_get_maxkeysize(env));\n+\t\telse\n+\t\t\tdie(\"BUG: mdb_put failed: (%s -> %s) %s\",\n+\t\t\t (const char *)key->mv_data,\n+\t\t\t (const char *)val->mv_data, mdb_strerror(ret));\n+\t}\n+}\n+\n+static int mdb_cursor_get_or_die(MDB_cursor *cursor, MDB_val *key, MDB_val *val, int mode)\n+{\n+\tint ret;\n+\n+\tret = mdb_cursor_get(cursor, key, val, mode);\n+\tif (ret) {\n+\t\tif (ret != MDB_NOTFOUND)\n+\t\t\tdie(\"BUG: mdb_cursor_get failed: %s\", mdb_strerror(ret));\n+\t\treturn ret;\n+\t}\n+\tassert(((char *)val->mv_data)[val->mv_size - 1] == 0);\n+\treturn 0;\n+}\n+\n+static int mdb_cursor_del_or_die(MDB_cursor *cursor, int flags)\n+{\n+\tint ret = mdb_cursor_del(cursor, flags);\n+\tif (ret) {\n+\t\tif (ret != MDB_NOTFOUND)\n+\t\t\tdie(\"BUG: mdb_cursor_del failed: %s\", mdb_strerror(ret));\n+\t\treturn ret;\n+\t}\n+\treturn 0;\n+}\n+\n+/*\n+ * Begin a transaction. Because only one transaction per thread is\n+ * permitted, we use a global transaction object. If a read-write\n+ * transaction is presently already in-progress, and a read-only\n+ * transaction is requested, the read-write transaction will be\n+ * returned instead. If a read-write transaction is requested and a\n+ * read-only transaction is open, the read-only transaction will be\n+ * closed.\n+ *\n+ * It is a bug to request a read-write transaction during another\n+ * read-write transaction.\n+ *\n+ * As a result, it is unsafe to retain read-only transactions past the\n+ * point where a read-write transaction might be needed. For\n+ * instance, any call that has callbacks outside this module must\n+ * conclude all of its reads from the database before calling those\n+ * callbacks, or must reacquire the transaction after its callbacks\n+ * are completed.\n+ */\n+int lmdb_transaction_begin_flags(struct strbuf *err, unsigned int flags)\n+{\n+\tint ret;\n+\tMDB_txn *txn;\n+\tstatic size_t last_txnid = 0;\n+\tint force_restart = 0;\n+\tMDB_envinfo stat;\n+\n+\tif (!db_path)\n+\t\tdb_path = xstrdup(real_path(git_path(\"refs.lmdb\")));\n+\tinit_env(&env, db_path);\n+\n+\t/*\n+\t * Since each transaction sees a consistent view of the db,\n+\t * downstream processes that write the db won't be seen in\n+\t * this transaction. We can check if the last transaction id\n+\t * has changed since this read transaction was started, and if\n+\t * so, we want to reopen the transaction.\n+\t */\n+\n+\tmdb_env_info(env, &stat);\n+\tif (stat.me_last_txnid != last_txnid) {\n+\t\tforce_restart = 1;\n+\t\tlast_txnid = stat.me_last_txnid;\n+\t}\n+\n+\tif (!transaction.txn) {\n+\t\tret = mdb_txn_begin(env, NULL, flags, &txn);\n+\t\tif (ret) {\n+\t\t\tstrbuf_addf(err, \"BUG: mdb_txn_begin failed: %s\",\n+\t\t\t\t mdb_strerror(ret));\n+\t\t\treturn -1;\n+\t\t}\n+\t\tret = mdb_dbi_open(txn, NULL, 0, &transaction.dbi);\n+\t\tif (ret) {\n+\t\t\tstrbuf_addf(err, \"BUG: mdb_txn_open failed: %s\",\n+\t\t\t\t mdb_strerror(ret));\n+\t\t\treturn -1;\n+\t\t}\n+\t\ttransaction.txn = txn;\n+\t\ttransaction.flags = flags;\n+\t\treturn 0;\n+\t}\n+\n+\tif (transaction.flags == flags && !(flags & MDB_RDONLY))\n+\t\tdie(\"BUG: rw transaction started during another rw txn\");\n+\n+\tif (force_restart || (transaction.flags != flags && transaction.flags & MDB_RDONLY)) {\n+\t\t/*\n+\t\t * RO -> RW, or forced restart due to possible changes\n+\t\t * from downstream processes.\n+\t\t */\n+\t\tmdb_txn_abort(transaction.txn);\n+\t\tret = mdb_txn_begin(env, NULL, flags, &txn);\n+\t\tif (ret) {\n+\t\t\tstrbuf_addf(err, \"BUG: restarting txn: mdb_txn_begin failed: %s\",\n+\t\t\t\t mdb_strerror(ret));\n+\t\t\treturn -1;\n+\t\t}\n+\t\tret = mdb_dbi_open(txn, NULL, 0, &transaction.dbi);\n+\t\tif (ret) {\n+\t\t\tstrbuf_addf(err, \"BUG: mdb_txn_open failed: %s\",\n+\t\t\t\t mdb_strerror(ret));\n+\t\t\treturn -1;\n+\t\t}\n+\t\ttransaction.txn = txn;\n+\t\ttransaction.flags = flags;\n+\t}\n+\t/* RW -> RO just keeps the RW txn */\n+\treturn 0;\n+}\n+\n+static struct lmdb_transaction *lmdb_transaction_begin_flags_or_die(int flags)\n+{\n+\tstruct strbuf err = STRBUF_INIT;\n+\tif (lmdb_transaction_begin_flags(&err, flags))\n+\t\tdie(\"%s\", err.buf);\n+\treturn &transaction;\n+}\n+\n+#define MAXDEPTH 5\n+\n+static const char *parse_ref_data(struct lmdb_transaction *transaction,\n+\t\t\t\t const char *refname, const char *ref_data,\n+\t\t\t\t unsigned char *sha1, int resolve_flags,\n+\t\t\t\t int *flags, int bad_name)\n+{\n+\tint depth = MAXDEPTH;\n+\tconst char *buf;\n+\tstatic struct strbuf refname_buffer = STRBUF_INIT;\n+\tstatic struct strbuf refdata_buffer = STRBUF_INIT;\n+\tMDB_val key, val;\n+\tint needs_free = 0;\n+\n+\tfor (;;) {\n+\t\tif (--depth < 0)\n+\t\t\treturn NULL;\n+\n+\t\tif (!starts_with(ref_data, \"ref:\")) {\n+\t\t\tif (get_sha1_hex(ref_data, sha1) ||\n+\t\t\t (ref_data[40] != '\\0' && !isspace(ref_data[40]))) {\n+\t\t\t\tif (flags)\n+\t\t\t\t\t*flags |= REF_ISBROKEN;\n+\t\t\t\terrno = EINVAL;\n+\t\t\t\treturn NULL;\n+\t\t\t}\n+\n+\t\t\tif (bad_name) {\n+\t\t\t\thashclr(sha1);\n+\t\t\t\tif (flags)\n+\t\t\t\t\t*flags |= REF_ISBROKEN;\n+\t\t\t} else if (is_null_sha1(sha1)) {\n+\t\t\t\tif (flags)\n+\t\t\t\t\t*flags |= REF_ISBROKEN;\n+\t\t\t}\n+\t\t\treturn refname;\n+\t\t}\n+\t\tif (flags)\n+\t\t\t*flags |= REF_ISSYMREF;\n+\t\tbuf = ref_data + 4;\n+\t\twhile (isspace(*buf))\n+\t\t\tbuf++;\n+\t\tstrbuf_reset(&refname_buffer);\n+\t\tstrbuf_addstr(&refname_buffer, buf);\n+\t\trefname = refname_buffer.buf;\n+\t\tif (resolve_flags & RESOLVE_REF_NO_RECURSE) {\n+\t\t\thashclr(sha1);\n+\t\t\treturn refname;\n+\t\t}\n+\t\tif (check_refname_format(buf, REFNAME_ALLOW_ONELEVEL)) {\n+\t\t\tif (flags)\n+\t\t\t\t*flags |= REF_ISBROKEN;\n+\n+\t\t\tif (!(resolve_flags & RESOLVE_REF_ALLOW_BAD_NAME) ||\n+\t\t\t !refname_is_safe(buf)) {\n+\t\t\t\terrno = EINVAL;\n+\t\t\t\treturn NULL;\n+\t\t\t}\n+\t\t\tbad_name = 1;\n+\t\t}\n+\n+\t\tkey.mv_data = (char *)refname;\n+\t\tkey.mv_size = strlen(refname) + 1;\n+\t\tif (mdb_get_or_die(transaction, &key, &val, &needs_free)) {\n+\t\t\thashclr(sha1);\n+\t\t\tif (bad_name) {\n+\t\t\t\tif (flags)\n+\t\t\t\t\t*flags |= REF_ISBROKEN;\n+\t\t\t}\n+\t\t\tif (resolve_flags & RESOLVE_REF_READING)\n+\t\t\t\treturn NULL;\n+\n+\t\t\treturn refname;\n+\t\t}\n+\t\tstrbuf_reset(&refdata_buffer);\n+\t\tstrbuf_add(&refdata_buffer, val.mv_data, val.mv_size);\n+\t\tif (needs_free)\n+\t\t\tfree(val.mv_data);\n+\t\tref_data = refdata_buffer.buf;\n+\t}\n+\treturn refname;\n+}\n+\n+static int verify_refname_available_txn(struct lmdb_transaction *transaction,\n+\t\t\t\t\tconst char *refname,\n+\t\t\t\t\tstruct string_list *extras,\n+\t\t\t\t\tstruct string_list *skip,\n+\t\t\t\t\tstruct strbuf *err)\n+{\n+\tMDB_cursor *cursor;\n+\tMDB_val key;\n+\tMDB_val val;\n+\tint mdb_ret;\n+\tsize_t refname_len;\n+\tchar *search_key;\n+\tconst char *extra_refname;\n+\tint ret = 1;\n+\tsize_t i;\n+\n+\tmdb_cursor_open_or_die(transaction, &cursor);\n+\n+\trefname_len = strlen(refname) + 2;\n+\tkey.mv_size = refname_len;\n+\tsearch_key = xmalloc(refname_len);\n+\tmemcpy(search_key, refname, refname_len - 2);\n+\tsearch_key[refname_len - 2] = '/';\n+\tsearch_key[refname_len - 1] = 0;\n+\tkey.mv_data = search_key;\n+\n+\t/* Check for subdirs of refname: we start at refname/ */\n+\tmdb_ret = mdb_cursor_get_or_die(cursor, &key, &val, MDB_SET_RANGE);\n+\n+\twhile (!mdb_ret) {\n+\t\tif (starts_with(key.mv_data, refname) &&\n+\t\t ((char *)key.mv_data)[refname_len - 2] == '/') {\n+\t\t\tif (skip && string_list_has_string(skip, key.mv_data))\n+\t\t\t\tgoto next;\n+\n+\t\t\tstrbuf_addf(err, _(\"'%s' exists; cannot create '%s'\"), (char *)key.mv_data, refname);\n+\t\t\tgoto done;\n+\t\t}\n+\t\tbreak;\n+\tnext:\n+\t\tmdb_ret = mdb_cursor_get_or_die(cursor, &key, &val, MDB_NEXT);\n+\t}\n+\n+\t/* Check for parent dirs of refname. */\n+\tfor (i = 0; i < refname_len - 2; i++) {\n+\t\tif (search_key[i] == '/') {\n+\t\t\tsearch_key[i] = 0;\n+\t\t\tif (skip && string_list_has_string(skip, search_key)) {\n+\t\t\t\tsearch_key[i] = '/';\n+\t\t\t\tcontinue;\n+\t\t\t}\n+\n+\t\t\tif (extras && string_list_has_string(extras, search_key)) {\n+\t\t\t\tstrbuf_addf(err, _(\"cannot process '%s' and '%s' at the same time\"),\n+\t\t\t\t\t refname, search_key);\n+\t\t\t\tgoto done;\n+\t\t\t}\n+\n+\t\t\tkey.mv_data = search_key;\n+\t\t\tkey.mv_size = i + 1;\n+\t\t\tif (!mdb_cursor_get_or_die(cursor, &key, &val, MDB_SET)) {\n+\t\t\t\tstrbuf_addf(err, _(\"'%s' exists; cannot create '%s'\"), (char *)key.mv_data, refname);\n+\t\t\t\tgoto done;\n+\t\t\t}\n+\t\t\tsearch_key[i] = '/';\n+\t\t}\n+\t}\n+\n+\textra_refname = find_descendant_ref(refname, extras, skip);\n+\tif (extra_refname) {\n+\t\tstrbuf_addf(err,\n+\t\t\t _(\"cannot process '%s' and '%s' at the same time\"),\n+\t\t\t refname, extra_refname);\n+\t\tret = 1;\n+\t} else {\n+\t\tret = 0;\n+\t}\n+done:\n+\tmdb_cursor_close(cursor);\n+\tfree(search_key);\n+\treturn ret;\n+}\n+\n+static const char *resolve_ref_unsafe_txn(struct lmdb_transaction *transaction,\n+\t\t\t\t\t const char *refname,\n+\t\t\t\t\t int resolve_flags,\n+\t\t\t\t\t unsigned char *sha1,\n+\t\t\t\t\t int *flags)\n+{\n+\tint bad_name = 0;\n+\tchar *ref_data;\n+\tstruct MDB_val key, val;\n+\tstruct strbuf err = STRBUF_INIT;\n+\tint needs_free = 0;\n+\tconst char *ret;\n+\n+\tval.mv_size = 0;\n+\tval.mv_data = NULL;\n+\n+\tif (flags)\n+\t\t*flags = 0;\n+\n+\tif (check_refname_format(refname, REFNAME_ALLOW_ONELEVEL)) {\n+\t\tif (flags)\n+\t\t\t*flags |= REF_BAD_NAME;\n+\n+\t\tif (!(resolve_flags & RESOLVE_REF_ALLOW_BAD_NAME) ||\n+\t\t !refname_is_safe(refname)) {\n+\t\t\terrno = EINVAL;\n+\t\t\treturn NULL;\n+\t\t}\n+\t\t/*\n+\t\t * dwim_ref() uses REF_ISBROKEN to distinguish between\n+\t\t * missing refs and refs that were present but invalid,\n+\t\t * to complain about the latter to stderr.\n+\t\t *\n+\t\t * We don't know whether the ref exists, so don't set\n+\t\t * REF_ISBROKEN yet.\n+\t\t */\n+\t\tbad_name = 1;\n+\t}\n+\n+\tkey.mv_data = (void *)refname;\n+\tkey.mv_size = strlen(refname) + 1;\n+\tif (mdb_get_or_die(transaction, &key, &val, &needs_free)) {\n+\t\tif (bad_name) {\n+\t\t\thashclr(sha1);\n+\t\t\tif (flags)\n+\t\t\t\t*flags |= REF_ISBROKEN;\n+\t\t}\n+\n+\t\tif (resolve_flags & RESOLVE_REF_READING)\n+\t\t\treturn NULL;\n+\n+\t\tif (verify_refname_available_txn(transaction, refname, NULL, NULL, &err)) {\n+\t\t\terror(\"%s\", err.buf);\n+\t\t\tstrbuf_release(&err);\n+\t\t\treturn NULL;\n+\t\t}\n+\n+\t\thashclr(sha1);\n+\t\treturn refname;\n+\t}\n+\n+\tref_data = val.mv_data;\n+\tassert(ref_data[val.mv_size - 1] == 0);\n+\n+\tret = parse_ref_data(transaction, refname, ref_data, sha1,\n+\t\t\t resolve_flags, flags, bad_name);\n+\tif (needs_free)\n+\t\tfree(ref_data);\n+\treturn ret;\n+}\n+\n+static const char *lmdb_resolve_ref_unsafe(const char *refname, int resolve_flags,\n+\t\t\t\t\t unsigned char *sha1, int *flags)\n+{\n+\tlmdb_transaction_begin_flags_or_die(MDB_RDONLY);\n+\treturn resolve_ref_unsafe_txn(&transaction, refname,\n+\t\t\t\t resolve_flags, sha1, flags);\n+}\n+\n+static void write_u64(char *buf, uint64_t number)\n+{\n+\tint i;\n+\n+\tfor (i = 0; i < 8; i++)\n+\t\tbuf[i] = (number >> (i * 8)) & 0xff;\n+}\n+\n+static int show_one_reflog_ent(struct strbuf *sb, each_reflog_ent_fn fn, void *cb_data)\n+{\n+\tunsigned char osha1[20], nsha1[20];\n+\tchar *email_end, *message;\n+\tunsigned long timestamp;\n+\tint tz;\n+\n+\t/* old (raw sha) new (raw sha) name SP time TAB msg LF */\n+\tif (sb->len < 41 || sb->buf[sb->len - 1] != '\\n' ||\n+\t !(email_end = strchr(sb->buf + 40, '>')) ||\n+\t email_end[1] != ' ')\n+\t\treturn 0; /* corrupt? */\n+\n+\ttimestamp = strtoul(email_end + 2, &message, 10);\n+\n+\tif (!timestamp ||\n+\t !message || message[0] != ' ' ||\n+\t (message[1] != '+' && message[1] != '-') ||\n+\t !isdigit(message[2]) || !isdigit(message[3]) ||\n+\t !isdigit(message[4]) || !isdigit(message[5]))\n+\t\treturn 0; /* corrupt? */\n+\n+\thashcpy(osha1, (const unsigned char *)sb->buf);\n+\thashcpy(nsha1, (const unsigned char *)sb->buf + 20);\n+\n+\temail_end[1] = '\\0';\n+\ttz = strtol(message + 1, NULL, 10);\n+\tif (message[6] != '\\t')\n+\t\tmessage += 6;\n+\telse\n+\t\tmessage += 7;\n+\treturn fn(osha1, nsha1, sb->buf + 40, timestamp, tz, message, cb_data);\n+}\n+\n+static void format_reflog_entry(struct strbuf *buf,\n+\t\t\t\tconst unsigned char *old_sha1,\n+\t\t\t\tconst unsigned char *new_sha1,\n+\t\t\t\tconst char *committer, const char *msg)\n+{\n+\tint len;\n+\tint msglen;\n+\n+\tassert(buf->len == 0);\n+\tstrbuf_add(buf, old_sha1, 20);\n+\tstrbuf_add(buf, new_sha1, 20);\n+\tstrbuf_addstr(buf, committer);\n+\tstrbuf_addch(buf, '\\n');\n+\n+\tlen = buf->len;\n+\tmsglen = msg ? strlen(msg) : 0;\n+\tif (msglen) {\n+\t\tint copied;\n+\t\tstrbuf_grow(buf, msglen + 1);\n+\t\tcopied = copy_reflog_msg(buf->buf + 40 + strlen(committer), msg) - 1;\n+\t\tbuf->len = len + copied;\n+\t\tbuf->buf[buf->len] = 0;\n+\t}\n+}\n+\n+static int log_ref_write(const char *refname,\n+\t\t\t const unsigned char *old_sha1,\n+\t\t\t const unsigned char *new_sha1,\n+\t\t\t const char *msg,\n+\t\t\t int flags,\n+\t\t\t struct strbuf *err)\n+{\n+\tMDB_val key, val;\n+\tuint64_t now = getnanotime();\n+\tint result;\n+\tstruct strbuf log_key = STRBUF_INIT;\n+\tint refname_len;\n+\tMDB_cursor *cursor;\n+\tstruct strbuf buf = STRBUF_INIT;\n+\tconst char *timestamp;\n+\tuint64_t zero = 0;\n+\n+\tif (log_all_ref_updates < 0)\n+\t\tlog_all_ref_updates = !is_bare_repository();\n+\n+\t/* it is assumed that we are in a ref transaction here */\n+\tassert(transaction.txn);\n+\n+\tresult = safe_create_reflog(refname, flags & REF_FORCE_CREATE_REFLOG, err);\n+\tif (result)\n+\t\treturn result;\n+\n+\t/* \"logs/\" + refname + \\0 + 8-byte timestamp for sorting and expiry. */\n+\trefname_len = strlen(refname);\n+\n+\tstrbuf_addf(&log_key, \"logs/%s\", refname);\n+\tstrbuf_add(&log_key, &zero, 8);\n+\tkey.mv_data = log_key.buf;\n+\tkey.mv_size = log_key.len + 1;\n+\n+\tmdb_cursor_open_or_die(&transaction, &cursor);\n+\n+\t/* if no reflog exists, we're done */\n+\tif (mdb_cursor_get_or_die(cursor, &key, &val, MDB_SET_RANGE) ||\n+\t strcmp(key.mv_data, log_key.buf))\n+\t\tgoto done;\n+\n+\t/* Is this a header? We only need the header for empty reflogs */\n+\ttimestamp = (const char *)key.mv_data + refname_len + 6;\n+\tif (ntohll(*(uint64_t *)timestamp) == 0)\n+\t\tmdb_cursor_del_or_die(cursor, 0);\n+\n+\tkey.mv_data = log_key.buf;\n+\n+\twrite_u64((char *)key.mv_data + refname_len + 6, htonll(now));\n+\n+\tformat_reflog_entry(&buf, old_sha1, new_sha1,\n+\t\t\t git_committer_info(0), msg);\n+\tassert(buf.len >= 42);\n+\tval.mv_data = buf.buf;\n+\tval.mv_size = buf.len + 1;\n+\n+\tmdb_put_or_die(&transaction, &key, &val, 0);\n+\tstrbuf_release(&buf);\n+\n+done:\n+\tstrbuf_release(&log_key);\n+\tmdb_cursor_close(cursor);\n+\treturn 0;\n+}\n+\n+static int lmdb_verify_refname_available(const char *refname,\n+\t\t\t\t\t struct string_list *extras,\n+\t\t\t\t\t struct string_list *skip,\n+\t\t\t\t\t struct strbuf *err)\n+{\n+\tlmdb_transaction_begin_flags_or_die(MDB_RDONLY);\n+\treturn verify_refname_available_txn(&transaction, refname, extras, skip, err);\n+}\n+\n+/*\n+ * Attempt to resolve `refname` to `old_sha1` (if old_sha1 is\n+ * non-null). The return value is a pointer to a newly-allocated\n+ * string containing the next ref name that this resolves to. So if\n+ * HEAD is a symbolic ref to refs/heads/example, which is itself a\n+ * symbolic ref to refs/heads/foo, return refs/heads/example,\n+ * and fill in resolved_sha1 with the sha of refs/heads/foo.\n+ */\n+static char *check_ref(MDB_txn *txn, const char *refname,\n+\t\t const unsigned char *old_sha1,\n+\t\t unsigned char *resolved_sha1, int flags,\n+\t\t int *type_p)\n+{\n+\tint mustexist = (old_sha1 && !is_null_sha1(old_sha1));\n+\tint resolve_flags = 0;\n+\tint type;\n+\tchar *resolved_refname;\n+\n+\tif (mustexist)\n+\t\tresolve_flags |= RESOLVE_REF_READING;\n+\tif (flags & REF_DELETING) {\n+\t\tresolve_flags |= RESOLVE_REF_ALLOW_BAD_NAME;\n+\t\tif (flags & REF_NODEREF)\n+\t\t\tresolve_flags |= RESOLVE_REF_NO_RECURSE;\n+\t}\n+\n+\t/*\n+\t * The first time we resolve the refname, we're just trying to\n+\t * see if there is any ref at all by this name, even if it is\n+\t * a broken symref.\n+\t */\n+\trefname = resolve_ref_unsafe(refname, resolve_flags,\n+\t\t\t\t resolved_sha1, &type);\n+\tif (type_p)\n+\t\t*type_p = type;\n+\n+\tif (!refname)\n+\t\treturn NULL;\n+\n+\t/*\n+\t * Need to copy refname here because the resolve_ref_unsafe\n+\t * returns a pointer to a static buffer that could get mangled\n+\t * by the second call.\n+\t */\n+\tresolved_refname = xstrdup(refname);\n+\n+\tif (old_sha1) {\n+\t\tif (flags & REF_NODEREF) {\n+\t\t\tresolve_flags &= ~RESOLVE_REF_NO_RECURSE;\n+\n+\t\t\tresolve_ref_unsafe(refname, resolve_flags,\n+\t\t\t\t\t resolved_sha1, &type);\n+\t\t}\n+\t\tif (hashcmp(old_sha1, resolved_sha1)) {\n+\t\t\terror(_(\"ref %s is at %s but expected %s\"), refname,\n+\t\t\t sha1_to_hex(resolved_sha1), sha1_to_hex(old_sha1));\n+\n+\t\t\treturn NULL;\n+\t\t}\n+\t}\n+\treturn resolved_refname;\n+}\n+\n+static int mdb_transaction_commit(struct lmdb_transaction *transaction,\n+\t\t\t\t struct strbuf *err)\n+{\n+\tint result;\n+\n+\tresult = mdb_txn_commit(transaction->txn);\n+\tif (result && err)\n+\t\tstrbuf_addstr(err, mdb_strerror(result));\n+\n+\ttransaction->txn = NULL;\n+\treturn result;\n+}\n+\n+static int lmdb_delete_reflog(const char *refname)\n+{\n+\tMDB_val key, val;\n+\tchar *log_path;\n+\tint len;\n+\tMDB_cursor *cursor;\n+\tint ret = 0;\n+\tint mdb_ret;\n+\tstruct strbuf err = STRBUF_INIT;\n+\tint in_transaction;\n+\n+\tif (ref_type(refname) != REF_TYPE_NORMAL)\n+\t\treturn refs_be_files.delete_reflog(refname);\n+\n+\tin_transaction = in_write_transaction();\n+\n+\tlog_path = xstrfmt(\"logs/%s\", refname);\n+\tlen = strlen(log_path) + 1;\n+\n+\tkey.mv_data = log_path;\n+\tkey.mv_size = len;\n+\n+\tif (!in_transaction)\n+\t\tlmdb_transaction_begin_flags_or_die(0);\n+\n+\tmdb_cursor_open_or_die(&transaction, &cursor);\n+\n+\tmdb_ret = mdb_cursor_get_or_die(cursor, &key, &val, MDB_SET_RANGE);\n+\n+\twhile (!mdb_ret) {\n+\t\tif (key.mv_size < len)\n+\t\t\tbreak;\n+\n+\t\tif (!starts_with(key.mv_data, log_path) ||\n+\t\t ((char *)key.mv_data)[len - 1] != 0)\n+\t\t\tbreak;\n+\n+\t\tmdb_cursor_del_or_die(cursor, 0);\n+\t\tmdb_ret = mdb_cursor_get_or_die(cursor, &key, &val, MDB_NEXT);\n+\t}\n+\n+\tfree(log_path);\n+\tmdb_cursor_close(cursor);\n+\ttransaction.cursor = NULL;\n+\n+\tif (!in_transaction && mdb_transaction_commit(&transaction, &err)) {\n+\t\twarning(\"%s\", err.buf);\n+\t\tret = 01;\n+\t}\n+\tstrbuf_release(&err);\n+\treturn ret;\n+}\n+\n+#define REF_NO_REFLOG 0x8000\n+\n+static int lmdb_transaction_update(const char *refname,\n+\t\t\t\t const unsigned char *new_sha1,\n+\t\t\t\t const unsigned char *old_sha1,\n+\t\t\t\t unsigned int flags, const char *msg,\n+\t\t\t\t struct strbuf *err)\n+{\n+\tconst char *orig_refname = refname;\n+\tMDB_val key, val;\n+\tunsigned char resolved_sha1[20];\n+\tint type;\n+\tint ret = -1;\n+\n+\tif ((flags & REF_HAVE_NEW) && is_null_sha1(new_sha1))\n+\t\tflags |= REF_DELETING;\n+\n+\tif (new_sha1 && !is_null_sha1(new_sha1) &&\n+\t check_refname_format(refname, REFNAME_ALLOW_ONELEVEL)) {\n+\t\tstrbuf_addf(err, _(\"refusing to update ref with bad name %s\"),\n+\t\t\t refname);\n+\t\treturn TRANSACTION_GENERIC_ERROR;\n+\t}\n+\n+\trefname = check_ref(transaction.txn, orig_refname, old_sha1,\n+\t\t\t resolved_sha1, flags, &type);\n+\tif (refname == NULL) {\n+\t\tstrbuf_addf(err, _(\"cannot lock the ref '%s'\"), orig_refname);\n+\t\treturn TRANSACTION_GENERIC_ERROR;\n+\t}\n+\n+\tif (!(flags & REF_DELETING) && is_null_sha1(resolved_sha1) &&\n+\t verify_refname_available_txn(&transaction, refname, NULL, NULL, err))\n+\t\treturn TRANSACTION_NAME_CONFLICT;\n+\n+\tif (flags & REF_NODEREF) {\n+\t\tfree((void *)refname);\n+\t\trefname = orig_refname;\n+\t}\n+\n+\tkey.mv_size = strlen(refname) + 1;\n+\tkey.mv_data = (void *)refname;\n+\n+\tif ((flags & REF_HAVE_NEW) && !is_null_sha1(new_sha1)) {\n+\t\tint overwriting_symref = ((type & REF_ISSYMREF) &&\n+\t\t\t\t\t (flags & REF_NODEREF));\n+\n+\t\tstruct object *o = parse_object(new_sha1);\n+\t\tif (!o) {\n+\t\t\tstrbuf_addf(err,\n+\t\t\t\t _(\"Trying to write ref %s with nonexistent object %s\"),\n+\t\t\t\t refname, sha1_to_hex(new_sha1));\n+\t\t\tgoto done;\n+\t\t}\n+\t\tif (o->type != OBJ_COMMIT && is_branch(refname)) {\n+\t\t\tstrbuf_addf(err,\n+\t\t\t\t _(\"Trying to write non-commit object %s to branch %s\"),\n+\t\t\t\t sha1_to_hex(new_sha1), refname);\n+\t\t\tgoto done;\n+\t\t}\n+\n+\t\tif (!overwriting_symref\n+\t\t && !hashcmp(resolved_sha1, new_sha1)) {\n+\t\t\t/*\n+\t\t\t * The reference already has the desired\n+\t\t\t * value, so we don't need to write it.\n+\t\t\t */\n+\t\t\tflags |= REF_NO_REFLOG;\n+\t\t} else {\n+\t\t\tval.mv_size = 41;\n+\t\t\tif (new_sha1)\n+\t\t\t\tval.mv_data = sha1_to_hex(new_sha1);\n+\t\t\telse\n+\t\t\t\tval.mv_data = sha1_to_hex(null_sha1);\n+\t\t\tmdb_put_or_die(&transaction, &key, &val, 0);\n+\t\t}\n+\t}\n+\n+\tif (flags & REF_DELETING) {\n+\t\tif (mdb_del_or_die(&transaction, &key, NULL)) {\n+\t\t\tif (old_sha1 && !is_null_sha1(old_sha1)) {\n+\t\t\t\tstrbuf_addf(err, _(\"No such ref %s\"), refname);\n+\t\t\t\tret = TRANSACTION_GENERIC_ERROR;\n+\t\t\t\tgoto done;\n+\t\t\t}\n+\t\t}\n+\t\tlmdb_delete_reflog(orig_refname);\n+\t} else if (!(flags & REF_NO_REFLOG)) {\n+\t\tif (!new_sha1)\n+\t\t\tnew_sha1 = null_sha1;\n+\t\tif (log_ref_write(orig_refname, resolved_sha1,\n+\t\t\t\t new_sha1, msg, flags, err) < 0)\n+\t\t\tgoto done;\n+\t\tif (strcmp(refname, orig_refname) &&\n+\t\t log_ref_write(refname, resolved_sha1,\n+\t\t\t\t new_sha1, msg, flags, err) < 0)\n+\t\t\tgoto done;\n+\t}\n+\n+\tret = 0;\n+done:\n+\tif (refname != orig_refname)\n+\t\tfree((void *) refname);\n+\treturn ret;\n+}\n+\n+static int lmdb_transaction_commit(struct ref_transaction *ref_transaction,\n+\t\t\t\t struct string_list *affected_refnames,\n+\t\t\t\t struct strbuf *err)\n+{\n+\tint ret = 0, i;\n+\tint n = ref_transaction->nr;\n+\tstruct ref_update **updates = ref_transaction->updates;\n+\n+\t/*\n+\t * We might already be in a write transaction, because some\n+\t * lmdb backend functionality is implemented in terms of\n+\t * (other stuff) + ref_transaction_commit\n+\t */\n+\tif (!in_write_transaction())\n+\t\tlmdb_transaction_begin_flags_or_die(0);\n+\n+\tfor (i = 0; i < n; i++) {\n+\t\tstruct ref_update *update = updates[i];\n+\n+\t\tif (lmdb_transaction_update(update->refname,\n+\t\t\t\t\t update->new_sha1,\n+\t\t\t\t\t (update->flags & REF_HAVE_OLD) ?\n+\t\t\t\t\t update->old_sha1 : NULL,\n+\t\t\t\t\t update->flags,\n+\t\t\t\t\t update->msg,\n+\t\t\t\t\t err)) {\n+\t\t\tmdb_txn_abort(transaction.txn);\n+\t\t\tret = -1;\n+\t\t\tgoto cleanup;\n+\t\t}\n+\n+\t}\n+\tret = mdb_transaction_commit(&transaction, err);\n+\n+cleanup:\n+\tref_transaction->state = REF_TRANSACTION_CLOSED;\n+\treturn ret;\n+}\n+\n+static int rename_reflog_ent(unsigned char *osha1, unsigned char *nsha1,\n+\t\t\t const char *email, unsigned long timestamp, int tz,\n+\t\t\t const char *message, void *cb_data)\n+{\n+\n+\tconst char *newrefname = cb_data;\n+\tMDB_val key, new_key, val;\n+\tstruct strbuf new_key_buf = STRBUF_INIT;\n+\n+\tassert(transaction.cursor);\n+\n+\tif (mdb_cursor_get_or_die(transaction.cursor, &key, &val, MDB_GET_CURRENT))\n+\t\tdie(\"BUG: renaming ref: mdb_cursor_get failed to get current\");\n+\n+\t/* This must really be a reflog entry */\n+\tassert(val.mv_size > 42);\n+\n+\tstrbuf_addf(&new_key_buf, \"logs/%s\", newrefname);\n+\tstrbuf_add(&new_key_buf, (char *)key.mv_data + key.mv_size - 8, 8);\n+\n+\tnew_key.mv_size = new_key_buf.len + 1;\n+\tnew_key.mv_data = new_key_buf.buf;\n+\tmdb_put_or_die(&transaction, &new_key, &val, 0);\n+\tmdb_cursor_del_or_die(transaction.cursor, 0);\n+\tstrbuf_release(&new_key_buf);\n+\treturn 0;\n+}\n+\n+static int lmdb_rename_ref(const char *oldref, const char *newref, const char *logmsg)\n+{\n+\tunsigned char orig_sha1[20];\n+\tint flag = 0, resolve_flags;\n+\tint log = reflog_exists(oldref);\n+\tconst char *symref = NULL;\n+\tstruct strbuf err = STRBUF_INIT;\n+\tstruct ref_transaction *ref_transaction;\n+\n+\tif (!strcmp(oldref, newref))\n+\t\treturn 0;\n+\n+\tlmdb_transaction_begin_flags_or_die(0);\n+\n+\tref_transaction = ref_transaction_begin(&err);\n+\tif (!ref_transaction)\n+\t\tdie(\"%s\", err.buf);\n+\n+\tresolve_flags = RESOLVE_REF_READING | RESOLVE_REF_NO_RECURSE;\n+\tsymref = resolve_ref_unsafe(oldref, resolve_flags,\n+\t\t\t\t orig_sha1, &flag);\n+\tif (flag & REF_ISSYMREF) {\n+\t\terror(_(\"refname %s is a symbolic ref, renaming it is not supported\"),\n+\t\t oldref);\n+\t\tgoto fail;\n+\t}\n+\tif (!symref) {\n+\t\tmdb_txn_abort(transaction.txn);\n+\t\terror(_(\"refname %s not found\"), oldref);\n+\t\tgoto fail;\n+\t}\n+\tif (!rename_ref_available(oldref, newref))\n+\t\tgoto fail;\n+\n+\t/* Copy the reflog from the old to the new */\n+\tif (log) {\n+\t\tstruct strbuf old_log_sentinel = STRBUF_INIT;\n+\t\tMDB_val key;\n+\t\tint log_all;\n+\n+\t\tlog_all = log_all_ref_updates;\n+\t\tlog_all_ref_updates = 1;\n+\t\tif (safe_create_reflog(newref, 0, &err)) {\n+\t\t\terror(_(\"can't create reflog for %s: %s\"), newref, err.buf);\n+\t\t\tstrbuf_release(&err);\n+\t\t\tgoto fail;\n+\t\t}\n+\t\tlog_all_ref_updates = log_all;\n+\n+\t\tfor_each_reflog_ent(oldref, rename_reflog_ent, (void *)newref);\n+\t\tstrbuf_addf(&old_log_sentinel, \"logs/%sxxxxxxxx\", oldref);\n+\t\tmemset(old_log_sentinel.buf + old_log_sentinel.len - 8, 0, 8);\n+\n+\t\tkey.mv_size = old_log_sentinel.len;\n+\t\tkey.mv_data = old_log_sentinel.buf;\n+\n+\t\t/* It's OK if the old reflog is missing */\n+\t\tmdb_del_or_die(&transaction, &key, NULL);\n+\t\tstrbuf_release(&old_log_sentinel);\n+\t}\n+\n+\tif (ref_transaction_delete(ref_transaction, oldref,\n+\t\t\t\t orig_sha1, REF_NODEREF, NULL, &err)) {\n+\t\terror(_(\"unable to delete old %s\"), oldref);\n+\t\tgoto fail;\n+\t}\n+\n+\tif (ref_transaction_update(ref_transaction, newref, orig_sha1, NULL,\n+\t\t\t\t REF_NODEREF, logmsg, &err)) {\n+\t\terror(\"%s\", err.buf);\n+\t\tgoto fail;\n+\t}\n+\n+\tif (ref_transaction_commit(ref_transaction, &err)) {\n+\t\terror(\"%s\", err.buf);\n+\t\tgoto fail;\n+\t}\n+\n+\treturn 0;\n+\n+fail:\n+\tref_transaction_free(ref_transaction);\n+\tstrbuf_release(&err);\n+\tmdb_txn_abort(transaction.txn);\n+\treturn 1;\n+}\n+\n+static int lmdb_delete_refs(struct string_list *refnames)\n+{\n+\tint i;\n+\tstruct strbuf err = STRBUF_INIT;\n+\tint result = 0;\n+\n+\tif (!refnames->nr)\n+\t\treturn 0;\n+\n+\tlmdb_transaction_begin_flags_or_die(0);\n+\n+\tfor (i = 0; i < refnames->nr; i++) {\n+\t\tconst char *refname = refnames->items[i].string;\n+\n+\t\tif (lmdb_transaction_update(refname, null_sha1, NULL,\n+\t\t\t\t\t REF_DELETING, NULL, &err))\n+\t\t\tresult |= error(_(\"could not remove reference %s: %s\"),\n+\t\t\t\t\trefname, err.buf);\n+\t}\n+\n+\tresult |= mdb_transaction_commit(&transaction, &err);\n+\tstrbuf_release(&err);\n+\treturn 0;\n+}\n+\n+static int lmdb_for_each_reflog_ent_order(const char *refname,\n+\t\t\t\t\t each_reflog_ent_fn fn,\n+\t\t\t\t\t void *cb_data, int reverse)\n+{\n+\tMDB_val key, val;\n+\tchar *search_key;\n+\tchar *log_path;\n+\tint len;\n+\tMDB_cursor *cursor;\n+\tint ret = 0;\n+\tstruct strbuf sb = STRBUF_INIT;\n+\tenum MDB_cursor_op direction = reverse ? MDB_PREV : MDB_NEXT;\n+\tuint64_t zero = 0ULL;\n+\n+\tlog_path = xstrfmt(\"logs/%s\", refname);\n+\tlen = strlen(log_path) + 1;\n+\n+\tif (reverse) {\n+\t\t/*\n+\t\t * For a reverse search, start at the key\n+\t\t * lexicographically after the searched-for key.\n+\t\t * That's the one with \\1 appended to the key.\n+\t\t */\n+\t\tsearch_key = xstrfmt(\"%s\\1\", log_path);\n+\t\tkey.mv_size = len + 1;\n+\t} else {\n+\t\tsearch_key = xstrdup(log_path);\n+\t\tkey.mv_size = len;\n+\t}\n+\n+\tkey.mv_data = search_key;\n+\n+\tlmdb_transaction_begin_flags_or_die(MDB_RDONLY);\n+\n+\tmdb_cursor_open_or_die(&transaction, &cursor);\n+\n+\ttransaction.cursor = cursor;\n+\n+\t/*\n+\t * MDB's cursor API requires that the first mdb_cursor_get be\n+\t * called with MDB_SET_RANGE. For reverse searches, this will\n+\t * give us the entry one-past the entry we're looking for, so\n+\t * we should jump back using MDB_PREV.\n+\t */\n+\tmdb_cursor_get_or_die(cursor, &key, &val, MDB_SET_RANGE);\n+\tif (direction == MDB_PREV)\n+\t\tmdb_cursor_get_or_die(cursor, &key, &val, direction);\n+\n+\tdo {\n+\t\tif (key.mv_size < len)\n+\t\t\tbreak;\n+\n+\t\tif (!starts_with(key.mv_data, log_path) || ((char *)key.mv_data)[len - 1] != 0)\n+\t\t\tbreak;\n+\n+\t\tif (!memcmp(&zero, ((char *)key.mv_data) + key.mv_size - 8, 8))\n+\t\t\tcontinue;\n+\n+\t\tassert(val.mv_size != 0);\n+\n+\t\tstrbuf_add(&sb, val.mv_data, val.mv_size - 1);\n+\t\tret = show_one_reflog_ent(&sb, fn, cb_data);\n+\t\tif (ret)\n+\t\t\tbreak;\n+\n+\t\tstrbuf_reset(&sb);\n+\t} while (!mdb_cursor_get_or_die(cursor, &key, &val, direction));\n+\n+\tstrbuf_release(&sb);\n+\tfree(log_path);\n+\tfree(search_key);\n+\tmdb_cursor_close(cursor);\n+\treturn ret;\n+}\n+\n+static int lmdb_for_each_reflog_ent(const char *refname,\n+\t\t\t\t each_reflog_ent_fn fn,\n+\t\t\t\t void *cb_data)\n+{\n+\tif (ref_type(refname) != REF_TYPE_NORMAL)\n+\t\treturn refs_be_files.for_each_reflog_ent(refname, fn, cb_data);\n+\treturn lmdb_for_each_reflog_ent_order(refname, fn, cb_data, 0);\n+}\n+\n+static int lmdb_for_each_reflog_ent_reverse(const char *refname,\n+\t\t\t\t\t each_reflog_ent_fn fn,\n+\t\t\t\t\t void *cb_data)\n+{\n+\tif (ref_type(refname) != REF_TYPE_NORMAL)\n+\t\treturn refs_be_files.for_each_reflog_ent_reverse(refname, fn, cb_data);\n+\treturn lmdb_for_each_reflog_ent_order(refname, fn, cb_data, 1);\n+}\n+\n+static int lmdb_reflog_exists(const char *refname)\n+{\n+\tMDB_val key, val;\n+\tchar *log_path;\n+\tint len;\n+\tMDB_cursor *cursor;\n+\tint ret = 1;\n+\n+\tif (ref_type(refname) != REF_TYPE_NORMAL)\n+\t\treturn refs_be_files.reflog_exists(refname);\n+\n+\tlog_path = xstrfmt(\"logs/%s\", refname);\n+\tlen = strlen(log_path) + 1;\n+\n+\tkey.mv_data = log_path;\n+\tkey.mv_size = len;\n+\n+\tlmdb_transaction_begin_flags_or_die(MDB_RDONLY);\n+\tmdb_cursor_open_or_die(&transaction, &cursor);\n+\n+\tif (mdb_cursor_get_or_die(cursor, &key, &val, MDB_SET_RANGE) ||\n+\t !starts_with(key.mv_data, log_path))\n+\t\tret = 0;\n+\n+\tfree(log_path);\n+\tmdb_cursor_close(cursor);\n+\n+\treturn ret;\n+}\n+\n+struct wrapped_each_ref_fn {\n+\teach_ref_fn *fn;\n+\tvoid *cb_data;\n+};\n+\n+static int check_reflog(const char *refname,\n+\t\t\tconst struct object_id *oid, int flags, void *cb_data)\n+{\n+\tstruct wrapped_each_ref_fn *wrapped = cb_data;\n+\n+\tif (reflog_exists(refname))\n+\t\treturn wrapped->fn(refname, oid, 0, wrapped->cb_data);\n+\n+\treturn 0;\n+}\n+\n+static int lmdb_for_each_reflog(each_ref_fn fn, void *cb_data)\n+{\n+\tstruct wrapped_each_ref_fn wrapped = {fn, cb_data};\n+\tint result = head_ref(fn, cb_data);\n+\tif (result)\n+\t\treturn result;\n+\treturn for_each_ref(check_reflog, &wrapped);\n+}\n+\n+static void strbuf_reflog_header(struct strbuf *sb, const char *refname)\n+{\n+\tuint64_t zero = 0;\n+\n+\tstrbuf_addf(sb, \"logs/%s\", refname);\n+\tstrbuf_add(sb, &zero, 8);\n+}\n+\n+static int lmdb_create_reflog(const char *refname, int force_create, struct strbuf *err)\n+{\n+\t/*\n+\t * We mark that there is a reflog by creating a key of the\n+\t * form logs/$refname followed by nine \\0 (one for\n+\t * string-termination, 8 in lieu of a timestamp), with an empty\n+\t * value.\n+\t */\n+\n+\tint in_transaction = in_write_transaction();\n+\tMDB_val key, val;\n+\tstruct strbuf key_buf = STRBUF_INIT;\n+\n+\tif (!force_create && !should_autocreate_reflog(refname))\n+\t\treturn 0;\n+\n+\tif (!in_transaction)\n+\t\tlmdb_transaction_begin_flags_or_die(0);\n+\n+\tstrbuf_reflog_header(&key_buf, refname);\n+\tkey.mv_size = key_buf.len + 1;\n+\tkey.mv_data = key_buf.buf;\n+\n+\tval.mv_size = 0;\n+\tval.mv_data = NULL;\n+\tmdb_put_or_die(&transaction, &key, &val, 0);\n+\n+\tstrbuf_release(&key_buf);\n+\tif (!in_transaction)\n+\t\treturn mdb_transaction_commit(&transaction, err);\n+\treturn 0;\n+}\n+\n+struct expire_reflog_cb {\n+\tunsigned int flags;\n+\treflog_expiry_should_prune_fn *should_prune_fn;\n+\tvoid *policy_cb;\n+\tunsigned char last_kept_sha1[20];\n+};\n+\n+static int expire_reflog_ent(unsigned char *osha1, unsigned char *nsha1,\n+\t\t\t const char *email, unsigned long timestamp, int tz,\n+\t\t\t const char *message, void *cb_data)\n+{\n+\tstruct expire_reflog_cb *cb = cb_data;\n+\tstruct expire_reflog_policy_cb *policy_cb = cb->policy_cb;\n+\n+\tif (cb->flags & EXPIRE_REFLOGS_REWRITE)\n+\t\tosha1 = cb->last_kept_sha1;\n+\n+\tif ((*cb->should_prune_fn)(osha1, nsha1, email, timestamp, tz,\n+\t\t\t\t message, policy_cb)) {\n+\t\tif (cb->flags & EXPIRE_REFLOGS_DRY_RUN)\n+\t\t\tprintf(\"would prune %s\", message);\n+\t\telse {\n+\t\t\tif (cb->flags & EXPIRE_REFLOGS_VERBOSE)\n+\t\t\t\tprintf(\"prune %s\", message);\n+\n+\t\t\tmdb_cursor_del_or_die(transaction.cursor, 0);\n+\t\t}\n+\t} else {\n+\t\thashcpy(cb->last_kept_sha1, nsha1);\n+\t\tif (cb->flags & EXPIRE_REFLOGS_VERBOSE)\n+\t\t\tprintf(\"keep %s\", message);\n+\t}\n+\treturn 0;\n+}\n+\n+static int write_ref(const char *refname, const unsigned char *sha1)\n+{\n+\tstruct strbuf err = STRBUF_INIT;\n+\tstruct ref_transaction *transaction;\n+\n+\ttransaction = ref_transaction_begin(&err);\n+\tif (!transaction) {\n+\t\terror(\"%s\", err.buf);\n+\t\tstrbuf_release(&err);\n+\t\treturn -1;\n+\t}\n+\n+\tif (ref_transaction_update(transaction, refname, sha1, NULL,\n+\t\t\t\t REF_NO_REFLOG, NULL, &err)) {\n+\t\terror(\"%s\", err.buf);\n+\t\tstrbuf_release(&err);\n+\t\treturn -1;\n+\t}\n+\n+\tif (ref_transaction_commit(transaction, &err)) {\n+\t\terror(\"%s\", err.buf);\n+\t\tstrbuf_release(&err);\n+\t\treturn -1;\n+\t}\n+\n+\treturn 0;\n+}\n+\n+int lmdb_reflog_expire(const char *refname, const unsigned char *sha1,\n+\t\t unsigned int flags,\n+\t\t reflog_expiry_prepare_fn prepare_fn,\n+\t\t reflog_expiry_should_prune_fn should_prune_fn,\n+\t\t reflog_expiry_cleanup_fn cleanup_fn,\n+\t\t void *policy_cb_data)\n+{\n+\tstruct expire_reflog_cb cb;\n+\tint dry_run = flags & EXPIRE_REFLOGS_DRY_RUN;\n+\tint status = 0;\n+\tstruct strbuf err = STRBUF_INIT;\n+\tunsigned char resolved_sha1[20];\n+\tint type;\n+\tchar *resolved;\n+\n+\tif (ref_type(refname) != REF_TYPE_NORMAL)\n+\t\treturn refs_be_files.reflog_expire(refname, sha1, flags, prepare_fn,\n+\t\t\t\t\t should_prune_fn, cleanup_fn,\n+\t\t\t\t\t policy_cb_data);\n+\n+\tmemset(&cb, 0, sizeof(cb));\n+\tcb.flags = flags;\n+\tcb.policy_cb = policy_cb_data;\n+\tcb.should_prune_fn = should_prune_fn;\n+\n+\tlmdb_transaction_begin_flags_or_die(dry_run ? MDB_RDONLY : 0);\n+\n+\tresolved = check_ref(transaction.txn, refname, sha1,\n+\t\t\t resolved_sha1, 0, &type);\n+\tif (!resolved)\n+\t\tdie(_(\"Failed to resolve %s\"), refname);\n+\tfree(resolved);\n+\n+\t(*prepare_fn)(refname, sha1, cb.policy_cb);\n+\tlmdb_for_each_reflog_ent(refname, expire_reflog_ent, &cb);\n+\t(*cleanup_fn)(cb.policy_cb);\n+\n+\tif (!dry_run) {\n+\t\t/*\n+\t\t * It doesn't make sense to adjust a reference pointed\n+\t\t * to by a symbolic ref based on expiring entries in\n+\t\t * the symbolic reference's reflog. Nor can we update\n+\t\t * a reference if there are no remaining reflog\n+\t\t * entries.\n+\t\t */\n+\t\tint update = (flags & EXPIRE_REFLOGS_UPDATE_REF) &&\n+\t\t\t!(type & REF_ISSYMREF) &&\n+\t\t\t!is_null_sha1(cb.last_kept_sha1);\n+\n+\t\tif (mdb_transaction_commit(&transaction, &err)) {\n+\t\t\tstatus |= error(_(\"couldn't write logs/%s: %s\"),\n+\t\t\t\t\trefname, err.buf);\n+\t\t\tstrbuf_release(&err);\n+\t\t} else if (update && write_ref(refname, cb.last_kept_sha1)) {\n+\t\t\tstatus |= error(_(\"couldn't set %s\"),\n+\t\t\t\t\trefname);\n+\t\t}\n+\t}\n+\treturn status;\n+}\n+\n+static int lmdb_pack_refs(unsigned int flags)\n+{\n+\t/* This concept does not exist in this backend. */\n+\treturn 0;\n+}\n+\n+static int lmdb_peel_ref(const char *refname, unsigned char *sha1)\n+{\n+\tint flag;\n+\tunsigned char base[20];\n+\n+\tif (read_ref_full(refname, RESOLVE_REF_READING, base, &flag))\n+\t\treturn -1;\n+\n+\treturn peel_object(base, sha1);\n+}\n+\n+static int lmdb_create_symref(const char *ref_target,\n+\t\t\t const char *refs_heads_master,\n+\t\t\t const char *logmsg)\n+{\n+\n+\tstruct strbuf err = STRBUF_INIT;\n+\tunsigned char old_sha1[20], new_sha1[20];\n+\tMDB_val key, val;\n+\tchar *valdata;\n+\tint ret = 0;\n+\tint in_transaction;\n+\n+\tin_transaction = in_write_transaction();\n+\n+\tif (logmsg && read_ref(ref_target, old_sha1))\n+\t\thashclr(old_sha1);\n+\n+\tkey.mv_size = strlen(ref_target) + 1;\n+\tkey.mv_data = xstrdup(ref_target);\n+\n+\tvaldata = xstrfmt(\"ref: %s\", refs_heads_master);\n+\tval.mv_data = valdata;\n+\tval.mv_size = strlen(valdata) + 1;\n+\n+\tif (!in_transaction)\n+\t\tlmdb_transaction_begin_flags_or_die(0);\n+\n+\tmdb_put_or_die(&transaction, &key, &val, 0);\n+\n+\t/* TODO: Don't create ref d/f conflicts */\n+\n+\tif (logmsg && !read_ref(refs_heads_master, new_sha1) &&\n+\t log_ref_write(ref_target, old_sha1, new_sha1, logmsg, 0, &err)) {\n+\t\terror(_(\"create_symref: log_ref_write failed: %s\"), err.buf);\n+\t\tret = -1;\n+\t\tgoto done;\n+\t}\n+\n+\tif (!in_transaction && mdb_transaction_commit(&transaction, &err)) {\n+\t\terror(_(\"create_symref: commit failed: %s\"), err.buf);\n+\t\tret = -1;\n+\t}\n+\n+done:\n+\tstrbuf_release(&err);\n+\tfree(key.mv_data);\n+\tfree(valdata);\n+\n+\treturn ret;\n+}\n+\n+MDB_env *submodule_txn_begin(struct lmdb_transaction *transaction)\n+{\n+\tint ret;\n+\tMDB_env *submodule_env = NULL;\n+\tstruct strbuf path = STRBUF_INIT;\n+\n+\tstrbuf_git_path_submodule(&path, transaction->submodule, \"refs.lmdb\");\n+\n+\tif (!is_directory(path.buf))\n+\t\tgoto done;\n+\n+\tmkdir(path.buf, 0775);\n+\n+\tinit_env(&submodule_env, path.buf);\n+\n+\tret = mdb_txn_begin(submodule_env, NULL, MDB_RDONLY, &transaction->txn);\n+\tif (ret)\n+\t\tdie(\"BUG: mdb_txn_begin failed: %s\", mdb_strerror(ret));\n+\n+\tret = mdb_dbi_open(transaction->txn, NULL, 0, &transaction->dbi);\n+\tif (ret)\n+\t\tdie(\"BUG: mdb_txn_open failed: %s\", mdb_strerror(ret));\n+\n+done:\n+\tstrbuf_release(&path);\n+\treturn submodule_env;\n+}\n+\n+static int lmdb_resolve_gitlink_ref(const char *submodule, const char *refname,\n+\t\t\t\t unsigned char *sha1)\n+{\n+\tstruct lmdb_transaction transaction;\n+\tMDB_env *submodule_env;\n+\tint result;\n+\n+\ttransaction.txn = NULL;\n+\ttransaction.submodule = submodule;\n+\tsubmodule_env = submodule_txn_begin(&transaction);\n+\tif (!submodule_env)\n+\t\treturn -1;\n+\tresult = !resolve_ref_unsafe_txn(&transaction, refname,\n+\t\t\t\t\t RESOLVE_REF_READING, sha1, NULL);\n+\n+\tmdb_txn_abort(transaction.txn);\n+\tmdb_env_close(submodule_env);\n+\n+\treturn result ? -1 : 0;\n+}\n+\n+/*\n+ * Call fn for each reference for which the refname begins with base.\n+ * If trim is non-zero, then trim that many characters off the\n+ * beginning of each refname before passing the refname to fn. flags\n+ * can be DO_FOR_EACH_INCLUDE_BROKEN to include broken references in\n+ * the iteration. If fn ever returns a non-zero value, stop the\n+ * iteration and return that value; otherwise, return 0.\n+ */\n+static int lmdb_do_for_each_ref(const char *submodule, const char *base,\n+\t\t\t\teach_ref_fn fn, int trim, int flags,\n+\t\t\t\tvoid *cb_data)\n+{\n+\n+\tMDB_val key, val;\n+\tMDB_cursor *cursor;\n+\tint baselen;\n+\tchar *search_key;\n+\tint retval;\n+\tint mdb_ret;\n+\tstruct lmdb_transaction *transaction;\n+\tMDB_env *submodule_env;\n+\n+\tif (submodule) {\n+\t\tstruct lmdb_transaction sub;\n+\t\ttransaction = ⊂\n+\t\ttransaction->txn = NULL;\n+\t\ttransaction->submodule = submodule;\n+\t\tsubmodule_env = submodule_txn_begin(transaction);\n+\t} else\n+\t\ttransaction = lmdb_transaction_begin_flags_or_die(MDB_RDONLY);\n+\n+\tretval = do_for_each_per_worktree_ref(submodule, base, fn,\n+\t\t\t\t\t trim, flags, cb_data);\n+\tif (retval)\n+\t\treturn retval;\n+\n+\tif (ref_paranoia < 0)\n+\t\tref_paranoia = git_env_bool(\"GIT_REF_PARANOIA\", 0);\n+\tif (ref_paranoia)\n+\t\tflags |= DO_FOR_EACH_INCLUDE_BROKEN;\n+\n+\tif (!base || !*base) {\n+\t\tbase = \"refs/\";\n+\t\ttrim = 0;\n+\t}\n+\n+\tsearch_key = xstrdup(base);\n+\tbaselen = strlen(base);\n+\tkey.mv_size = baselen + 1;\n+\tkey.mv_data = search_key;\n+\n+\tmdb_cursor_open_or_die(transaction, &cursor);\n+\n+\tmdb_ret = mdb_cursor_get_or_die(cursor, &key, &val, MDB_SET_RANGE);\n+\n+\twhile (!mdb_ret) {\n+\t\tstruct object_id oid;\n+\t\tint parsed_flags = 0;\n+\n+\t\tif (memcmp(key.mv_data, base, baselen))\n+\t\t\tbreak;\n+\n+\t\tparse_ref_data(transaction, (const char *)key.mv_data + (trim ? baselen : 0),\n+\t\t\t val.mv_data, oid.hash, 0, &parsed_flags, 0);\n+\n+\t\tif (flags & DO_FOR_EACH_INCLUDE_BROKEN ||\n+\t\t (!(parsed_flags & REF_ISBROKEN) &&\n+\t\t has_sha1_file(oid.hash))) {\n+\t\t\tretval = fn((const char *)key.mv_data + (trim ? baselen : 0), &oid, parsed_flags, cb_data);\n+\t\t\tif (retval)\n+\t\t\t\tbreak;\n+\t\t}\n+\n+\t\tmdb_ret = mdb_cursor_get_or_die(cursor, &key, &val, MDB_NEXT);\n+\t}\n+\n+\tmdb_cursor_close(cursor);\n+\tfree(search_key);\n+\n+\tif (submodule) {\n+\t\tmdb_txn_abort(transaction->txn);\n+\t\tmdb_env_close(submodule_env);\n+\t}\n+\treturn retval;\n+}\n+\n+/* For testing only! */\n+int test_refdb_raw_read(const char *key)\n+{\n+\tMDB_val key_val, val;\n+\tchar *keydup;\n+\tint ret;\n+\tint needs_free = 0;\n+\n+\tlmdb_transaction_begin_flags_or_die(MDB_RDONLY);\n+\tkeydup = xstrdup(key);\n+\tkey_val.mv_data = keydup;\n+\tkey_val.mv_size = strlen(key) + 1;\n+\n+\tret = mdb_get_or_die(&transaction, &key_val, &val, &needs_free);\n+\tfree(keydup);\n+\tswitch (ret) {\n+\tcase 0:\n+\t\tprintf(\"%s\\n\", (char *)val.mv_data);\n+\t\treturn 0;\n+\tcase MDB_NOTFOUND:\n+\t\tfprintf(stderr, \"%s not found\\n\", key);\n+\t\treturn 1;\n+\tdefault:\n+\t\treturn 2;\n+\t}\n+\tif (needs_free)\n+\t\tfree(val.mv_data);\n+}\n+\n+/* For testing only! */\n+void test_refdb_raw_write(const char *key, const char *value)\n+{\n+\tMDB_val key_val, val;\n+\tchar *keydup, *valdup;\n+\n+\tif (ref_type(key) != REF_TYPE_NORMAL) {\n+\t\tval.mv_data = (void *)value;\n+\t\tval.mv_size = strlen(value) + 1;\n+\t\twrite_per_worktree_ref(NULL, key, &val);\n+\t\treturn;\n+\t}\n+\n+\tlmdb_transaction_begin_flags_or_die(0);\n+\n+\tkeydup = xstrdup(key);\n+\tkey_val.mv_data = keydup;\n+\tkey_val.mv_size = strlen(key) + 1;\n+\n+\tvaldup = xstrdup(value);\n+\tval.mv_data = valdup;\n+\tval.mv_size = strlen(value) + 1;\n+\n+\tmdb_put_or_die(&transaction, &key_val, &val, 0);\n+\tassert(mdb_transaction_commit(&transaction, NULL) == 0);\n+\n+\tfree(keydup);\n+\tfree(valdup);\n+}\n+\n+/* For testing only! */\n+int test_refdb_raw_delete(const char *key)\n+{\n+\tMDB_val key_val;\n+\tchar *keydup;\n+\tint ret;\n+\n+\tif (ref_type(key) != REF_TYPE_NORMAL)\n+\t\treturn del_per_worktree_ref(NULL, key, NULL);\n+\n+\tlmdb_transaction_begin_flags_or_die(0);\n+\tkeydup = xstrdup(key);\n+\tkey_val.mv_data = keydup;\n+\tkey_val.mv_size = strlen(key) + 1;\n+\n+\tret = mdb_del_or_die(&transaction, &key_val, NULL);\n+\n+\tassert(mdb_transaction_commit(&transaction, NULL) == 0);\n+\n+\tfree(keydup);\n+\treturn ret;\n+}\n+\n+static int print_raw_reflog_ent(unsigned char *osha1, unsigned char *nsha1,\n+\t\t\t\tconst char *email, unsigned long timestamp,\n+\t\t\t\tint tz, const char *message, void *cb_data)\n+{\n+\tint *any = cb_data;\n+\t*any = 1;\n+\n+\tif (*message != '\\n')\n+\t\tprintf(\"%s %s %s %lu %+05d\\t%s\", sha1_to_hex(osha1),\n+\t\t sha1_to_hex(nsha1),\n+\t\t email, timestamp, tz, message);\n+\telse\n+\t\tprintf(\"%s %s %s %lu %+05d\\n\", sha1_to_hex(osha1),\n+\t\t sha1_to_hex(nsha1),\n+\t\t email, timestamp, tz);\n+\treturn 0;\n+}\n+\n+/* For testing only! */\n+int test_refdb_raw_reflog(const char *refname)\n+{\n+\tint any = 0;\n+\n+\tfor_each_reflog_ent(refname, print_raw_reflog_ent, &any);\n+\n+\treturn !any;\n+}\n+\n+/* For testing only! */\n+void test_refdb_raw_delete_reflog(char *refname)\n+{\n+\tMDB_val key, val;\n+\tint mdb_ret;\n+\tchar *search_key;\n+\tMDB_cursor *cursor;\n+\tint len;\n+\n+\tsearch_key = xstrfmt(\"logs/%s\", refname ? refname : \"\");\n+\tlen = strlen(search_key) + 1;\n+\n+\tkey.mv_data = search_key;\n+\tkey.mv_size = len;\n+\n+\tlmdb_transaction_begin_flags_or_die(0);\n+\n+\tmdb_cursor_open_or_die(&transaction, &cursor);\n+\n+\tmdb_ret = mdb_cursor_get_or_die(cursor, &key, &val, MDB_SET_RANGE);\n+\twhile (!mdb_ret) {\n+\t\tif (!starts_with(key.mv_data, search_key))\n+\t\t\tbreak;\n+\t\tif (refname && ((char *)val.mv_data)[len - 1] == 0)\n+\t\t\tbreak;\n+\n+\t\tmdb_cursor_del_or_die(cursor, 0);\n+\t\tmdb_ret = mdb_cursor_get_or_die(cursor, &key, &val, MDB_NEXT);\n+\t}\n+\n+\tfree(search_key);\n+\tmdb_cursor_close(cursor);\n+\n+\tassert(mdb_transaction_commit(&transaction, NULL) == 0);\n+\treturn;\n+}\n+\n+static void format_lmdb_reflog_ent(struct strbuf *dst, struct strbuf *src)\n+{\n+\tunsigned char osha1[20], nsha1[20];\n+\tconst char *msg;\n+\n+\tget_sha1_hex(src->buf, osha1);\n+\tget_sha1_hex(src->buf + 41, nsha1);\n+\n+\tmsg = strchr(src->buf + 82, '\\t');\n+\tif (msg)\n+\t\tmsg += 1;\n+\n+\tformat_reflog_entry(dst, osha1, nsha1, src->buf + 82, msg);\n+}\n+\n+/* For testing only! */\n+void test_refdb_raw_append_reflog(const char *refname)\n+{\n+\tstruct strbuf input = STRBUF_INIT;\n+\tstruct strbuf sb = STRBUF_INIT;\n+\tuint64_t now = getnanotime();\n+\tMDB_val key, val;\n+\tstruct strbuf key_buf = STRBUF_INIT;\n+\n+\tstrbuf_reflog_header(&key_buf, refname);\n+\tkey.mv_size = key_buf.len + 1;\n+\tkey.mv_data = key_buf.buf;\n+\n+\tlmdb_transaction_begin_flags_or_die(0);\n+\n+\t/* We do not remove the header entry here, because this is\n+\t * just for tests, so it's OK to be a bit inefficient */\n+\n+\twhile (strbuf_getline(&input, stdin) != EOF) {\n+\t\t/* \"logs/\" + \\0 + 8-byte timestamp for sorting and expiry */\n+\t\twrite_u64((char *)key.mv_data + key.mv_size - 8, htonll(now++));\n+\n+\t\t/*\n+\t\t * Convert the input from files-reflog format to\n+\t\t * lmdb-reflog-format\n+\t\t */\n+\n+\t\tformat_lmdb_reflog_ent(&sb, &input);\n+\t\tval.mv_data = sb.buf;\n+\t\tval.mv_size = sb.len + 1;\n+\t\tmdb_put_or_die(&transaction, &key, &val, 0);\n+\t\tstrbuf_reset(&sb);\n+\t\tinput.len = 0;\n+\t}\n+\n+\tstrbuf_release(&input);\n+\tstrbuf_release(&sb);\n+\tassert(mdb_transaction_commit(&transaction, NULL) == 0);\n+\tstrbuf_release(&key_buf);\n+}\n+\n+struct ref_storage_be refs_be_lmdb = {\n+\tNULL,\n+\t\"lmdb\",\n+\tlmdb_init_db,\n+\tlmdb_transaction_commit,\n+\tlmdb_transaction_commit, /* initial commit */\n+\n+\tlmdb_for_each_reflog_ent,\n+\tlmdb_for_each_reflog_ent_reverse,\n+\tlmdb_for_each_reflog,\n+\tlmdb_reflog_exists,\n+\tlmdb_create_reflog,\n+\tlmdb_delete_reflog,\n+\tlmdb_reflog_expire,\n+\n+\tlmdb_pack_refs,\n+\tlmdb_peel_ref,\n+\tlmdb_create_symref,\n+\tlmdb_delete_refs,\n+\tlmdb_rename_ref,\n+\n+\tlmdb_resolve_ref_unsafe,\n+\tlmdb_verify_refname_available,\n+\tlmdb_resolve_gitlink_ref,\n+\n+\tlmdb_do_for_each_ref,\n+};\ndiff --git a/setup.c b/setup.c\nindex 1a62277..00625ab 100644\n--- a/setup.c\n+++ b/setup.c\n@@ -279,7 +279,7 @@ int ref_storage_backend_config(const char *var, const char *value, void *ptr)\n *\n * - either an objects/ directory _or_ the proper\n * GIT_OBJECT_DIRECTORY environment variable\n- * - a refs/ directory\n+ * - a refs.lmdb/ directory or a refs/ directory\n * - either a HEAD symlink or a HEAD file that is formatted as\n * a proper \"ref:\", or a regular file HEAD that has a properly\n * formatted sha1 object name.\n@@ -313,8 +313,13 @@ int is_git_directory(const char *suspect)\n \n \tstrbuf_setlen(&path, len);\n \tstrbuf_addstr(&path, \"/refs\");\n-\tif (access(path.buf, X_OK))\n-\t\tgoto done;\n+\n+\tif (access(path.buf, X_OK)) {\n+\t\tstrbuf_setlen(&path, len);\n+\t\tstrbuf_addstr(&path, \"/refs.lmdb\");\n+\t\tif (access(path.buf, X_OK))\n+\t\t\tgoto done;\n+\t}\n \n \tret = 1;\n done:\ndiff --git a/test-refs-lmdb-backend.c b/test-refs-lmdb-backend.c\nnew file mode 100644\nindex 0000000..5cf61e6\n--- /dev/null\n+++ b/test-refs-lmdb-backend.c\n@@ -0,0 +1,64 @@\n+#include \"cache.h\"\n+#include \"string-list.h\"\n+#include \"parse-options.h\"\n+#include \"refs.h\"\n+\n+static const char * const test_refs_be_lmdb_usage[] = {\n+\t\"git test-refs-lmdb-backend \",\n+\t\"git test-refs-lmdb-backend \",\n+\tNULL,\n+};\n+\n+int test_refdb_raw_read(const char *key);\n+void test_refdb_raw_write(const char *key, const char *value);\n+int test_refdb_raw_reflog(const char *refname);\n+int test_refdb_raw_delete(const char *key);\n+void test_refdb_raw_delete_reflog(const char *refname);\n+void test_refdb_raw_append_reflog(const char *refname);\n+\n+int main(int argc, const char **argv)\n+{\n+\tconst char *delete = NULL;\n+\tconst char *reflog = NULL;\n+\tconst char *append_reflog = NULL;\n+\tint delete_missing_error = 0;\n+\tint clear_reflog = 0;\n+\n+\tstruct option options[] = {\n+\t\tOPT_STRING('d', NULL, &delete, \"branch\", \"delete refdb entry\"),\n+\t\tOPT_STRING('l', NULL, &reflog, \"branch\", \"show reflog\"),\n+\t\tOPT_STRING('a', NULL, &append_reflog, \"branch\", \"append to reflog\"),\n+\t\tOPT_BOOL('c', NULL, &clear_reflog, \"delete reflog. If a branch is provided, the reflog for that branch will be deleted; else all reflogs will be deleted.\"),\n+\t\tOPT_BOOL('x', NULL, &delete_missing_error,\n+\t\t\t \"deleting a missing key is an error\"),\n+\t\tOPT_END(),\n+\t};\n+\n+\targc = parse_options(argc, argv, \"\", options, test_refs_be_lmdb_usage,\n+\t\t\t 0);\n+\n+\tif (!append_reflog && !clear_reflog && !delete && !reflog && argc != 1 && argc != 2)\n+\t\tusage_with_options(test_refs_be_lmdb_usage,\n+\t\t\t\t options);\n+\n+\tgit_config(git_default_config, NULL);\n+\n+\tregister_ref_storage_backend(&refs_be_lmdb);\n+\tset_ref_storage_backend(\"lmdb\");\n+\n+\tif (clear_reflog) {\n+\t\ttest_refdb_raw_delete_reflog(argv[0]);\n+\t} else if (append_reflog) {\n+\t\ttest_refdb_raw_append_reflog(append_reflog);\n+\t} else if (reflog) {\n+\t\treturn test_refdb_raw_reflog(reflog);\n+\t} else if (delete) {\n+\t\tif (test_refdb_raw_delete(delete) && delete_missing_error)\n+\t\t\treturn 1;\n+\t} else if (argc == 1) {\n+\t\treturn test_refdb_raw_read(argv[0]);\n+\t} else {\n+\t\ttest_refdb_raw_write(argv[0], argv[1]);\n+\t}\n+\treturn 0;\n+}\ndiff --git a/transport.c b/transport.c\nindex c92f8ae..df6f6d8 100644\n--- a/transport.c\n+++ b/transport.c\n@@ -1089,8 +1089,11 @@ static int refs_from_alternate_cb(struct alternate_object_database *e,\n \t\tgoto out;\n \t/* Is this a git repository with refs? */\n \tmemcpy(other + len - 8, \"/refs\", 6);\n-\tif (!is_directory(other))\n-\t\tgoto out;\n+\tif (!is_directory(other)) {\n+\t\tmemcpy(other + len - 8, \"/refs.lmdb\", 11);\n+\t\tif (!is_directory(other))\n+\t\t\tgoto out;\n+\t}\n \tother[len - 8] = '\\0';\n \tremote = remote_get(other);\n \ttransport = transport_get(remote, other);\n-- \n2.4.2.767.g62658d5-twtrsrc\n"},{"id":"278542","messageId":"1455772670-21142-27-git-send-email-dturner@twopensource.com","threadId":"41437","inReplyTo":"1455772670-21142-1-git-send-email-dturner@twopensource.com","subject":"[PATCH v5 26/27] refs: tests for lmdb backend","fromName":"David Turner","fromEmail":"dturner@twopensource.com","sentAt":"2016-02-18T05:17:49Z","receivedAt":"2016-02-18T05:17:49Z","isPatch":true,"sender":{"key":"novalis@novalis.org","avatar":"https://avatars.githubusercontent.com/u/77003?v=4"},"body":"Add tests for the database backend.\n\nSigned-off-by: David Turner \nHelped-by: Dennis Kaarsemaker \n---\n t/t1460-refs-lmdb-backend.sh | 1109 +++++++++++++++++++++++++++++++++++\n t/t1470-refs-lmdb-backend-reflog.sh | 359 ++++++++++++\n t/t1480-refs-lmdb-submodule.sh | 85 +++\n t/test-lib.sh | 1 +\n 4 files changed, 1554 insertions(+)\n create mode 100755 t/t1460-refs-lmdb-backend.sh\n create mode 100755 t/t1470-refs-lmdb-backend-reflog.sh\n create mode 100755 t/t1480-refs-lmdb-submodule.sh\n\ndiff --git a/t/t1460-refs-lmdb-backend.sh b/t/t1460-refs-lmdb-backend.sh\nnew file mode 100755\nindex 0000000..31442e7\n--- /dev/null\n+++ b/t/t1460-refs-lmdb-backend.sh\n@@ -0,0 +1,1109 @@\n+#!/bin/sh\n+#\n+# Copyright (c) 2015 Twitter, Inc\n+# Copyright (c) 2006 Shawn Pearce\n+# This test is based on t1400-update-ref.sh\n+#\n+\n+test_description='Test lmdb refs backend'\n+TEST_NO_CREATE_REPO=1\n+. ./test-lib.sh\n+\n+if ! test_have_prereq LMDB\n+then\n+\tskip_all=\"Skipping lmdb refs backend tests, lmdb backend not built\"\n+\ttest_done\n+fi\n+\n+raw_ref() {\n+\ttest-refs-lmdb-backend \"$1\"\n+}\n+\n+delete_ref() {\n+\ttest-refs-lmdb-backend -d \"$1\"\n+}\n+\n+write_ref() {\n+\ttest-refs-lmdb-backend \"$1\" \"$2\"\n+}\n+\n+raw_reflog() {\n+\ttest-refs-lmdb-backend -l \"$1\"\n+}\n+\n+delete_all_reflogs() {\n+\ttest-refs-lmdb-backend -c\n+}\n+\n+append_reflog() {\n+\ttest-refs-lmdb-backend -a \"$1\"\n+}\n+\n+Z=$_z40\n+\n+test_expect_success setup '\n+\tgit init --ref-storage=lmdb &&\n+\tfor name in A B C D E F\n+\tdo\n+\t\ttest_tick &&\n+\t\tT=$(git write-tree) &&\n+\t\tsha1=$(echo $name | git commit-tree $T) &&\n+\t\teval $name=$sha1\n+\tdone\n+'\n+\n+m=refs/heads/master\n+n_dir=refs/heads/gu\n+n=$n_dir/fixes\n+\n+test_expect_success \\\n+\t\"create $m\" \\\n+\t\"git update-ref $m $A &&\n+\t test $A\"' = $(raw_ref '\"$m\"')'\n+test_expect_success \\\n+\t\"create $m\" \\\n+\t\"git update-ref $m $B $A &&\n+\t test $B\"' = $(raw_ref '\"$m\"')'\n+test_expect_success \"fail to delete $m with stale ref\" '\n+\ttest_must_fail git update-ref -d $m $A &&\n+\ttest $B = \"$(raw_ref $m)\"\n+'\n+test_expect_success \"delete $m\" '\n+\tgit update-ref -d $m $B &&\n+\t! raw_ref $m\n+'\n+delete_ref $m\n+\n+test_expect_success \"delete $m without oldvalue verification\" \"\n+\tgit update-ref $m $A &&\n+\ttest $A = \\$(raw_ref $m) &&\n+\tgit update-ref -d $m &&\n+\t! raw_ref $m\n+\"\n+delete_ref $m\n+\n+test_expect_success \\\n+\t\"fail to create $n\" \\\n+\t\"git update-ref $n_dir $A &&\n+\t test_must_fail git update-ref $n $A >out 2>err\"\n+\n+delete_ref $n_dir\n+rm -f out err\n+\n+test_expect_success \\\n+\t\"create $m (by HEAD)\" \\\n+\t\"git update-ref HEAD $A &&\n+\t test $A\"' = $(raw_ref '\"$m\"')'\n+test_expect_success \\\n+\t\"create $m (by HEAD)\" \\\n+\t\"git update-ref HEAD $B $A &&\n+\t test $B\"' = $(raw_ref '\"$m\"')'\n+test_expect_success \"fail to delete $m (by HEAD) with stale ref\" '\n+\ttest_must_fail git update-ref -d HEAD $A &&\n+\ttest $B = $(raw_ref '\"$m\"')\n+'\n+test_expect_success \"delete $m (by HEAD)\" '\n+\tgit update-ref -d HEAD $B &&\n+\t! raw_ref $m\n+'\n+delete_ref $m\n+\n+test_expect_success \\\n+\t\"create $m (by HEAD)\" \\\n+\t\"git update-ref HEAD $A &&\n+\t test $A\"' = $(raw_ref '\"$m\"')'\n+test_expect_success \\\n+\t\"pack refs\" \\\n+\t\"git pack-refs --all\"\n+test_expect_success \\\n+\t\"move $m (by HEAD)\" \\\n+\t\"git update-ref HEAD $B $A &&\n+\t test $B\"' = $(raw_ref '\"$m\"')'\n+test_expect_success \"delete $m (by HEAD) should remove both packed and loose $m\" '\n+\tgit update-ref -d HEAD $B &&\n+\t! raw_ref $m\n+'\n+delete_ref $m\n+\n+OLD_HEAD=$(raw_ref HEAD)\n+test_expect_success \"delete symref without dereference\" '\n+\tgit update-ref --no-deref -d HEAD &&\n+\t! raw_ref HEAD\n+'\n+write_ref HEAD \"$OLD_HEAD\"\n+\n+test_expect_success \"delete symref without dereference when the referred ref is packed\" '\n+\techo foo >foo.c &&\n+\tgit add foo.c &&\n+\tgit commit -m foo &&\n+\tgit pack-refs --all &&\n+\tgit update-ref --no-deref -d HEAD &&\n+\t! raw_ref HEAD\n+'\n+write_ref HEAD \"$OLD_HEAD\"\n+delete_ref $m\n+\n+test_expect_success 'update-ref -d is not confused by self-reference' '\n+\tgit symbolic-ref refs/heads/self refs/heads/self &&\n+\ttest_when_finished \"delete_ref refs/heads/self\" &&\n+\ttest_must_fail git update-ref -d refs/heads/self\n+'\n+\n+test_expect_success 'update-ref --no-deref -d can delete self-reference' '\n+\tgit symbolic-ref refs/heads/self refs/heads/self &&\n+\ttest_when_finished \"delete_ref refs/heads/self\" &&\n+\tgit update-ref --no-deref -d refs/heads/self\n+'\n+\n+test_expect_success 'update-ref --no-deref -d can delete reference to bad ref' '\n+\ttest-refs-lmdb-backend refs/heads/bad \"\" &&\n+\ttest_when_finished \"delete_ref refs/heads/bad\" &&\n+\tgit symbolic-ref refs/heads/ref-to-bad refs/heads/bad &&\n+\ttest_when_finished \"delete_ref refs/heads/ref-to-bad\" &&\n+\traw_ref refs/heads/ref-to-bad &&\n+\tgit update-ref --no-deref -d refs/heads/ref-to-bad &&\n+\t! raw_ref refs/heads/ref-to-bad\n+'\n+\n+test_expect_success '(not) create HEAD with old sha1' \"\n+\ttest_must_fail git update-ref HEAD $A $B\n+\"\n+test_expect_success \"(not) prior created .git/$m\" \"\n+\t! raw_ref $m\n+\"\n+delete_ref $m\n+\n+test_expect_success \\\n+\t\"create HEAD\" \\\n+\t\"git update-ref HEAD $A\"\n+test_expect_success '(not) change HEAD with wrong SHA1' \"\n+\ttest_must_fail git update-ref HEAD $B $Z\n+\"\n+test_expect_success \"(not) changed .git/$m\" \"\n+\t! test $B\"' = $(raw_ref '\"$m\"')\n+'\n+\n+: a repository with working tree always has reflog these days...\n+delete_all_reflogs\n+: | append_reflog $m\n+delete_ref $m\n+\n+test_expect_success \\\n+\t\"create $m (logged by touch)\" \\\n+\t'GIT_COMMITTER_DATE=\"2005-05-26 23:30\" \\\n+\t git update-ref HEAD '\"$A\"' -m \"Initial Creation\" &&\n+\t test '\"$A\"' = $(raw_ref '\"$m\"')'\n+test_expect_success \\\n+\t\"update $m (logged by touch)\" \\\n+\t'GIT_COMMITTER_DATE=\"2005-05-26 23:31\" \\\n+\t git update-ref HEAD'\" $B $A \"'-m \"Switch\" &&\n+\t test '\"$B\"' = $(raw_ref '\"$m\"')'\n+test_expect_success \\\n+\t\"set $m (logged by touch)\" \\\n+\t'GIT_COMMITTER_DATE=\"2005-05-26 23:41\" \\\n+\t git update-ref HEAD'\" $A &&\n+\t test $A\"' = $(raw_ref '\"$m\"')'\n+\n+cat >expect < 1117150200 +0000\tInitial Creation\n+$A $B $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150260 +0000\tSwitch\n+$B $A $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150860 +0000\n+EOF\n+test_expect_success \\\n+\t\"verifying $m's log\" \\\n+\t\"raw_reflog $m >actual &&\n+\t test_cmp expect actual\"\n+delete_ref $m\n+delete_all_reflogs\n+: | append_reflog $m\n+rm -f actual expect\n+\n+test_expect_success \\\n+\t'enable core.logAllRefUpdates' \\\n+\t'git config core.logAllRefUpdates true &&\n+\t test true = $(git config --bool --get core.logAllRefUpdates)'\n+\n+test_expect_success \\\n+\t\"create $m (logged by config)\" \\\n+\t'GIT_COMMITTER_DATE=\"2005-05-26 23:32\" \\\n+\t git update-ref HEAD'\" $A \"'-m \"Initial Creation\" &&\n+\t test '\"$A\"' = $(raw_ref '\"$m\"')'\n+test_expect_success \\\n+\t\"update $m (logged by config)\" \\\n+\t'GIT_COMMITTER_DATE=\"2005-05-26 23:33\" \\\n+\t git update-ref HEAD'\" $B $A \"'-m \"Switch\" &&\n+\t test '\"$B\"' = $(raw_ref '\"$m\"')'\n+test_expect_success \\\n+\t\"set $m (logged by config)\" \\\n+\t'GIT_COMMITTER_DATE=\"2005-05-26 23:43\" \\\n+\t git update-ref HEAD '\"$A &&\n+\t test $A\"' = $(raw_ref '\"$m\"')'\n+\n+cat >expect < 1117150320 +0000\tInitial Creation\n+$A $B $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150380 +0000\tSwitch\n+$B $A $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150980 +0000\n+EOF\n+test_expect_success \\\n+\t\"verifying $m's log\" \\\n+\t'raw_reflog $m >actual &&\n+\ttest_cmp expect actual'\n+delete_ref $m\n+rm -f expect\n+\n+git update-ref $m $D\n+git reflog expire --expire=all $m\n+\n+append_reflog $m < 1117150320 -0500\n+$C $A $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150350 -0500\n+$A $B $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150380 -0500\n+$F $Z $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150680 -0500\n+$Z $E $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150980 -0500\n+EOF\n+\n+ed=\"Thu, 26 May 2005 18:32:00 -0500\"\n+gd=\"Thu, 26 May 2005 18:33:00 -0500\"\n+ld=\"Thu, 26 May 2005 18:43:00 -0500\"\n+test_expect_success \\\n+\t'Query \"master@{May 25 2005}\" (before history)' \\\n+\t'rm -f o e &&\n+\t git rev-parse --verify \"master@{May 25 2005}\" >o 2>e &&\n+\t test '\"$C\"' = $(cat o) &&\n+\t test \"warning: Log for '\\'master\\'' only goes back to $ed.\" = \"$(cat e)\"'\n+test_expect_success \\\n+\t\"Query master@{2005-05-25} (before history)\" \\\n+\t'rm -f o e &&\n+\t git rev-parse --verify master@{2005-05-25} >o 2>e &&\n+\t test '\"$C\"' = $(cat o) &&\n+\t echo test \"warning: Log for '\\'master\\'' only goes back to $ed.\" = \"$(cat e)\"'\n+test_expect_success \\\n+\t'Query \"master@{May 26 2005 23:31:59}\" (1 second before history)' \\\n+\t'rm -f o e &&\n+\t git rev-parse --verify \"master@{May 26 2005 23:31:59}\" >o 2>e &&\n+\t test '\"$C\"' = $(cat o) &&\n+\t test \"warning: Log for '\\''master'\\'' only goes back to $ed.\" = \"$(cat e)\"'\n+test_expect_success \\\n+\t'Query \"master@{May 26 2005 23:32:00}\" (exactly history start)' \\\n+\t'rm -f o e &&\n+\t git rev-parse --verify \"master@{May 26 2005 23:32:00}\" >o 2>e &&\n+\t test '\"$C\"' = $(cat o) &&\n+\t test \"\" = \"$(cat e)\"'\n+test_expect_success \\\n+\t'Query \"master@{May 26 2005 23:32:30}\" (first non-creation change)' \\\n+\t'rm -f o e &&\n+\t git rev-parse --verify \"master@{May 26 2005 23:32:30}\" >o 2>e &&\n+\t test '\"$A\"' = $(cat o) &&\n+\t test \"\" = \"$(cat e)\"'\n+test_expect_success \\\n+\t'Query \"master@{2005-05-26 23:33:01}\" (middle of history with gap)' \\\n+\t'rm -f o e &&\n+\t git rev-parse --verify \"master@{2005-05-26 23:33:01}\" >o 2>e &&\n+\t test '\"$B\"' = $(cat o) &&\n+\t test \"warning: Log for ref '\"$m has gap after $gd\"'.\" = \"$(cat e)\"'\n+test_expect_success \\\n+\t'Query \"master@{2005-05-26 23:38:00}\" (middle of history)' \\\n+\t'rm -f o e &&\n+\t git rev-parse --verify \"master@{2005-05-26 23:38:00}\" >o 2>e &&\n+\t test '\"$Z\"' = $(cat o) &&\n+\t test \"\" = \"$(cat e)\"'\n+test_expect_success \\\n+\t'Query \"master@{2005-05-26 23:43:00}\" (exact end of history)' \\\n+\t'rm -f o e &&\n+\t git rev-parse --verify \"master@{2005-05-26 23:43:00}\" >o 2>e &&\n+\t test '\"$E\"' = $(cat o) &&\n+\t test \"\" = \"$(cat e)\"'\n+test_expect_success \\\n+\t'Query \"master@{2005-05-28}\" (past end of history)' \\\n+\t'rm -f o e &&\n+\t git rev-parse --verify \"master@{2005-05-28}\" >o 2>e &&\n+\t test '\"$D\"' = $(cat o) &&\n+\t test \"warning: Log for ref '\"$m unexpectedly ended on $ld\"'.\" = \"$(cat e)\"'\n+\n+\n+git reflog expire --expire=all $m\n+delete_ref $m\n+\n+test_expect_success \\\n+ 'creating initial files' \\\n+ 'echo TEST >F &&\n+ git add F &&\n+\t GIT_AUTHOR_DATE=\"2005-05-26 23:30\" \\\n+\t GIT_COMMITTER_DATE=\"2005-05-26 23:30\" git commit -m add -a &&\n+\t h_TEST=$(git rev-parse --verify HEAD) &&\n+\t echo The other day this did not work. >M &&\n+\t echo And then Bob told me how to fix it. >>M &&\n+\t echo OTHER >F &&\n+\t GIT_AUTHOR_DATE=\"2005-05-26 23:41\" \\\n+\t GIT_COMMITTER_DATE=\"2005-05-26 23:41\" git commit -F M -a &&\n+\t h_OTHER=$(git rev-parse --verify HEAD) &&\n+\t GIT_AUTHOR_DATE=\"2005-05-26 23:44\" \\\n+\t GIT_COMMITTER_DATE=\"2005-05-26 23:44\" git commit --amend &&\n+\t h_FIXED=$(git rev-parse --verify HEAD) &&\n+\t echo Merged initial commit and a later commit. >M &&\n+\t echo $h_TEST >.git/MERGE_HEAD &&\n+\t GIT_AUTHOR_DATE=\"2005-05-26 23:45\" \\\n+\t GIT_COMMITTER_DATE=\"2005-05-26 23:45\" git commit -F M &&\n+\t h_MERGED=$(git rev-parse --verify HEAD) &&\n+\t rm -f M'\n+\n+cat >expect < 1117150200 +0000\tcommit (initial): add\n+$h_TEST $h_OTHER $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150860 +0000\tcommit: The other day this did not work.\n+$h_OTHER $h_FIXED $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117151040 +0000\tcommit (amend): The other day this did not work.\n+$h_FIXED $h_MERGED $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117151100 +0000\tcommit (merge): Merged initial commit and a later commit.\n+EOF\n+test_expect_success \\\n+\t'git commit logged updates' \\\n+\t\"raw_reflog $m >actual &&\n+\ttest_cmp expect actual\"\n+unset h_TEST h_OTHER h_FIXED h_MERGED\n+\n+test_expect_success \\\n+\t'git cat-file blob master:F (expect OTHER)' \\\n+\t'test OTHER = $(git cat-file blob master:F)'\n+test_expect_success \\\n+\t'git cat-file blob master@{2005-05-26 23:30}:F (expect TEST)' \\\n+\t'test TEST = $(git cat-file blob \"master@{2005-05-26 23:30}:F\")'\n+test_expect_success \\\n+\t'git cat-file blob master@{2005-05-26 23:42}:F (expect OTHER)' \\\n+\t'test OTHER = $(git cat-file blob \"master@{2005-05-26 23:42}:F\")'\n+\n+a=refs/heads/a\n+b=refs/heads/b\n+c=refs/heads/c\n+E='\"\"'\n+F='%s\\0'\n+pws='path with space'\n+\n+test_expect_success 'stdin test setup' '\n+\techo \"$pws\" >\"$pws\" &&\n+\tgit add -- \"$pws\" &&\n+\tgit commit -m \"$pws\"\n+'\n+\n+test_expect_success '-z fails without --stdin' '\n+\ttest_must_fail git update-ref -z $m $m $m 2>err &&\n+\tgrep \"usage: git update-ref\" err\n+'\n+\n+test_expect_success 'stdin works with no input' '\n+\t>stdin &&\n+\tgit update-ref --stdin stdin &&\n+\ttest_must_fail git update-ref --stdin err &&\n+\tgrep \"fatal: empty command in input\" err\n+'\n+\n+test_expect_success 'stdin fails on only whitespace' '\n+\techo \" \" >stdin &&\n+\ttest_must_fail git update-ref --stdin err &&\n+\tgrep \"fatal: whitespace before command: \" err\n+'\n+\n+test_expect_success 'stdin fails on leading whitespace' '\n+\techo \" create $a $m\" >stdin &&\n+\ttest_must_fail git update-ref --stdin err &&\n+\tgrep \"fatal: whitespace before command: create $a $m\" err\n+'\n+\n+test_expect_success 'stdin fails on unknown command' '\n+\techo \"unknown $a\" >stdin &&\n+\ttest_must_fail git update-ref --stdin err &&\n+\tgrep \"fatal: unknown command: unknown $a\" err\n+'\n+\n+test_expect_success 'stdin fails on unbalanced quotes' '\n+\techo \"create $a \\\"master\" >stdin &&\n+\ttest_must_fail git update-ref --stdin err &&\n+\tgrep \"fatal: badly quoted argument: \\\\\\\"master\" err\n+'\n+\n+test_expect_success 'stdin fails on invalid escape' '\n+\techo \"create $a \\\"ma\\zter\\\"\" >stdin &&\n+\ttest_must_fail git update-ref --stdin err &&\n+\tgrep \"fatal: badly quoted argument: \\\\\\\"ma\\\\\\\\zter\\\\\\\"\" err\n+'\n+\n+test_expect_success 'stdin fails on junk after quoted argument' '\n+\techo \"create \\\"$a\\\"master\" >stdin &&\n+\ttest_must_fail git update-ref --stdin err &&\n+\tgrep \"fatal: unexpected character after quoted argument: \\\\\\\"$a\\\\\\\"master\" err\n+'\n+\n+test_expect_success 'stdin fails create with no ref' '\n+\techo \"create \" >stdin &&\n+\ttest_must_fail git update-ref --stdin err &&\n+\tgrep \"fatal: create: missing \" err\n+'\n+\n+test_expect_success 'stdin fails create with no new value' '\n+\techo \"create $a\" >stdin &&\n+\ttest_must_fail git update-ref --stdin err &&\n+\tgrep \"fatal: create $a: missing \" err\n+'\n+\n+test_expect_success 'stdin fails create with too many arguments' '\n+\techo \"create $a $m $m\" >stdin &&\n+\ttest_must_fail git update-ref --stdin err &&\n+\tgrep \"fatal: create $a: extra input: $m\" err\n+'\n+\n+test_expect_success 'stdin fails update with no ref' '\n+\techo \"update \" >stdin &&\n+\ttest_must_fail git update-ref --stdin err &&\n+\tgrep \"fatal: update: missing \" err\n+'\n+\n+test_expect_success 'stdin fails update with no new value' '\n+\techo \"update $a\" >stdin &&\n+\ttest_must_fail git update-ref --stdin err &&\n+\tgrep \"fatal: update $a: missing \" err\n+'\n+\n+test_expect_success 'stdin fails update with too many arguments' '\n+\techo \"update $a $m $m $m\" >stdin &&\n+\ttest_must_fail git update-ref --stdin err &&\n+\tgrep \"fatal: update $a: extra input: $m\" err\n+'\n+\n+test_expect_success 'stdin fails delete with no ref' '\n+\techo \"delete \" >stdin &&\n+\ttest_must_fail git update-ref --stdin err &&\n+\tgrep \"fatal: delete: missing \" err\n+'\n+\n+test_expect_success 'stdin fails delete with too many arguments' '\n+\techo \"delete $a $m $m\" >stdin &&\n+\ttest_must_fail git update-ref --stdin err &&\n+\tgrep \"fatal: delete $a: extra input: $m\" err\n+'\n+\n+test_expect_success 'stdin fails verify with too many arguments' '\n+\techo \"verify $a $m $m\" >stdin &&\n+\ttest_must_fail git update-ref --stdin err &&\n+\tgrep \"fatal: verify $a: extra input: $m\" err\n+'\n+\n+test_expect_success 'stdin fails option with unknown name' '\n+\techo \"option unknown\" >stdin &&\n+\ttest_must_fail git update-ref --stdin err &&\n+\tgrep \"fatal: option unknown: unknown\" err\n+'\n+\n+test_expect_success 'stdin fails with duplicate refs' '\n+\tcat >stdin <<-EOF &&\n+\tcreate $a $m\n+\tcreate $b $m\n+\tcreate $a $m\n+\tEOF\n+\ttest_must_fail git update-ref --stdin err &&\n+\tgrep \"fatal: Multiple updates for ref '\"'\"'$a'\"'\"' not allowed.\" err\n+'\n+\n+test_expect_success 'stdin create ref works' '\n+\techo \"create $a $m\" >stdin &&\n+\tgit update-ref --stdin expect &&\n+\tgit rev-parse $a >actual &&\n+\ttest_cmp expect actual\n+'\n+\n+test_expect_success 'stdin succeeds with quoted argument' '\n+\tgit update-ref -d $a &&\n+\techo \"create $a \\\"$m\\\"\" >stdin &&\n+\tgit update-ref --stdin expect &&\n+\tgit rev-parse $a >actual &&\n+\ttest_cmp expect actual\n+'\n+\n+test_expect_success 'stdin succeeds with escaped character' '\n+\tgit update-ref -d $a &&\n+\techo \"create $a \\\"ma\\\\163ter\\\"\" >stdin &&\n+\tgit update-ref --stdin expect &&\n+\tgit rev-parse $a >actual &&\n+\ttest_cmp expect actual\n+'\n+\n+test_expect_success 'stdin update ref creates with zero old value' '\n+\techo \"update $b $m $Z\" >stdin &&\n+\tgit update-ref --stdin expect &&\n+\tgit rev-parse $b >actual &&\n+\ttest_cmp expect actual &&\n+\tgit update-ref -d $b\n+'\n+\n+test_expect_success 'stdin update ref creates with empty old value' '\n+\techo \"update $b $m $E\" >stdin &&\n+\tgit update-ref --stdin expect &&\n+\tgit rev-parse $b >actual &&\n+\ttest_cmp expect actual\n+'\n+\n+test_expect_success 'stdin create ref works with path with space to blob' '\n+\techo \"create refs/blobs/pws \\\"$m:$pws\\\"\" >stdin &&\n+\tgit update-ref --stdin expect &&\n+\tgit rev-parse refs/blobs/pws >actual &&\n+\ttest_cmp expect actual &&\n+\tgit update-ref -d refs/blobs/pws\n+'\n+\n+test_expect_success 'stdin update ref fails with wrong old value' '\n+\techo \"update $c $m $m~1\" >stdin &&\n+\ttest_must_fail git update-ref --stdin err &&\n+\tgrep \"fatal: cannot lock the ref '\"'\"'$c'\"'\"'\" err &&\n+\ttest_must_fail git rev-parse --verify -q $c\n+'\n+\n+test_expect_success 'stdin update ref fails with bad old value' '\n+\techo \"update $c $m does-not-exist\" >stdin &&\n+\ttest_must_fail git update-ref --stdin err &&\n+\tgrep \"fatal: update $c: invalid : does-not-exist\" err &&\n+\ttest_must_fail git rev-parse --verify -q $c\n+'\n+\n+test_expect_success 'stdin create ref fails with bad new value' '\n+\techo \"create $c does-not-exist\" >stdin &&\n+\ttest_must_fail git update-ref --stdin err &&\n+\tgrep \"fatal: create $c: invalid : does-not-exist\" err &&\n+\ttest_must_fail git rev-parse --verify -q $c\n+'\n+\n+test_expect_success 'stdin create ref fails with zero new value' '\n+\techo \"create $c \" >stdin &&\n+\ttest_must_fail git update-ref --stdin err &&\n+\tgrep \"fatal: create $c: zero \" err &&\n+\ttest_must_fail git rev-parse --verify -q $c\n+'\n+\n+test_expect_success 'stdin update ref works with right old value' '\n+\techo \"update $b $m~1 $m\" >stdin &&\n+\tgit update-ref --stdin expect &&\n+\tgit rev-parse $b >actual &&\n+\ttest_cmp expect actual\n+'\n+\n+test_expect_success 'stdin delete ref fails with wrong old value' '\n+\techo \"delete $a $m~1\" >stdin &&\n+\ttest_must_fail git update-ref --stdin err &&\n+\tgrep \"fatal: cannot lock the ref '\"'\"'$a'\"'\"'\" err &&\n+\tgit rev-parse $m >expect &&\n+\tgit rev-parse $a >actual &&\n+\ttest_cmp expect actual\n+'\n+\n+test_expect_success 'stdin delete ref fails with zero old value' '\n+\techo \"delete $a \" >stdin &&\n+\ttest_must_fail git update-ref --stdin err &&\n+\tgrep \"fatal: delete $a: zero \" err &&\n+\tgit rev-parse $m >expect &&\n+\tgit rev-parse $a >actual &&\n+\ttest_cmp expect actual\n+'\n+\n+test_expect_success 'stdin update symref works option no-deref' '\n+\tgit symbolic-ref refs/TESTSYMREF $b &&\n+\tcat >stdin <<-EOF &&\n+\toption no-deref\n+\tupdate refs/TESTSYMREF $a $b\n+\tEOF\n+\tgit update-ref --stdin expect &&\n+\tgit rev-parse $a >actual &&\n+\ttest_cmp expect actual &&\n+\tgit rev-parse $m~1 >expect &&\n+\tgit rev-parse $b >actual &&\n+\ttest_cmp expect actual\n+'\n+\n+test_expect_success 'stdin delete symref works option no-deref' '\n+\tgit symbolic-ref refs/TESTSYMREF $b &&\n+\tcat >stdin <<-EOF &&\n+\toption no-deref\n+\tdelete refs/TESTSYMREF $b\n+\tEOF\n+\tgit update-ref --stdin expect &&\n+\tgit rev-parse $b >actual &&\n+\ttest_cmp expect actual\n+'\n+\n+test_expect_success 'stdin delete ref works with right old value' '\n+\techo \"delete $b $m~1\" >stdin &&\n+\tgit update-ref --stdin stdin <<-EOF &&\n+\tupdate $a $m\n+\tcreate $b $m\n+\tverify $c\n+\tEOF\n+\tgit update-ref --stdin expect &&\n+\tgit rev-parse $a >actual &&\n+\ttest_cmp expect actual &&\n+\tgit rev-parse $b >actual &&\n+\ttest_cmp expect actual &&\n+\ttest_must_fail git rev-parse --verify -q $c\n+'\n+\n+test_expect_success 'stdin verify succeeds for correct value' '\n+\tgit rev-parse $m >expect &&\n+\techo \"verify $m $m\" >stdin &&\n+\tgit update-ref --stdin actual &&\n+\ttest_cmp expect actual\n+'\n+\n+test_expect_success 'stdin verify succeeds for missing reference' '\n+\techo \"verify refs/heads/missing $Z\" >stdin &&\n+\tgit update-ref --stdin stdin &&\n+\tgit update-ref --stdin expect &&\n+\techo \"verify $m $m~1\" >stdin &&\n+\ttest_must_fail git update-ref --stdin actual &&\n+\ttest_cmp expect actual\n+'\n+\n+test_expect_success 'stdin verify fails for mistaken null value' '\n+\tgit rev-parse $m >expect &&\n+\techo \"verify $m $Z\" >stdin &&\n+\ttest_must_fail git update-ref --stdin actual &&\n+\ttest_cmp expect actual\n+'\n+\n+test_expect_success 'stdin verify fails for mistaken empty value' '\n+\tM=$(git rev-parse $m) &&\n+\ttest_when_finished \"git update-ref $m $M\" &&\n+\tgit rev-parse $m >expect &&\n+\techo \"verify $m\" >stdin &&\n+\ttest_must_fail git update-ref --stdin actual &&\n+\ttest_cmp expect actual\n+'\n+\n+test_expect_success 'stdin update refs works with identity updates' '\n+\tcat >stdin <<-EOF &&\n+\tupdate $a $m $m\n+\tupdate $b $m $m\n+\tupdate $c $Z $E\n+\tEOF\n+\tgit update-ref --stdin expect &&\n+\tgit rev-parse $a >actual &&\n+\ttest_cmp expect actual &&\n+\tgit rev-parse $b >actual &&\n+\ttest_cmp expect actual &&\n+\ttest_must_fail git rev-parse --verify -q $c\n+'\n+\n+test_expect_success 'stdin update refs fails with wrong old value' '\n+\tgit update-ref $c $m &&\n+\tcat >stdin <<-EOF &&\n+\tupdate $a $m $m\n+\tupdate $b $m $m\n+\tupdate $c ''\n+\tEOF\n+\ttest_must_fail git update-ref --stdin err &&\n+\tgrep \"fatal: cannot lock the ref '\"'\"'$c'\"'\"'\" err &&\n+\tgit rev-parse $m >expect &&\n+\tgit rev-parse $a >actual &&\n+\ttest_cmp expect actual &&\n+\tgit rev-parse $b >actual &&\n+\ttest_cmp expect actual &&\n+\tgit rev-parse $c >actual &&\n+\ttest_cmp expect actual\n+'\n+\n+test_expect_success 'stdin delete refs works with packed and loose refs' '\n+\tgit pack-refs --all &&\n+\tgit update-ref $c $m~1 &&\n+\tcat >stdin <<-EOF &&\n+\tdelete $a $m\n+\tupdate $b $Z $m\n+\tupdate $c $E $m~1\n+\tEOF\n+\tgit update-ref --stdin stdin &&\n+\tgit update-ref -z --stdin stdin &&\n+\ttest_must_fail git update-ref -z --stdin err &&\n+\tgrep \"fatal: whitespace before command: \" err\n+'\n+\n+test_expect_success 'stdin -z fails on empty command' '\n+\tprintf $F \"\" >stdin &&\n+\ttest_must_fail git update-ref -z --stdin err &&\n+\tgrep \"fatal: empty command in input\" err\n+'\n+\n+test_expect_success 'stdin -z fails on only whitespace' '\n+\tprintf $F \" \" >stdin &&\n+\ttest_must_fail git update-ref -z --stdin err &&\n+\tgrep \"fatal: whitespace before command: \" err\n+'\n+\n+test_expect_success 'stdin -z fails on leading whitespace' '\n+\tprintf $F \" create $a\" \"$m\" >stdin &&\n+\ttest_must_fail git update-ref -z --stdin err &&\n+\tgrep \"fatal: whitespace before command: create $a\" err\n+'\n+\n+test_expect_success 'stdin -z fails on unknown command' '\n+\tprintf $F \"unknown $a\" >stdin &&\n+\ttest_must_fail git update-ref -z --stdin err &&\n+\tgrep \"fatal: unknown command: unknown $a\" err\n+'\n+\n+test_expect_success 'stdin -z fails create with no ref' '\n+\tprintf $F \"create \" >stdin &&\n+\ttest_must_fail git update-ref -z --stdin err &&\n+\tgrep \"fatal: create: missing \" err\n+'\n+\n+test_expect_success 'stdin -z fails create with no new value' '\n+\tprintf $F \"create $a\" >stdin &&\n+\ttest_must_fail git update-ref -z --stdin err &&\n+\tgrep \"fatal: create $a: unexpected end of input when reading \" err\n+'\n+\n+test_expect_success 'stdin -z fails create with too many arguments' '\n+\tprintf $F \"create $a\" \"$m\" \"$m\" >stdin &&\n+\ttest_must_fail git update-ref -z --stdin err &&\n+\tgrep \"fatal: unknown command: $m\" err\n+'\n+\n+test_expect_success 'stdin -z fails update with no ref' '\n+\tprintf $F \"update \" >stdin &&\n+\ttest_must_fail git update-ref -z --stdin err &&\n+\tgrep \"fatal: update: missing \" err\n+'\n+\n+test_expect_success 'stdin -z fails update with too few args' '\n+\tprintf $F \"update $a\" \"$m\" >stdin &&\n+\ttest_must_fail git update-ref -z --stdin err &&\n+\tgrep \"fatal: update $a: unexpected end of input when reading \" err\n+'\n+\n+test_expect_success 'stdin -z emits warning with empty new value' '\n+\tgit update-ref $a $m &&\n+\tprintf $F \"update $a\" \"\" \"\" >stdin &&\n+\tgit update-ref -z --stdin err &&\n+\tgrep \"warning: update $a: missing , treating as zero\" err &&\n+\ttest_must_fail git rev-parse --verify -q $a\n+'\n+\n+test_expect_success 'stdin -z fails update with no new value' '\n+\tprintf $F \"update $a\" >stdin &&\n+\ttest_must_fail git update-ref -z --stdin err &&\n+\tgrep \"fatal: update $a: unexpected end of input when reading \" err\n+'\n+\n+test_expect_success 'stdin -z fails update with no old value' '\n+\tprintf $F \"update $a\" \"$m\" >stdin &&\n+\ttest_must_fail git update-ref -z --stdin err &&\n+\tgrep \"fatal: update $a: unexpected end of input when reading \" err\n+'\n+\n+test_expect_success 'stdin -z fails update with too many arguments' '\n+\tprintf $F \"update $m\" \"$m\" \"$m\" \"$m\" >stdin &&\n+\ttest_must_fail git update-ref -z --stdin err &&\n+\tgrep \"fatal: unknown command: $m\" err\n+'\n+\n+test_expect_success 'stdin -z fails delete with no ref' '\n+\tprintf $F \"delete \" >stdin &&\n+\ttest_must_fail git update-ref -z --stdin err &&\n+\tgrep \"fatal: delete: missing \" err\n+'\n+\n+test_expect_success 'stdin -z fails delete with no old value' '\n+\tprintf $F \"delete $a\" >stdin &&\n+\ttest_must_fail git update-ref -z --stdin err &&\n+\tgrep \"fatal: delete $a: unexpected end of input when reading \" err\n+'\n+\n+test_expect_success 'stdin -z fails delete with too many arguments' '\n+\tprintf $F \"delete $m\" \"$m\" \"$m\" >stdin &&\n+\ttest_must_fail git update-ref -z --stdin err &&\n+\tgrep \"fatal: unknown command: $m\" err\n+'\n+\n+test_expect_success 'stdin -z fails verify with too many arguments' '\n+\tprintf $F \"verify $m\" \"$m\" \"$m\" >stdin &&\n+\ttest_must_fail git update-ref -z --stdin err &&\n+\tgrep \"fatal: unknown command: $m\" err\n+'\n+\n+test_expect_success 'stdin -z fails verify with no old value' '\n+\tprintf $F \"verify $a\" >stdin &&\n+\ttest_must_fail git update-ref -z --stdin err &&\n+\tgrep \"fatal: verify $a: unexpected end of input when reading \" err\n+'\n+\n+test_expect_success 'stdin -z fails option with unknown name' '\n+\tprintf $F \"option unknown\" >stdin &&\n+\ttest_must_fail git update-ref -z --stdin err &&\n+\tgrep \"fatal: option unknown: unknown\" err\n+'\n+\n+test_expect_success 'stdin -z fails with duplicate refs' '\n+\tprintf $F \"create $a\" \"$m\" \"create $b\" \"$m\" \"create $a\" \"$m\" >stdin &&\n+\ttest_must_fail git update-ref -z --stdin err &&\n+\tgrep \"fatal: Multiple updates for ref '\"'\"'$a'\"'\"' not allowed.\" err\n+'\n+\n+test_expect_success 'stdin -z create ref works' '\n+\tprintf $F \"create $a\" \"$m\" >stdin &&\n+\tgit update-ref -z --stdin expect &&\n+\tgit rev-parse $a >actual &&\n+\ttest_cmp expect actual\n+'\n+\n+test_expect_success 'stdin -z update ref creates with zero old value' '\n+\tprintf $F \"update $b\" \"$m\" \"$Z\" >stdin &&\n+\tgit update-ref -z --stdin expect &&\n+\tgit rev-parse $b >actual &&\n+\ttest_cmp expect actual &&\n+\tgit update-ref -d $b\n+'\n+\n+test_expect_success 'stdin -z update ref creates with empty old value' '\n+\tprintf $F \"update $b\" \"$m\" \"\" >stdin &&\n+\tgit update-ref -z --stdin expect &&\n+\tgit rev-parse $b >actual &&\n+\ttest_cmp expect actual\n+'\n+\n+test_expect_success 'stdin -z create ref works with path with space to blob' '\n+\tprintf $F \"create refs/blobs/pws\" \"$m:$pws\" >stdin &&\n+\tgit update-ref -z --stdin expect &&\n+\tgit rev-parse refs/blobs/pws >actual &&\n+\ttest_cmp expect actual &&\n+\tgit update-ref -d refs/blobs/pws\n+'\n+\n+test_expect_success 'stdin -z update ref fails with wrong old value' '\n+\tprintf $F \"update $c\" \"$m\" \"$m~1\" >stdin &&\n+\ttest_must_fail git update-ref -z --stdin err &&\n+\tgrep \"fatal: cannot lock the ref '\"'\"'$c'\"'\"'\" err &&\n+\ttest_must_fail git rev-parse --verify -q $c\n+'\n+\n+test_expect_success 'stdin -z update ref fails with bad old value' '\n+\tprintf $F \"update $c\" \"$m\" \"does-not-exist\" >stdin &&\n+\ttest_must_fail git update-ref -z --stdin err &&\n+\tgrep \"fatal: update $c: invalid : does-not-exist\" err &&\n+\ttest_must_fail git rev-parse --verify -q $c\n+'\n+\n+test_expect_success 'stdin -z create ref fails when ref exists' '\n+\tgit update-ref $c $m &&\n+\tgit rev-parse \"$c\" >expect &&\n+\tprintf $F \"create $c\" \"$m~1\" >stdin &&\n+\ttest_must_fail git update-ref -z --stdin err &&\n+\tgrep \"fatal: cannot lock the ref '\"'\"'$c'\"'\"'\" err &&\n+\tgit rev-parse \"$c\" >actual &&\n+\ttest_cmp expect actual\n+'\n+\n+test_expect_success 'stdin -z create ref fails with bad new value' '\n+\tgit update-ref -d \"$c\" &&\n+\tprintf $F \"create $c\" \"does-not-exist\" >stdin &&\n+\ttest_must_fail git update-ref -z --stdin err &&\n+\tgrep \"fatal: create $c: invalid : does-not-exist\" err &&\n+\ttest_must_fail git rev-parse --verify -q $c\n+'\n+\n+test_expect_success 'stdin -z create ref fails with empty new value' '\n+\tprintf $F \"create $c\" \"\" >stdin &&\n+\ttest_must_fail git update-ref -z --stdin err &&\n+\tgrep \"fatal: create $c: missing \" err &&\n+\ttest_must_fail git rev-parse --verify -q $c\n+'\n+\n+test_expect_success 'stdin -z update ref works with right old value' '\n+\tprintf $F \"update $b\" \"$m~1\" \"$m\" >stdin &&\n+\tgit update-ref -z --stdin expect &&\n+\tgit rev-parse $b >actual &&\n+\ttest_cmp expect actual\n+'\n+\n+test_expect_success 'stdin -z delete ref fails with wrong old value' '\n+\tprintf $F \"delete $a\" \"$m~1\" >stdin &&\n+\ttest_must_fail git update-ref -z --stdin err &&\n+\tgrep \"fatal: cannot lock the ref '\"'\"'$a'\"'\"'\" err &&\n+\tgit rev-parse $m >expect &&\n+\tgit rev-parse $a >actual &&\n+\ttest_cmp expect actual\n+'\n+\n+test_expect_success 'stdin -z delete ref fails with zero old value' '\n+\tprintf $F \"delete $a\" \"$Z\" >stdin &&\n+\ttest_must_fail git update-ref -z --stdin err &&\n+\tgrep \"fatal: delete $a: zero \" err &&\n+\tgit rev-parse $m >expect &&\n+\tgit rev-parse $a >actual &&\n+\ttest_cmp expect actual\n+'\n+\n+test_expect_success 'stdin -z update symref works option no-deref' '\n+\tgit symbolic-ref refs/TESTSYMREF $b &&\n+\tprintf $F \"option no-deref\" \"update refs/TESTSYMREF\" \"$a\" \"$b\" >stdin &&\n+\tgit update-ref -z --stdin expect &&\n+\tgit rev-parse $a >actual &&\n+\ttest_cmp expect actual &&\n+\tgit rev-parse $m~1 >expect &&\n+\tgit rev-parse $b >actual &&\n+\ttest_cmp expect actual\n+'\n+\n+test_expect_success 'stdin -z delete symref works option no-deref' '\n+\tgit symbolic-ref refs/TESTSYMREF $b &&\n+\tprintf $F \"option no-deref\" \"delete refs/TESTSYMREF\" \"$b\" >stdin &&\n+\tgit update-ref -z --stdin expect &&\n+\tgit rev-parse $b >actual &&\n+\ttest_cmp expect actual\n+'\n+\n+test_expect_success 'stdin -z delete ref works with right old value' '\n+\tprintf $F \"delete $b\" \"$m~1\" >stdin &&\n+\tgit update-ref -z --stdin stdin &&\n+\tgit update-ref -z --stdin expect &&\n+\tgit rev-parse $a >actual &&\n+\ttest_cmp expect actual &&\n+\tgit rev-parse $b >actual &&\n+\ttest_cmp expect actual &&\n+\ttest_must_fail git rev-parse --verify -q $c\n+'\n+\n+test_expect_success 'stdin -z verify succeeds for correct value' '\n+\tgit rev-parse $m >expect &&\n+\tprintf $F \"verify $m\" \"$m\" >stdin &&\n+\tgit update-ref -z --stdin actual &&\n+\ttest_cmp expect actual\n+'\n+\n+test_expect_success 'stdin -z verify succeeds for missing reference' '\n+\tprintf $F \"verify refs/heads/missing\" \"$Z\" >stdin &&\n+\tgit update-ref -z --stdin stdin &&\n+\tgit update-ref -z --stdin expect &&\n+\tprintf $F \"verify $m\" \"$m~1\" >stdin &&\n+\ttest_must_fail git update-ref -z --stdin actual &&\n+\ttest_cmp expect actual\n+'\n+\n+test_expect_success 'stdin -z verify fails for mistaken null value' '\n+\tgit rev-parse $m >expect &&\n+\tprintf $F \"verify $m\" \"$Z\" >stdin &&\n+\ttest_must_fail git update-ref -z --stdin actual &&\n+\ttest_cmp expect actual\n+'\n+\n+test_expect_success 'stdin -z verify fails for mistaken empty value' '\n+\tM=$(git rev-parse $m) &&\n+\ttest_when_finished \"git update-ref $m $M\" &&\n+\tgit rev-parse $m >expect &&\n+\tprintf $F \"verify $m\" \"\" >stdin &&\n+\ttest_must_fail git update-ref -z --stdin actual &&\n+\ttest_cmp expect actual\n+'\n+\n+test_expect_success 'stdin -z update refs works with identity updates' '\n+\tprintf $F \"update $a\" \"$m\" \"$m\" \"update $b\" \"$m\" \"$m\" \"update $c\" \"$Z\" \"\" >stdin &&\n+\tgit update-ref -z --stdin expect &&\n+\tgit rev-parse $a >actual &&\n+\ttest_cmp expect actual &&\n+\tgit rev-parse $b >actual &&\n+\ttest_cmp expect actual &&\n+\ttest_must_fail git rev-parse --verify -q $c\n+'\n+\n+test_expect_success 'stdin -z update refs fails with wrong old value' '\n+\tgit update-ref $c $m &&\n+\tprintf $F \"update $a\" \"$m\" \"$m\" \"update $b\" \"$m\" \"$m\" \"update $c\" \"$m\" \"$Z\" >stdin &&\n+\ttest_must_fail git update-ref -z --stdin err &&\n+\tgrep \"fatal: cannot lock the ref '\"'\"'$c'\"'\"'\" err &&\n+\tgit rev-parse $m >expect &&\n+\tgit rev-parse $a >actual &&\n+\ttest_cmp expect actual &&\n+\tgit rev-parse $b >actual &&\n+\ttest_cmp expect actual &&\n+\tgit rev-parse $c >actual &&\n+\ttest_cmp expect actual\n+'\n+\n+test_expect_success 'stdin -z delete refs works with packed and loose refs' '\n+\tgit pack-refs --all &&\n+\tgit update-ref $c $m~1 &&\n+\tprintf $F \"delete $a\" \"$m\" \"update $b\" \"$Z\" \"$m\" \"update $c\" \"\" \"$m~1\" >stdin &&\n+\tgit update-ref -z --stdin /dev/null || test-refs-lmdb-backend -l \"$1\"\n+}\n+\n+append_reflog() {\n+\ttest-refs-lmdb-backend -a \"$1\"\n+}\n+\n+check_have () {\n+\tgaah= &&\n+\tfor N in \"$@\"\n+\tdo\n+\t\teval \"o=\\$$N\" && git cat-file -t $o || {\n+\t\t\techo Gaah $N\n+\t\t\tgaah=$N\n+\t\t\tbreak\n+\t\t}\n+\tdone &&\n+\ttest -z \"$gaah\"\n+}\n+\n+check_fsck () {\n+\toutput=$(git fsck --full)\n+\tcase \"$1\" in\n+\t'')\n+\t\ttest -z \"$output\" ;;\n+\t*)\n+\t\techo \"$output\" | grep \"$1\" ;;\n+\tesac\n+}\n+\n+corrupt () {\n+\taa=${1%??????????????????????????????????????} zz=${1#??}\n+\tmv .git/objects/$aa/$zz .git/$aa$zz\n+}\n+\n+recover () {\n+\taa=${1%??????????????????????????????????????} zz=${1#??}\n+\tmkdir -p .git/objects/$aa\n+\tmv .git/$aa$zz .git/objects/$aa/$zz\n+}\n+\n+check_dont_have () {\n+\tgaah= &&\n+\tfor N in \"$@\"\n+\tdo\n+\t\teval \"o=\\$$N\"\n+\t\tgit cat-file -t $o && {\n+\t\t\techo Gaah $N\n+\t\t\tgaah=$N\n+\t\t\tbreak\n+\t\t}\n+\tdone\n+\ttest -z \"$gaah\"\n+}\n+\n+test_expect_success setup '\n+\tgit init --ref-storage=lmdb &&\n+\tmkdir -p A/B &&\n+\techo rat >C &&\n+\techo ox >A/D &&\n+\techo tiger >A/B/E &&\n+\tgit add . &&\n+\n+\ttest_tick && git commit -m rabbit &&\n+\tH=`git rev-parse --verify HEAD` &&\n+\tA=`git rev-parse --verify HEAD:A` &&\n+\tB=`git rev-parse --verify HEAD:A/B` &&\n+\tC=`git rev-parse --verify HEAD:C` &&\n+\tD=`git rev-parse --verify HEAD:A/D` &&\n+\tE=`git rev-parse --verify HEAD:A/B/E` &&\n+\tcheck_fsck &&\n+\n+\ttest_chmod +x C &&\n+\tgit add C &&\n+\ttest_tick && git commit -m dragon &&\n+\tL=`git rev-parse --verify HEAD` &&\n+\tcheck_fsck &&\n+\n+\trm -f C A/B/E &&\n+\techo snake >F &&\n+\techo horse >A/G &&\n+\tgit add F A/G &&\n+\ttest_tick && git commit -a -m sheep &&\n+\tF=`git rev-parse --verify HEAD:F` &&\n+\tG=`git rev-parse --verify HEAD:A/G` &&\n+\tI=`git rev-parse --verify HEAD:A` &&\n+\tJ=`git rev-parse --verify HEAD` &&\n+\tcheck_fsck &&\n+\n+\trm -f A/G &&\n+\ttest_tick && git commit -a -m monkey &&\n+\tK=`git rev-parse --verify HEAD` &&\n+\tcheck_fsck &&\n+\n+\tcheck_have A B C D E F G H I J K L &&\n+\n+\tgit prune &&\n+\n+\tcheck_have A B C D E F G H I J K L &&\n+\n+\tcheck_fsck &&\n+\n+\traw_reflog refs/heads/master >reflog &&\n+\ttest_when_finished rm -f reflog &&\n+\ttest_line_count = 4 reflog\n+'\n+\n+test_expect_success rewind '\n+\ttest_tick && git reset --hard HEAD~2 &&\n+\ttest -f C &&\n+\ttest -f A/B/E &&\n+\t! test -f F &&\n+\t! test -f A/G &&\n+\n+\tcheck_have A B C D E F G H I J K L &&\n+\n+\tgit prune &&\n+\n+\tcheck_have A B C D E F G H I J K L &&\n+\n+\traw_reflog refs/heads/master >reflog &&\n+\ttest_when_finished rm -f reflog &&\n+\ttest_line_count = 5 reflog\n+'\n+\n+test_expect_success 'corrupt and check' '\n+\n+\tcorrupt $F &&\n+\tcheck_fsck \"missing blob $F\"\n+\n+'\n+\n+test_expect_success 'reflog expire --dry-run should not touch reflog' '\n+\n+\tgit reflog expire --dry-run \\\n+\t\t--expire=$(($test_tick - 10000)) \\\n+\t\t--expire-unreachable=$(($test_tick - 10000)) \\\n+\t\t--stale-fix \\\n+\t\t--all &&\n+\n+\traw_reflog refs/heads/master >reflog &&\n+\ttest_when_finished rm -f reflog &&\n+\ttest_line_count = 5 reflog &&\n+\n+\tcheck_fsck \"missing blob $F\"\n+'\n+\n+test_expect_success 'reflog expire' '\n+\n+\tgit reflog expire --verbose \\\n+\t\t--expire=$(($test_tick - 10000)) \\\n+\t\t--expire-unreachable=$(($test_tick - 10000)) \\\n+\t\t--stale-fix \\\n+\t\t--all &&\n+\n+\techo git reflog expire --verbose \\\n+\t\t--expire=$(($test_tick - 10000)) \\\n+\t\t--expire-unreachable=$(($test_tick - 10000)) \\\n+\t\t--stale-fix \\\n+\t\t--all &&\n+\n+\traw_reflog refs/heads/master >reflog &&\n+\ttest_when_finished rm -f reflog &&\n+\ttest_line_count = 2 reflog &&\n+\n+\tcheck_fsck \"dangling commit $K\"\n+'\n+\n+test_expect_success 'prune and fsck' '\n+\n+\tgit prune &&\n+\tcheck_fsck &&\n+\n+\tcheck_have A B C D E H L &&\n+\tcheck_dont_have F G I J K\n+\n+'\n+\n+test_expect_success 'recover and check' '\n+\n+\trecover $F &&\n+\tcheck_fsck \"dangling blob $F\"\n+\n+'\n+\n+test_expect_success 'delete' '\n+\techo 1 > C &&\n+\ttest_tick &&\n+\tgit commit -m rat C &&\n+\n+\techo 2 > C &&\n+\ttest_tick &&\n+\tgit commit -m ox C &&\n+\n+\techo 3 > C &&\n+\ttest_tick &&\n+\tgit commit -m tiger C &&\n+\n+\tHEAD_entry_count=$(git reflog | wc -l) &&\n+\tmaster_entry_count=$(git reflog show master | wc -l) &&\n+\n+\ttest $HEAD_entry_count = 5 &&\n+\ttest $master_entry_count = 5 &&\n+\n+\n+\tgit reflog delete master@{1} &&\n+\tgit reflog show master > output &&\n+\ttest $(($master_entry_count - 1)) = $(wc -l < output) &&\n+\ttest $HEAD_entry_count = $(git reflog | wc -l) &&\n+\t! grep ox < output &&\n+\n+\tmaster_entry_count=$(wc -l < output) &&\n+\n+\tgit reflog delete HEAD@{1} &&\n+\ttest $(($HEAD_entry_count -1)) = $(git reflog | wc -l) &&\n+\ttest $master_entry_count = $(git reflog show master | wc -l) &&\n+\n+\tHEAD_entry_count=$(git reflog | wc -l) &&\n+\n+\tgit reflog delete master@{07.04.2005.15:15:00.-0700} &&\n+\tgit reflog show master > output &&\n+\ttest $(($master_entry_count - 1)) = $(wc -l < output) &&\n+\t! grep dragon < output\n+\n+'\n+\n+test_expect_success 'rewind2' '\n+\n+\ttest_tick && git reset --hard HEAD~2 &&\n+\traw_reflog refs/heads/master >reflog &&\n+\ttest_when_finished rm -f reflog &&\n+\ttest_line_count = 4 reflog\n+'\n+\n+test_expect_success '--expire=never' '\n+\n+\tgit reflog expire --verbose \\\n+\t\t--expire=never \\\n+\t\t--expire-unreachable=never \\\n+\t\t--all &&\n+\traw_reflog refs/heads/master >reflog &&\n+\ttest_when_finished rm -f reflog &&\n+\ttest_line_count = 4 reflog\n+'\n+\n+test_expect_success 'gc.reflogexpire=never' '\n+\n+\tgit config gc.reflogexpire never &&\n+\tgit config gc.reflogexpireunreachable never &&\n+\tgit reflog expire --verbose --all &&\n+\traw_reflog refs/heads/master >reflog &&\n+\ttest_when_finished rm -f reflog &&\n+\ttest_line_count = 4 reflog\n+'\n+\n+test_expect_success 'gc.reflogexpire=false' '\n+\n+\tgit config gc.reflogexpire false &&\n+\tgit config gc.reflogexpireunreachable false &&\n+\tgit reflog expire --verbose --all &&\n+\traw_reflog refs/heads/master >reflog &&\n+\ttest_when_finished rm -f reflog &&\n+\ttest_line_count = 4 reflog &&\n+\n+\tgit config --unset gc.reflogexpire &&\n+\tgit config --unset gc.reflogexpireunreachable\n+\n+'\n+\n+test_expect_success 'checkout should not delete log for packed ref' '\n+\ttest $(git reflog master | wc -l) = 4 &&\n+\tgit branch foo &&\n+\tgit pack-refs --all &&\n+\tgit checkout foo &&\n+\ttest $(git reflog master | wc -l) = 4\n+'\n+\n+test_expect_success 'stale dirs do not cause d/f conflicts (reflogs on)' '\n+\ttest_when_finished \"git branch -d one || git branch -d one/two\" &&\n+\n+\tgit branch one/two master &&\n+\techo \"one/two@{0} branch: Created from master\" >expect &&\n+\tgit log -g --format=\"%gd %gs\" one/two >actual &&\n+\ttest_cmp expect actual &&\n+\tgit branch -d one/two &&\n+\n+\t# now logs/refs/heads/one is a stale directory, but\n+\t# we should move it out of the way to create \"one\" reflog\n+\tgit branch one master &&\n+\techo \"one@{0} branch: Created from master\" >expect &&\n+\tgit log -g --format=\"%gd %gs\" one >actual &&\n+\ttest_cmp expect actual\n+'\n+\n+test_expect_success 'stale dirs do not cause d/f conflicts (reflogs off)' '\n+\ttest_when_finished \"git branch -d one || git branch -d one/two\" &&\n+\n+\tgit branch one/two master &&\n+\techo \"one/two@{0} branch: Created from master\" >expect &&\n+\tgit log -g --format=\"%gd %gs\" one/two >actual &&\n+\ttest_cmp expect actual &&\n+\tgit branch -d one/two &&\n+\n+\t# same as before, but we only create a reflog for \"one\" if\n+\t# it already exists, which it does not\n+\tgit -c core.logallrefupdates=false branch one master &&\n+\t: >expect &&\n+\tgit log -g --format=\"%gd %gs\" one >actual &&\n+\ttest_cmp expect actual\n+'\n+\n+# Triggering the bug detected by this test requires a newline to fall\n+# exactly BUFSIZ-1 bytes from the end of the file. We don't know\n+# what that value is, since it's platform dependent. However, if\n+# we choose some value N, we also catch any D which divides N evenly\n+# (since we will read backwards in chunks of D). So we choose 8K,\n+# which catches glibc (with an 8K BUFSIZ) and *BSD (1K).\n+#\n+# Each line is 114 characters, so we need 75 to still have a few before the\n+# last 8K. The 89-character padding on the final entry lines up our\n+# newline exactly.\n+test_expect_success 'parsing reverse reflogs at BUFSIZ boundaries' '\n+\tgit checkout -b reflogskip &&\n+\tz38=00000000000000000000000000000000000000 &&\n+\tident=\"abc 0000000001 +0000\" &&\n+\tfor i in $(test_seq 1 75); do\n+\t\tprintf \"$z38%02d $z38%02d %s\\t\" $i $(($i+1)) \"$ident\" &&\n+\t\tif test $i = 75; then\n+\t\t\tfor j in $(test_seq 1 89); do\n+\t\t\t\tprintf X\n+\t\t\tdone\n+\t\telse\n+\t\t\tprintf X\n+\t\tfi &&\n+\t\tprintf \"\\n\"\n+\tdone | append_reflog refs/heads/reflogskip &&\n+\tgit rev-parse reflogskip@{73} >actual &&\n+\techo ${z38}03 >expect &&\n+\ttest_cmp expect actual\n+'\n+\n+test_done\ndiff --git a/t/t1480-refs-lmdb-submodule.sh b/t/t1480-refs-lmdb-submodule.sh\nnew file mode 100755\nindex 0000000..57a5fd2\n--- /dev/null\n+++ b/t/t1480-refs-lmdb-submodule.sh\n@@ -0,0 +1,85 @@\n+#!/bin/sh\n+#\n+# Copyright (c) 2016 Twitter, Inc\n+# Based on t5531-deep-submodule-push.sh\n+\n+test_description='Test lmdb refs backend'\n+TEST_NO_CREATE_REPO=1\n+. ./test-lib.sh\n+\n+if ! test_have_prereq LMDB\n+then\n+\tskip_all=\"Skipping lmdb refs backend tests, lmdb backend not built\"\n+\ttest_done\n+fi\n+\n+test_expect_success setup '\n+\tmkdir pub.git &&\n+\tGIT_DIR=pub.git git init --bare &&\n+\tGIT_DIR=pub.git git config receive.fsckobjects true &&\n+\tmkdir work &&\n+\t(\n+\t\tcd work &&\n+\t\tgit init --ref-storage=lmdb &&\n+\t\tgit config push.default matching &&\n+\t\tmkdir -p gar/bage &&\n+\t\t(\n+\t\t\tcd gar/bage &&\n+\t\t\tgit init --ref-storage=lmdb &&\n+\t\t\tgit config push.default matching &&\n+\t\t\t>junk &&\n+\t\t\tgit add junk &&\n+\t\t\tgit commit -m \"Initial junk\"\n+\t\t) &&\n+\t\tgit add gar/bage &&\n+\t\tgit commit -m \"Initial superproject\"\n+\t)\n+'\n+\n+test_expect_success 'submodules have same ref storage' '\n+\tgit init --ref-storage=lmdb test &&\n+\t(\n+\t\tcd test &&\n+\t\tgit submodule add ../work/gar/bage w\n+\t) &&\n+\t(\n+\t\tcd test/w &&\n+\t\tgit config extensions.refstorage >cfg &&\n+\t\techo lmdb >expect &&\n+\t\ttest_cmp cfg expect\n+\t)\n+'\n+\n+test_expect_success 'push with correct backend' '\n+\t(\n+\t\tcd work/gar/bage &&\n+\t\t>junk2 &&\n+\t\tgit add junk2 &&\n+\t\tgit commit -m \"Second junk\"\n+\t) &&\n+\t(\n+\t\tcd work &&\n+\t\tgit add gar/bage &&\n+\t\tgit commit -m \"Second commit for gar/bage\" &&\n+\t\tgit push --recurse-submodules=check ../pub.git master\n+\t)\n+'\n+\n+test_expect_success 'commit with different backend fails' '\n+\t(\n+\t\tcd work/gar/bage &&\n+\t\ttest_commit junk3 &&\n+\t\t# manually convert to files-backend\n+\t\tgitdir=\"$(git rev-parse --git-dir)\" &&\n+\t\tmkdir -p \"$gitdir/refs/heads\" &&\n+\t\tgit rev-parse HEAD >\"$gitdir/refs/heads/master\" &&\n+\t\tgit config --local --unset extensions.refStorage &&\n+\t\trm -r \"$gitdir/refs.lmdb\"\n+\t) &&\n+\t(\n+\t\tcd work &&\n+\t\ttest_must_fail git add gar/bage\n+\t)\n+'\n+\n+test_done\ndiff --git a/t/test-lib.sh b/t/test-lib.sh\nindex 0b47eb6..ce40770 100644\n--- a/t/test-lib.sh\n+++ b/t/test-lib.sh\n@@ -960,6 +960,7 @@ test -z \"$NO_PERL\" && test_set_prereq PERL\n test -z \"$NO_PYTHON\" && test_set_prereq PYTHON\n test -n \"$USE_LIBPCRE\" && test_set_prereq LIBPCRE\n test -z \"$NO_GETTEXT\" && test_set_prereq GETTEXT\n+test -n \"$USE_LIBLMDB\" && test_set_prereq LMDB\n \n # Can we rely on git's output in the C locale?\n if test -n \"$GETTEXT_POISON\"\n-- \n2.4.2.767.g62658d5-twtrsrc\n"},{"id":"278543","messageId":"1455772670-21142-28-git-send-email-dturner@twopensource.com","threadId":"41437","inReplyTo":"1455772670-21142-1-git-send-email-dturner@twopensource.com","subject":"[PATCH v5 27/27] tests: add ref-storage argument","fromName":"David Turner","fromEmail":"dturner@twopensource.com","sentAt":"2016-02-18T05:17:50Z","receivedAt":"2016-02-18T05:17:50Z","isPatch":true,"sender":{"key":"novalis@novalis.org","avatar":"https://avatars.githubusercontent.com/u/77003?v=4"},"body":"Add a --ref-storage argument to make it easy to test alternate ref\nstorage backends.\n\nModify many tests to work under alternate ref storage backends.\nConditionally skip tests that are not expected to succeed under this\ncondition. Most of this is straightforward.\n\nOf particular note are the following:\n\n* The rearrangement of commands in t1401 is because without HEAD in\nthe right place, git doesn't recognized the trash dir as a git repo,\nso no git commands work.\n\n* t1430-bad-ref-name specifically blocks lmdb because other alternate\nbackends might want to keep this test.\n\nSigned-off-by: David Turner \n---\n t/README | 6 +++\n t/lib-submodule-update.sh | 15 +++++--\n t/lib-t6000.sh | 5 +--\n t/t0008-ignores.sh | 2 +-\n t/t0062-revision-walking.sh | 6 +++\n t/t1021-rerere-in-workdir.sh | 6 +++\n t/t1200-tutorial.sh | 8 +++-\n t/t1302-repo-version.sh | 6 +++\n t/t1305-config-include.sh | 17 ++++++--\n t/t1400-update-ref.sh | 6 +++\n t/t1401-symbolic-ref.sh | 17 +++++---\n t/t1404-update-ref-df-conflicts.sh | 8 +++-\n t/t1410-reflog.sh | 6 +++\n t/t1430-bad-ref-name.sh | 6 +++\n t/t1450-fsck.sh | 12 ++---\n t/t1506-rev-parse-diagnosis.sh | 4 +-\n t/t2013-checkout-submodule.sh | 2 +-\n t/t2105-update-index-gitfile.sh | 4 +-\n t/t2107-update-index-basic.sh | 6 +--\n t/t2201-add-update-typechange.sh | 4 +-\n t/t3001-ls-files-others-exclude.sh | 2 +-\n t/t3010-ls-files-killed-modified.sh | 4 +-\n t/t3040-subprojects-basic.sh | 4 +-\n t/t3050-subprojects-fetch.sh | 2 +-\n t/t3200-branch.sh | 75 ++++++++++++++++++--------------\n t/t3210-pack-refs.sh | 7 +++\n t/t3211-peel-ref.sh | 6 +++\n t/t3308-notes-merge.sh | 2 +-\n t/t3404-rebase-interactive.sh | 2 +-\n t/t3600-rm.sh | 2 +-\n t/t3800-mktag.sh | 4 +-\n t/t3903-stash.sh | 2 +-\n t/t4010-diff-pathspec.sh | 2 +-\n t/t4020-diff-external.sh | 2 +-\n t/t4027-diff-submodule.sh | 2 +-\n t/t4035-diff-quiet.sh | 2 +-\n t/t4255-am-submodule.sh | 2 +-\n t/t5000-tar-tree.sh | 3 +-\n t/t5304-prune.sh | 2 +-\n t/t5312-prune-corruption.sh | 11 ++++-\n t/t5500-fetch-pack.sh | 10 ++---\n t/t5510-fetch.sh | 30 ++++++-------\n t/t5526-fetch-submodules.sh | 4 +-\n t/t5527-fetch-odd-refs.sh | 7 +++\n t/t5537-fetch-shallow.sh | 7 +++\n t/t5700-clone-reference.sh | 42 +++++++++---------\n t/t6001-rev-list-graft.sh | 3 +-\n t/t6010-merge-base.sh | 2 +-\n t/t6050-replace.sh | 4 +-\n t/t6120-describe.sh | 6 ++-\n t/t6301-for-each-ref-errors.sh | 12 ++---\n t/t7201-co.sh | 2 +-\n t/t7300-clean.sh | 25 ++++++-----\n t/t7400-submodule-basic.sh | 18 ++++----\n t/t7402-submodule-rebase.sh | 2 +-\n t/t7405-submodule-merge.sh | 10 ++---\n t/t9104-git-svn-follow-parent.sh | 3 +-\n t/t9115-git-svn-dcommit-funky-renames.sh | 2 +-\n t/t9350-fast-export.sh | 6 +--\n t/t9902-completion.sh | 3 +-\n t/t9903-bash-prompt.sh | 1 +\n t/test-lib-functions.sh | 53 +++++++++++++++++++++-\n t/test-lib.sh | 11 +++++\n 63 files changed, 367 insertions(+), 180 deletions(-)\n\ndiff --git a/t/README b/t/README\nindex 1dc908e..8e047cb 100644\n--- a/t/README\n+++ b/t/README\n@@ -178,6 +178,12 @@ appropriately before running \"make\".\n \tthis feature by setting the GIT_TEST_CHAIN_LINT environment\n \tvariable to \"1\" or \"0\", respectively.\n \n+--ref-storage=::\n+\tIf --ref-storage is set, run tests under an alternate ref\n+\tbackend. Tests that rely on the original files backend will\n+\tbe skipped. You may also enable or disable this feature by\n+\tsetting the GIT_TEST_REF_STORAGE environment variable\n+\n You can also set the GIT_TEST_INSTALLED environment variable to\n the bindir of an existing git installation to test that installation.\n You still need to have built this git sandbox, from which various\ndiff --git a/t/lib-submodule-update.sh b/t/lib-submodule-update.sh\nindex 79cdd34..b037eb3 100755\n--- a/t/lib-submodule-update.sh\n+++ b/t/lib-submodule-update.sh\n@@ -32,7 +32,7 @@\n # invalid_sub1\n #\n create_lib_submodule_repo () {\n-\tgit init submodule_update_repo &&\n+\tgit init $ref_storage_arg submodule_update_repo &&\n \t(\n \t\tcd submodule_update_repo &&\n \t\techo \"expect\" >>.gitignore &&\n@@ -125,7 +125,16 @@ test_git_directory_is_unchanged () {\n \t\t# \"$1/.git/config\" lacks it...\n \t\tgit config --unset core.worktree\n \t) &&\n-\tdiff -r \".git/modules/$1\" \"$1/.git\" &&\n+\tif test \"$ref_storage\" = \"lmdb\"\n+\tthen\n+\t diff -x refs.lmdb -r \".git/modules/$1\" \"$1/.git\" &&\n+\t mdb_dump -p \".git/modules/$1/refs.lmdb\" >one &&\n+\t mdb_dump -p \"$1/.git/refs.lmdb\" >two &&\n+\t diff one two &&\n+\t rm one two\n+\telse\n+\t diff -r \".git/modules/$1\" \"$1/.git\"\n+\tfi\n \t(\n \t\t# ... and then restore.\n \t\tcd \".git/modules/$1\" &&\n@@ -147,7 +156,7 @@ prolog () {\n # should be updated to an existing commit.\n reset_work_tree_to () {\n \trm -rf submodule_update &&\n-\tgit clone submodule_update_repo submodule_update &&\n+\tgit clone $ref_storage_arg submodule_update_repo submodule_update &&\n \t(\n \t\tcd submodule_update &&\n \t\trm -rf sub1 &&\ndiff --git a/t/lib-t6000.sh b/t/lib-t6000.sh\nindex 3f2d873..c98e4c0 100644\n--- a/t/lib-t6000.sh\n+++ b/t/lib-t6000.sh\n@@ -7,8 +7,7 @@ mkdir -p .git/refs/tags\n # Answer the sha1 has associated with the tag. The tag must exist in .git/refs/tags\n tag () {\n \t_tag=$1\n-\ttest -f \".git/refs/tags/$_tag\" || error \"tag: \\\"$_tag\\\" does not exist\"\n-\tcat \".git/refs/tags/$_tag\"\n+\tgit rev-parse --verify \"refs/tags/$_tag\" || error \"tag: \\\"$_tag\\\" does not exist\"\n }\n \n # Generate a commit using the text specified to make it unique and the tree\n@@ -26,7 +25,7 @@ save_tag () {\n \t_tag=$1\n \ttest -n \"$_tag\" || error \"usage: save_tag tag commit-args ...\"\n \tshift 1\n-\t\"$@\" >\".git/refs/tags/$_tag\"\n+\twrite_ref \"refs/tags/$_tag\" $(\"$@\")\n \n \techo \"s/$(tag $_tag)/$_tag/g\" >sed.script.tmp\n \tcat sed.script >>sed.script.tmp\ndiff --git a/t/t0008-ignores.sh b/t/t0008-ignores.sh\nindex 89544dd..63fe6d5 100755\n--- a/t/t0008-ignores.sh\n+++ b/t/t0008-ignores.sh\n@@ -184,7 +184,7 @@ test_expect_success 'setup' '\n \tfi &&\n \t(\n \t\tcd a/submodule &&\n-\t\tgit init &&\n+\t\tgit init $ref_storage_arg &&\n \t\techo a >a &&\n \t\tgit add a &&\n \t\tgit commit -m\"commit in submodule\"\ndiff --git a/t/t0062-revision-walking.sh b/t/t0062-revision-walking.sh\nindex 113c728..0bd3981 100755\n--- a/t/t0062-revision-walking.sh\n+++ b/t/t0062-revision-walking.sh\n@@ -7,6 +7,12 @@ test_description='Test revision walking api'\n \n . ./test-lib.sh\n \n+if test \"$ref_storage\" != \"files\"\n+then\n+\tskip_all=\"Alternate storage doesn't do test-revision-walking\"\n+\ttest_done\n+fi\n+\n cat >run_twice_expected <<-EOF\n 1st\n > add b\ndiff --git a/t/t1021-rerere-in-workdir.sh b/t/t1021-rerere-in-workdir.sh\nindex 301e071..8fe5de7 100755\n--- a/t/t1021-rerere-in-workdir.sh\n+++ b/t/t1021-rerere-in-workdir.sh\n@@ -3,6 +3,12 @@\n test_description='rerere run in a workdir'\n . ./test-lib.sh\n \n+if test \"$ref_storage\" != \"files\"\n+then\n+\tskip_all=\"Workdirs don't support alternate ref backends\"\n+\ttest_done\n+fi\n+\n test_expect_success SYMLINKS setup '\n \tgit config rerere.enabled true &&\n \t>world &&\ndiff --git a/t/t1200-tutorial.sh b/t/t1200-tutorial.sh\nindex 397ccb6..c67c7da 100755\n--- a/t/t1200-tutorial.sh\n+++ b/t/t1200-tutorial.sh\n@@ -93,12 +93,16 @@ test_expect_success 'git whatchanged -p --root' '\n \n test_expect_success 'git tag my-first-tag' '\n \tgit tag my-first-tag &&\n-\ttest_cmp .git/refs/heads/master .git/refs/tags/my-first-tag\n+\tgit rev-parse --verify refs/heads/master >expect &&\n+\tgit rev-parse --verify refs/tags/my-first-tag >actual &&\n+\ttest_cmp expect actual\n '\n \n test_expect_success 'git checkout -b mybranch' '\n \tgit checkout -b mybranch &&\n-\ttest_cmp .git/refs/heads/master .git/refs/heads/mybranch\n+\tgit rev-parse --verify refs/heads/master >expect &&\n+\tgit rev-parse --verify refs/heads/mybranch >actual &&\n+\ttest_cmp expect actual\n '\n \n cat > branch.expect <test.patch <<-\\EOF &&\n \tdiff --git a/test.txt b/test.txt\ndiff --git a/t/t1305-config-include.sh b/t/t1305-config-include.sh\nindex 9ba2ba1..220cd63 100755\n--- a/t/t1305-config-include.sh\n+++ b/t/t1305-config-include.sh\n@@ -45,14 +45,23 @@ test_expect_success 'include options can still be examined' '\n \ttest_cmp expect actual\n '\n \n-test_expect_success 'listing includes option and expansion' '\n-\techo \"[test]one = 1\" >one &&\n-\techo \"[include]path = one\" >.gitconfig &&\n-\tcat >expect <<-\\EOF &&\n+write_expected_config()\n+{\n+\tcat <<-\\EOF &&\n \tinclude.path=one\n \ttest.one=1\n \tEOF\n+\tif test \"$ref_storage\" != \"files\"\n+\tthen\n+\t\techo \"extensions.refstorage=$ref_storage\"\n+\tfi\n+}\n+\n+test_expect_success 'listing includes option and expansion' '\n+\techo \"[test]one = 1\" >one &&\n+\techo \"[include]path = one\" >.gitconfig &&\n \tgit config --list >actual.full &&\n+\twrite_expected_config >expect &&\n \tgrep -v ^core actual.full >actual &&\n \ttest_cmp expect actual\n '\ndiff --git a/t/t1400-update-ref.sh b/t/t1400-update-ref.sh\nindex af1b20d..878dc53 100755\n--- a/t/t1400-update-ref.sh\n+++ b/t/t1400-update-ref.sh\n@@ -6,6 +6,12 @@\n test_description='Test git update-ref and basic ref logging'\n . ./test-lib.sh\n \n+if test \"$ref_storage\" != \"files\"\n+then\n+\tskip_all=\"This test is ref storage backend-specific\"\n+\ttest_done\n+fi\n+\n Z=$_z40\n \n test_expect_success setup '\ndiff --git a/t/t1401-symbolic-ref.sh b/t/t1401-symbolic-ref.sh\nindex 417eecc..5bfe7d2 100755\n--- a/t/t1401-symbolic-ref.sh\n+++ b/t/t1401-symbolic-ref.sh\n@@ -35,15 +35,16 @@ reset_to_sane\n \n test_expect_success 'symbolic-ref deletes HEAD' '\n \tgit symbolic-ref -d HEAD &&\n-\ttest_path_is_file .git/refs/heads/foo &&\n-\ttest_path_is_missing .git/HEAD\n+\ttest_path_is_missing .git/HEAD &&\n+\treset_to_sane &&\n+\tgit rev-parse --verify refs/heads/foo\n '\n reset_to_sane\n \n test_expect_success 'symbolic-ref deletes dangling HEAD' '\n \tgit symbolic-ref HEAD refs/heads/missing &&\n \tgit symbolic-ref -d HEAD &&\n-\ttest_path_is_missing .git/refs/heads/missing &&\n+\ttest_must_fail git rev-parse --verify refs/heads/missing &&\n \ttest_path_is_missing .git/HEAD\n '\n reset_to_sane\n@@ -58,7 +59,7 @@ reset_to_sane\n test_expect_success 'symbolic-ref fails to delete real ref' '\n \techo \"fatal: Cannot delete refs/heads/foo, not a symbolic ref\" >expect &&\n \ttest_must_fail git symbolic-ref -d refs/heads/foo >actual 2>&1 &&\n-\ttest_path_is_file .git/refs/heads/foo &&\n+\tgit rev-parse --verify refs/heads/foo &&\n \ttest_cmp expect actual\n '\n reset_to_sane\n@@ -114,7 +115,13 @@ test_expect_success 'symbolic-ref writes reflog entry' '\n \ttest_cmp expect actual\n '\n \n-test_expect_success 'symbolic-ref does not create ref d/f conflicts' '\n+if test \"$ref_storage\" = \"files\"\n+then\n+ test_cmd=test_expect_success\n+else\n+ test_cmd=test_expect_failure\n+fi\n+$test_cmd 'symbolic-ref does not create ref d/f conflicts' '\n \tgit checkout -b df &&\n \ttest_commit df &&\n \ttest_must_fail git symbolic-ref refs/heads/df/conflict refs/heads/df &&\ndiff --git a/t/t1404-update-ref-df-conflicts.sh b/t/t1404-update-ref-df-conflicts.sh\nindex 66bafb5..e918abc 100755\n--- a/t/t1404-update-ref-df-conflicts.sh\n+++ b/t/t1404-update-ref-df-conflicts.sh\n@@ -96,7 +96,13 @@ test_expect_success 'new ref is a deeper prefix of existing packed' '\n \n '\n \n-test_expect_success 'one new ref is a simple prefix of another' '\n+expect=test_expect_success\n+if test \"$ref_storage\" != \"files\"\n+then\n+\texpect=test_expect_failure\n+fi\n+\n+$expect 'one new ref is a simple prefix of another' '\n \n \tprefix=refs/5 &&\n \ttest_update_rejected $prefix \"a e\" false \"b c c/x d\" \\\ndiff --git a/t/t1410-reflog.sh b/t/t1410-reflog.sh\nindex 9cf91dc..41ff1a2 100755\n--- a/t/t1410-reflog.sh\n+++ b/t/t1410-reflog.sh\n@@ -6,6 +6,12 @@\n test_description='Test prune and reflog expiration'\n . ./test-lib.sh\n \n+if test \"$ref_storage\" != \"files\"\n+then\n+\tskip_all=\"This test is ref storage backend-specific\"\n+\ttest_done\n+fi\n+\n check_have () {\n \tgaah= &&\n \tfor N in \"$@\"\ndiff --git a/t/t1430-bad-ref-name.sh b/t/t1430-bad-ref-name.sh\nindex c465abe..bfcec3c 100755\n--- a/t/t1430-bad-ref-name.sh\n+++ b/t/t1430-bad-ref-name.sh\n@@ -3,6 +3,12 @@\n test_description='Test handling of ref names that check-ref-format rejects'\n . ./test-lib.sh\n \n+if test \"$ref_storage\" = \"lmdb\"\n+then\n+\tskip_all=\"The lmdb backend refuses to save refs with bad names\"\n+\ttest_done\n+fi\n+\n test_expect_success setup '\n \ttest_commit one &&\n \ttest_commit two\ndiff --git a/t/t1450-fsck.sh b/t/t1450-fsck.sh\nindex e66b7cb..5fd3921 100755\n--- a/t/t1450-fsck.sh\n+++ b/t/t1450-fsck.sh\n@@ -75,7 +75,7 @@ test_expect_success 'object with bad sha1' '\n '\n \n test_expect_success 'branch pointing to non-commit' '\n-\tgit rev-parse HEAD^{tree} >.git/refs/heads/invalid &&\n+\twrite_ref refs/heads/invalid $(git rev-parse HEAD^{tree}) &&\n \ttest_when_finished \"git update-ref -d refs/heads/invalid\" &&\n \ttest_must_fail git fsck 2>out &&\n \tcat out &&\n@@ -220,7 +220,7 @@ test_expect_success 'tag pointing to nonexistent' '\n \n \ttag=$(git hash-object -t tag -w --stdin .git/refs/tags/invalid &&\n+\twrite_ref refs/tags/invalid $tag &&\n \ttest_when_finished \"git update-ref -d refs/tags/invalid\" &&\n \ttest_must_fail git fsck --tags >out &&\n \tcat out &&\n@@ -241,7 +241,7 @@ test_expect_success 'tag pointing to something else than its type' '\n \n \ttag=$(git hash-object -t tag -w --stdin .git/refs/tags/wrong &&\n+\twrite_ref refs/tags/wrong $tag &&\n \ttest_when_finished \"git update-ref -d refs/tags/wrong\" &&\n \ttest_must_fail git fsck --tags\n '\n@@ -258,7 +258,7 @@ test_expect_success 'tag with incorrect tag name & missing tagger' '\n \n \ttag=$(git hash-object -t tag -w --stdin .git/refs/tags/wrong &&\n+\twrite_ref refs/tags/wrong $tag &&\n \ttest_when_finished \"git update-ref -d refs/tags/wrong\" &&\n \tgit fsck --tags 2>out &&\n \n@@ -282,7 +282,7 @@ test_expect_success 'tag with bad tagger' '\n \n \ttag=$(git hash-object --literally -t tag -w --stdin .git/refs/tags/wrong &&\n+\twrite_ref refs/tags/wrong $tag &&\n \ttest_when_finished \"git update-ref -d refs/tags/wrong\" &&\n \ttest_must_fail git fsck --tags 2>out &&\n \tgrep \"error in tag .*: invalid author/committer\" out\n@@ -301,7 +301,7 @@ test_expect_success 'tag with NUL in header' '\n \n \ttag=$(git hash-object --literally -t tag -w --stdin .git/refs/tags/wrong &&\n+\twrite_ref refs/tags/wrong $tag &&\n \ttest_when_finished \"git update-ref -d refs/tags/wrong\" &&\n \ttest_must_fail git fsck --tags 2>out &&\n \tcat out &&\ndiff --git a/t/t1506-rev-parse-diagnosis.sh b/t/t1506-rev-parse-diagnosis.sh\nindex 613d9bf..a9a15ca 100755\n--- a/t/t1506-rev-parse-diagnosis.sh\n+++ b/t/t1506-rev-parse-diagnosis.sh\n@@ -167,7 +167,7 @@ test_expect_success 'relative path when cwd is outside worktree' '\n '\n \n test_expect_success 'relative path when startup_info is NULL' '\n-\ttest_must_fail test-match-trees HEAD:./file.txt HEAD:./file.txt 2>error &&\n+\ttest_must_fail test-match-trees $(git rev-parse HEAD):./file.txt $(git rev-parse HEAD):./file.txt 2>error &&\n \tgrep \"BUG: startup_info struct is not initialized.\" error\n '\n \n@@ -213,7 +213,7 @@ test_expect_success 'arg before dashdash must be a revision (ambiguous)' '\n \t{\n \t\t# we do not want to use rev-parse here, because\n \t\t# we are testing it\n-\t\tcat .git/refs/heads/foobar &&\n+\t\traw_ref refs/heads/foobar &&\n \t\tprintf \"%s\\n\" --\n \t} >expect &&\n \tgit rev-parse foobar -- >actual &&\ndiff --git a/t/t2013-checkout-submodule.sh b/t/t2013-checkout-submodule.sh\nindex 6847f75..94e8ec8 100755\n--- a/t/t2013-checkout-submodule.sh\n+++ b/t/t2013-checkout-submodule.sh\n@@ -8,7 +8,7 @@ test_description='checkout can handle submodules'\n test_expect_success 'setup' '\n \tmkdir submodule &&\n \t(cd submodule &&\n-\t git init &&\n+\t git init $ref_storage_arg &&\n \t test_commit first) &&\n \tgit add submodule &&\n \ttest_tick &&\ndiff --git a/t/t2105-update-index-gitfile.sh b/t/t2105-update-index-gitfile.sh\nindex a7f3d47..ce151a4 100755\n--- a/t/t2105-update-index-gitfile.sh\n+++ b/t/t2105-update-index-gitfile.sh\n@@ -11,7 +11,7 @@ test_description='git update-index for gitlink to .git file.\n test_expect_success 'submodule with absolute .git file' '\n \tmkdir sub1 &&\n \t(cd sub1 &&\n-\t git init &&\n+\t git init $ref_storage_arg &&\n \t REAL=\"$(pwd)/.real\" &&\n \t mv .git \"$REAL\" &&\n \t echo \"gitdir: $REAL\" >.git &&\n@@ -25,7 +25,7 @@ test_expect_success 'add gitlink to absolute .git file' '\n test_expect_success 'submodule with relative .git file' '\n \tmkdir sub2 &&\n \t(cd sub2 &&\n-\t git init &&\n+\t git init $ref_storage_arg &&\n \t mv .git .real &&\n \t echo \"gitdir: .real\" >.git &&\n \t test_commit first)\ndiff --git a/t/t2107-update-index-basic.sh b/t/t2107-update-index-basic.sh\nindex dfe02f4..b00adef 100755\n--- a/t/t2107-update-index-basic.sh\n+++ b/t/t2107-update-index-basic.sh\n@@ -22,7 +22,7 @@ test_expect_success 'update-index -h with corrupt index' '\n \tmkdir broken &&\n \t(\n \t\tcd broken &&\n-\t\tgit init &&\n+\t\tgit init $ref_storage_arg &&\n \t\t>.git/index &&\n \t\ttest_expect_code 129 git update-index -h >usage 2>&1\n \t) &&\n@@ -43,7 +43,7 @@ test_expect_success '--cacheinfo does not accept blob null sha1' '\n '\n \n test_expect_success '--cacheinfo does not accept gitlink null sha1' '\n-\tgit init submodule &&\n+\tgit init submodule $ref_storage_arg &&\n \t(cd submodule && test_commit foo) &&\n \tgit add submodule &&\n \tgit rev-parse :submodule >expect &&\n@@ -70,7 +70,7 @@ test_expect_success '.lock files cleaned up' '\n \t(\n \tcd cleanup &&\n \tmkdir worktree &&\n-\tgit init repo &&\n+\tgit init $ref_storage_arg repo &&\n \tcd repo &&\n \tgit config core.worktree ../../worktree &&\n \t# --refresh triggers late setup_work_tree,\ndiff --git a/t/t2201-add-update-typechange.sh b/t/t2201-add-update-typechange.sh\nindex 954fc51..882a5b7 100755\n--- a/t/t2201-add-update-typechange.sh\n+++ b/t/t2201-add-update-typechange.sh\n@@ -46,7 +46,7 @@ test_expect_success modify '\n \t>yomin/yomin &&\n \t(\n \t\tcd yomin &&\n-\t\tgit init &&\n+\t\tgit init $ref_storage_arg &&\n \t\tgit add yomin &&\n \t\tgit commit -m \"sub initial\"\n \t) &&\n@@ -60,7 +60,7 @@ test_expect_success modify '\n \t>yonk/yonk &&\n \t(\n \t\tcd yonk &&\n-\t\tgit init &&\n+\t\tgit init $ref_storage_arg &&\n \t\tgit add yonk &&\n \t\tgit commit -m \"sub initial\"\n \t) &&\ndiff --git a/t/t3001-ls-files-others-exclude.sh b/t/t3001-ls-files-others-exclude.sh\nindex 3fc484e..b26e68e 100755\n--- a/t/t3001-ls-files-others-exclude.sh\n+++ b/t/t3001-ls-files-others-exclude.sh\n@@ -197,7 +197,7 @@ test_expect_success 'subdirectory ignore (setup)' '\n \tmkdir -p top/l1/l2 &&\n \t(\n \t\tcd top &&\n-\t\tgit init &&\n+\t\tgit init $ref_storage_arg &&\n \t\techo /.gitignore >.gitignore &&\n \t\techo l1 >>.gitignore &&\n \t\techo l2 >l1/.gitignore &&\ndiff --git a/t/t3010-ls-files-killed-modified.sh b/t/t3010-ls-files-killed-modified.sh\nindex 580e158..3cf2a74 100755\n--- a/t/t3010-ls-files-killed-modified.sh\n+++ b/t/t3010-ls-files-killed-modified.sh\n@@ -55,9 +55,9 @@ test_expect_success 'git update-index --add to add various paths.' '\n \t: >path9 &&\n \tdate >path10 &&\n \tgit update-index --add -- path0 path?/file? pathx/ju path7 path8 path9 path10 &&\n-\tgit init submod1 &&\n+\tgit init $ref_storage_arg submod1 &&\n \tgit -C submod1 commit --allow-empty -m \"empty 1\" &&\n-\tgit init submod2 &&\n+\tgit init $ref_storage_arg submod2 &&\n \tgit -C submod2 commit --allow-empty -m \"empty 2\" &&\n \tgit update-index --add submod[12] &&\n \t(\ndiff --git a/t/t3040-subprojects-basic.sh b/t/t3040-subprojects-basic.sh\nindex 0a4ff6d..368c03e 100755\n--- a/t/t3040-subprojects-basic.sh\n+++ b/t/t3040-subprojects-basic.sh\n@@ -11,10 +11,10 @@ test_expect_success 'setup: create superproject' '\n \n test_expect_success 'setup: create subprojects' '\n \tmkdir sub1 &&\n-\t( cd sub1 && git init && : >Makefile && git add * &&\n+\t( cd sub1 && git init $ref_storage_arg && : >Makefile && git add * &&\n \tgit commit -q -m \"subproject 1\" ) &&\n \tmkdir sub2 &&\n-\t( cd sub2 && git init && : >Makefile && git add * &&\n+\t( cd sub2 && git init $ref_storage_arg && : >Makefile && git add * &&\n \tgit commit -q -m \"subproject 2\" ) &&\n \tgit update-index --add sub1 &&\n \tgit add sub2 &&\ndiff --git a/t/t3050-subprojects-fetch.sh b/t/t3050-subprojects-fetch.sh\nindex 2f5f41a..8d26bb9 100755\n--- a/t/t3050-subprojects-fetch.sh\n+++ b/t/t3050-subprojects-fetch.sh\n@@ -8,7 +8,7 @@ test_expect_success setup '\n \ttest_tick &&\n \tmkdir -p sub && (\n \t\tcd sub &&\n-\t\tgit init &&\n+\t\tgit init $ref_storage_arg &&\n \t\t>subfile &&\n \t\tgit add subfile &&\n \t\tgit commit -m \"subproject commit #1\"\ndiff --git a/t/t3200-branch.sh b/t/t3200-branch.sh\nindex 07e9749..f7287ef 100755\n--- a/t/t3200-branch.sh\n+++ b/t/t3200-branch.sh\n@@ -19,26 +19,26 @@ test_expect_success 'prepare a trivial repository' '\n \n test_expect_success 'git branch --help should not have created a bogus branch' '\n \ttest_might_fail git branch --man --help /dev/null 2>&1 &&\n-\ttest_path_is_missing .git/refs/heads/--help\n+\ttest_must_fail git rev-parse --verify refs/heads/--help\n '\n \n test_expect_success 'branch -h in broken repository' '\n \tmkdir broken &&\n \t(\n \t\tcd broken &&\n-\t\tgit init &&\n-\t\t>.git/refs/heads/master &&\n+\t\tgit init $ref_storage_arg &&\n+\t\twrite_ref refs/heads/master \"\" &&\n \t\ttest_expect_code 129 git branch -h >usage 2>&1\n \t) &&\n \ttest_i18ngrep \"[Uu]sage\" broken/usage\n '\n \n test_expect_success 'git branch abc should create a branch' '\n-\tgit branch abc && test_path_is_file .git/refs/heads/abc\n+\tgit branch abc && git rev-parse --verify refs/heads/abc\n '\n \n test_expect_success 'git branch a/b/c should create a branch' '\n-\tgit branch a/b/c && test_path_is_file .git/refs/heads/a/b/c\n+\tgit branch a/b/c && git rev-parse --verify refs/heads/a/b/c\n '\n \n test_expect_success 'git branch HEAD should fail' '\n@@ -51,14 +51,14 @@ EOF\n test_expect_success 'git branch -l d/e/f should create a branch and a log' '\n \tGIT_COMMITTER_DATE=\"2005-05-26 23:30\" \\\n \tgit branch -l d/e/f &&\n-\ttest_path_is_file .git/refs/heads/d/e/f &&\n-\ttest_path_is_file .git/logs/refs/heads/d/e/f &&\n-\ttest_cmp expect .git/logs/refs/heads/d/e/f\n+\tgit rev-parse --verify refs/heads/d/e/f &&\n+\traw_reflog refs/heads/d/e/f > reflog &&\n+\ttest_cmp expect reflog\n '\n \n test_expect_success 'git branch -d d/e/f should delete a branch and a log' '\n \tgit branch -d d/e/f &&\n-\ttest_path_is_missing .git/refs/heads/d/e/f &&\n+\ttest_must_fail git rev-parse --verify refs/heads/d/e/f &&\n \ttest_must_fail git reflog exists refs/heads/d/e/f\n '\n \n@@ -156,34 +156,34 @@ test_expect_success 'git branch -M master2 master2 should work when master is ch\n \n test_expect_success 'git branch -v -d t should work' '\n \tgit branch t &&\n-\ttest_path_is_file .git/refs/heads/t &&\n+\tgit rev-parse --verify refs/heads/t &&\n \tgit branch -v -d t &&\n-\ttest_path_is_missing .git/refs/heads/t\n+\ttest_must_fail git rev-parse --verify refs/heads/t\n '\n \n test_expect_success 'git branch -v -m t s should work' '\n \tgit branch t &&\n-\ttest_path_is_file .git/refs/heads/t &&\n+\tgit rev-parse --verify refs/heads/t &&\n \tgit branch -v -m t s &&\n-\ttest_path_is_missing .git/refs/heads/t &&\n-\ttest_path_is_file .git/refs/heads/s &&\n+\ttest_must_fail git rev-parse --verify refs/heads/t &&\n+\tgit rev-parse --verify refs/heads/s &&\n \tgit branch -d s\n '\n \n test_expect_success 'git branch -m -d t s should fail' '\n \tgit branch t &&\n-\ttest_path_is_file .git/refs/heads/t &&\n+\tgit rev-parse refs/heads/t &&\n \ttest_must_fail git branch -m -d t s &&\n \tgit branch -d t &&\n-\ttest_path_is_missing .git/refs/heads/t\n+\ttest_must_fail git rev-parse refs/heads/t\n '\n \n test_expect_success 'git branch --list -d t should fail' '\n \tgit branch t &&\n-\ttest_path_is_file .git/refs/heads/t &&\n+\tgit rev-parse refs/heads/t &&\n \ttest_must_fail git branch --list -d t &&\n \tgit branch -d t &&\n-\ttest_path_is_missing .git/refs/heads/t\n+\ttest_must_fail git rev-parse refs/heads/t\n '\n \n test_expect_success 'git branch --column' '\n@@ -263,6 +263,10 @@ EOF\n \ttest_cmp expected actual\n '\n \n+# All alternate ref storage backends require config, so we just skip\n+# the \"no-config\" test if we're using one.\n+if test $ref_storage = \"files\"\n+then\n mv .git/config .git/config-saved\n \n test_expect_success 'git branch -m q q2 without config should succeed' '\n@@ -271,6 +275,7 @@ test_expect_success 'git branch -m q q2 without config should succeed' '\n '\n \n mv .git/config-saved .git/config\n+fi\n \n git config branch.s/s.dummy Hello\n \n@@ -294,26 +299,26 @@ test_expect_success 'deleting a symref' '\n \tgit symbolic-ref refs/heads/symref refs/heads/target &&\n \techo \"Deleted branch symref (was refs/heads/target).\" >expect &&\n \tgit branch -d symref >actual &&\n-\ttest_path_is_file .git/refs/heads/target &&\n-\ttest_path_is_missing .git/refs/heads/symref &&\n+\tgit rev-parse refs/heads/target &&\n+\ttest_must_fail git rev-parse refs/heads/symref &&\n \ttest_i18ncmp expect actual\n '\n \n test_expect_success 'deleting a dangling symref' '\n \tgit symbolic-ref refs/heads/dangling-symref nowhere &&\n-\ttest_path_is_file .git/refs/heads/dangling-symref &&\n+\traw_ref refs/heads/dangling-symref &&\n \techo \"Deleted branch dangling-symref (was nowhere).\" >expect &&\n \tgit branch -d dangling-symref >actual &&\n-\ttest_path_is_missing .git/refs/heads/dangling-symref &&\n+\ttest_must_fail git rev-parse refs/heads/dangling-symref &&\n \ttest_i18ncmp expect actual\n '\n \n test_expect_success 'deleting a self-referential symref' '\n \tgit symbolic-ref refs/heads/self-reference refs/heads/self-reference &&\n-\ttest_path_is_file .git/refs/heads/self-reference &&\n+\traw_ref refs/heads/self-reference &&\n \techo \"Deleted branch self-reference (was refs/heads/self-reference).\" >expect &&\n \tgit branch -d self-reference >actual &&\n-\ttest_path_is_missing .git/refs/heads/self-reference &&\n+\ttest_must_fail git rev-parse refs/heads/self-reference &&\n \ttest_i18ncmp expect actual\n '\n \n@@ -321,16 +326,20 @@ test_expect_success 'renaming a symref is not allowed' '\n \tgit symbolic-ref refs/heads/master2 refs/heads/master &&\n \ttest_must_fail git branch -m master2 master3 &&\n \tgit symbolic-ref refs/heads/master2 &&\n-\ttest_path_is_file .git/refs/heads/master &&\n-\ttest_path_is_missing .git/refs/heads/master3\n+\tgit rev-parse refs/heads/master &&\n+\ttest_must_fail git rev-parse refs/heads/master3\n '\n \n+# lmdb doesn't support store reflogs in the filesystem\n+if test $ref_storage != \"lmdb\"\n+then\n test_expect_success SYMLINKS 'git branch -m u v should fail when the reflog for u is a symlink' '\n \tgit branch -l u &&\n \tmv .git/logs/refs/heads/u real-u &&\n \tln -s real-u .git/logs/refs/heads/u &&\n \ttest_must_fail git branch -m u v\n '\n+fi\n \n test_expect_success 'test tracking setup via --track' '\n \tgit config remote.local.url . &&\n@@ -556,9 +565,9 @@ EOF\n test_expect_success 'git checkout -b g/h/i -l should create a branch and a log' '\n \tGIT_COMMITTER_DATE=\"2005-05-26 23:30\" \\\n \tgit checkout -b g/h/i -l master &&\n-\ttest_path_is_file .git/refs/heads/g/h/i &&\n-\ttest_path_is_file .git/logs/refs/heads/g/h/i &&\n-\ttest_cmp expect .git/logs/refs/heads/g/h/i\n+\tgit rev-parse refs/heads/g/h/i &&\n+\traw_reflog refs/heads/g/h/i > reflog &&\n+\ttest_cmp expect reflog\n '\n \n test_expect_success 'checkout -b makes reflog by default' '\n@@ -908,17 +917,17 @@ test_expect_success '--merged catches invalid object names' '\n \n test_expect_success 'tracking with unexpected .fetch refspec' '\n \trm -rf a b c d &&\n-\tgit init a &&\n+\tgit init $ref_storage_arg a &&\n \t(\n \t\tcd a &&\n \t\ttest_commit a\n \t) &&\n-\tgit init b &&\n+\tgit init $ref_storage_arg b &&\n \t(\n \t\tcd b &&\n \t\ttest_commit b\n \t) &&\n-\tgit init c &&\n+\tgit init $ref_storage_arg c &&\n \t(\n \t\tcd c &&\n \t\ttest_commit c &&\n@@ -926,7 +935,7 @@ test_expect_success 'tracking with unexpected .fetch refspec' '\n \t\tgit remote add b ../b &&\n \t\tgit fetch --all\n \t) &&\n-\tgit init d &&\n+\tgit init $ref_storage_arg d &&\n \t(\n \t\tcd d &&\n \t\tgit remote add c ../c &&\ndiff --git a/t/t3210-pack-refs.sh b/t/t3210-pack-refs.sh\nindex 9b182a0..5d55be3 100755\n--- a/t/t3210-pack-refs.sh\n+++ b/t/t3210-pack-refs.sh\n@@ -11,6 +11,13 @@ semantic is still the same.\n '\n . ./test-lib.sh\n \n+backend=$ref_storage\n+if test \"$backend\" = \"lmdb\"\n+then\n+\tskip_all=\"The lmdb ref storage doesn't pack refs\"\n+\ttest_done\n+fi\n+\n test_expect_success 'enable reflogs' '\n \tgit config core.logallrefupdates true\n '\ndiff --git a/t/t3211-peel-ref.sh b/t/t3211-peel-ref.sh\nindex 3b7caca..84d1e8e 100755\n--- a/t/t3211-peel-ref.sh\n+++ b/t/t3211-peel-ref.sh\n@@ -3,6 +3,12 @@\n test_description='tests for the peel_ref optimization of packed-refs'\n . ./test-lib.sh\n \n+if test \"$ref_storage\" = \"lmdb\"\n+then\n+\tskip_all=\"The lmdb ref storage doesn't pack refs\"\n+\ttest_done\n+fi\n+\n test_expect_success 'create annotated tag in refs/tags' '\n \ttest_commit base &&\n \tgit tag -m annotated foo\ndiff --git a/t/t3308-notes-merge.sh b/t/t3308-notes-merge.sh\nindex 19aed7e..49148a2 100755\n--- a/t/t3308-notes-merge.sh\n+++ b/t/t3308-notes-merge.sh\n@@ -79,7 +79,7 @@ test_expect_success 'fail to merge empty notes ref into empty notes ref (z => y)\n test_expect_success 'fail to merge into various non-notes refs' '\n \ttest_must_fail git -c \"core.notesRef=refs/notes\" notes merge x &&\n \ttest_must_fail git -c \"core.notesRef=refs/notes/\" notes merge x &&\n-\tmkdir -p .git/refs/notes/dir &&\n+\tgit update-ref refs/notes/dir/test HEAD &&\n \ttest_must_fail git -c \"core.notesRef=refs/notes/dir\" notes merge x &&\n \ttest_must_fail git -c \"core.notesRef=refs/notes/dir/\" notes merge x &&\n \ttest_must_fail git -c \"core.notesRef=refs/heads/master\" notes merge x &&\ndiff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh\nindex 544f9ad..5508eb0 100755\n--- a/t/t3404-rebase-interactive.sh\n+++ b/t/t3404-rebase-interactive.sh\n@@ -608,7 +608,7 @@ test_expect_success 'submodule rebase setup' '\n \tgit checkout A &&\n \tmkdir sub &&\n \t(\n-\t\tcd sub && git init && >elif &&\n+\t\tcd sub && git init $ref_storage_arg && >elif &&\n \t\tgit add elif && git commit -m \"submodule initial\"\n \t) &&\n \techo 1 >file1 &&\ndiff --git a/t/t3600-rm.sh b/t/t3600-rm.sh\nindex d046d98..01d207e 100755\n--- a/t/t3600-rm.sh\n+++ b/t/t3600-rm.sh\n@@ -220,7 +220,7 @@ test_expect_success 'Remove nonexistent file returns nonzero exit status' '\n test_expect_success 'Call \"rm\" from outside the work tree' '\n \tmkdir repo &&\n \t(cd repo &&\n-\t git init &&\n+\t git init $ref_storage_arg &&\n \t echo something > somefile &&\n \t git add somefile &&\n \t git commit -m \"add a file\" &&\ndiff --git a/t/t3800-mktag.sh b/t/t3800-mktag.sh\nindex 8eb4794..e7ac52e 100755\n--- a/t/t3800-mktag.sh\n+++ b/t/t3800-mktag.sh\n@@ -224,7 +224,7 @@ EOF\n \n test_expect_success \\\n 'allow empty tag email' \\\n- 'git mktag .git/refs/tags/mytag 2>message'\n+ 'write_ref refs/tags/mytag $(git mktag message)'\n \n ############################################################\n # 16. disallow spaces in tag email\n@@ -352,7 +352,7 @@ EOF\n \n test_expect_success \\\n 'create valid tag' \\\n- 'git mktag .git/refs/tags/mytag 2>message'\n+ 'write_ref refs/tags/mytag $(git mktag message)'\n \n ############################################################\n # 25. check mytag\ndiff --git a/t/t3903-stash.sh b/t/t3903-stash.sh\nindex 2142c1f..1e3b50e 100755\n--- a/t/t3903-stash.sh\n+++ b/t/t3903-stash.sh\n@@ -671,7 +671,7 @@ test_expect_success 'store updates stash ref and reflog' '\n \tgit reset --hard &&\n \t! grep quux bazzy &&\n \tgit stash store -m quuxery $STASH_ID &&\n-\ttest $(cat .git/refs/stash) = $STASH_ID &&\n+\ttest $(git rev-parse stash) = $STASH_ID &&\n \tgit reflog --format=%H stash| grep $STASH_ID &&\n \tgit stash pop &&\n \tgrep quux bazzy\ndiff --git a/t/t4010-diff-pathspec.sh b/t/t4010-diff-pathspec.sh\nindex 43c488b..76b3b64 100755\n--- a/t/t4010-diff-pathspec.sh\n+++ b/t/t4010-diff-pathspec.sh\n@@ -112,7 +112,7 @@ test_expect_success 'diff-tree -r with wildcard' '\n \n test_expect_success 'setup submodules' '\n \ttest_tick &&\n-\tgit init submod &&\n+\tgit init $ref_storage_arg submod &&\n \t( cd submod && test_commit first; ) &&\n \tgit add submod &&\n \tgit commit -m first &&\ndiff --git a/t/t4020-diff-external.sh b/t/t4020-diff-external.sh\nindex 0446201..b03b4f6 100755\n--- a/t/t4020-diff-external.sh\n+++ b/t/t4020-diff-external.sh\n@@ -247,7 +247,7 @@ test_expect_success 'clean up crlf leftovers' '\n '\n \n test_expect_success 'submodule diff' '\n-\tgit init sub &&\n+\tgit init $ref_storage_arg sub &&\n \t( cd sub && test_commit sub1 ) &&\n \tgit add sub &&\n \ttest_tick &&\ndiff --git a/t/t4027-diff-submodule.sh b/t/t4027-diff-submodule.sh\nindex 518bf95..147351d 100755\n--- a/t/t4027-diff-submodule.sh\n+++ b/t/t4027-diff-submodule.sh\n@@ -344,7 +344,7 @@ test_expect_success 'combined (empty submodule)' '\n \n test_expect_success 'combined (with submodule)' '\n \trm -fr sub &&\n-\tgit clone --no-checkout . sub &&\n+\tgit clone $ref_storage_arg --no-checkout . sub &&\n \tgit diff >actual &&\n \ttest_cmp expect.withsub actual\n '\ndiff --git a/t/t4035-diff-quiet.sh b/t/t4035-diff-quiet.sh\nindex 461f4bb..553cabe 100755\n--- a/t/t4035-diff-quiet.sh\n+++ b/t/t4035-diff-quiet.sh\n@@ -13,7 +13,7 @@ test_expect_success 'setup' '\n \tgit commit -a -m second &&\n \tmkdir -p test-outside/repo && (\n \t\tcd test-outside/repo &&\n-\t\tgit init &&\n+\t\tgit init $ref_storage_arg &&\n \t\techo \"1 1\" >a &&\n \t\tgit add . &&\n \t\tgit commit -m 1\ndiff --git a/t/t4255-am-submodule.sh b/t/t4255-am-submodule.sh\nindex 0ba8194..427b601 100755\n--- a/t/t4255-am-submodule.sh\n+++ b/t/t4255-am-submodule.sh\n@@ -22,7 +22,7 @@ test_expect_success 'setup diff.submodule' '\n \ttest_commit one &&\n \tINITIAL=$(git rev-parse HEAD) &&\n \n-\tgit init submodule &&\n+\tgit init $ref_storage_arg submodule &&\n \t(\n \t\tcd submodule &&\n \t\ttest_commit two &&\ndiff --git a/t/t5000-tar-tree.sh b/t/t5000-tar-tree.sh\nindex 4b68bba..79249ef 100755\n--- a/t/t5000-tar-tree.sh\n+++ b/t/t5000-tar-tree.sh\n@@ -190,7 +190,8 @@ test_expect_success \\\n test_expect_success \\\n 'git get-tar-commit-id' \\\n 'git get-tar-commit-id b.commitid &&\n- test_cmp .git/$(git symbolic-ref HEAD) b.commitid'\n+ raw_ref $(git symbolic-ref HEAD) > expect &&\n+ test_cmp expect b.commitid'\n \n test_expect_success 'git archive with --output, override inferred format' '\n \tgit archive --format=tar --output=d4.zip HEAD &&\ndiff --git a/t/t5304-prune.sh b/t/t5304-prune.sh\nindex ad7ad2f..cfe8038 100755\n--- a/t/t5304-prune.sh\n+++ b/t/t5304-prune.sh\n@@ -93,7 +93,7 @@ test_expect_success 'prune: prune nonsense parameters' '\n test_expect_success 'prune: prune unreachable heads' '\n \n \tgit config core.logAllRefUpdates false &&\n-\tmv .git/logs .git/logs.old &&\n+\tdelete_all_reflogs &&\n \t: > file2 &&\n \tgit add file2 &&\n \tgit commit -m temporary &&\ndiff --git a/t/t5312-prune-corruption.sh b/t/t5312-prune-corruption.sh\nindex da9d599..f118735 100755\n--- a/t/t5312-prune-corruption.sh\n+++ b/t/t5312-prune-corruption.sh\n@@ -21,7 +21,7 @@ test_expect_success 'create history reachable only from a bogus-named ref' '\n \ttest_tick && git commit --allow-empty -m bogus &&\n \tbogus=$(git rev-parse HEAD) &&\n \tgit cat-file commit $bogus >saved &&\n-\techo $bogus >.git/refs/heads/bogus..name &&\n+\twrite_ref refs/heads/bogus..name $bogus &&\n \tgit reset --hard HEAD^\n '\n \n@@ -47,7 +47,7 @@ test_expect_success 'destructive repack keeps packed object' '\n \n # subsequent tests will have different corruptions\n test_expect_success 'clean up bogus ref' '\n-\trm .git/refs/heads/bogus..name\n+\tdelete_ref refs/heads/bogus..name\n '\n \n # We create two new objects here, \"one\" and \"two\". Our\n@@ -85,6 +85,13 @@ test_expect_success 'pack-refs does not silently delete broken loose ref' '\n \ttest_cmp expect actual\n '\n \n+backend=$ref_storage\n+if test \"$backend\" = \"lmdb\"\n+then\n+ skip=\"The lmdb backend doesn't write a packed-refs file\"\n+ test_done\n+fi\n+\n # we do not want to count on running pack-refs to\n # actually pack it, as it is perfectly reasonable to\n # skip processing a broken ref\ndiff --git a/t/t5500-fetch-pack.sh b/t/t5500-fetch-pack.sh\nindex e5f83bf..9b7aeac 100755\n--- a/t/t5500-fetch-pack.sh\n+++ b/t/t5500-fetch-pack.sh\n@@ -30,7 +30,7 @@ add () {\n \ttest_tick &&\n \tcommit=$(echo \"$text\" | git commit-tree $tree $parents) &&\n \teval \"$name=$commit; export $name\" &&\n-\techo $commit > .git/refs/heads/$branch &&\n+\tgit update-ref refs/heads/$branch $commit &&\n \teval ${branch}TIP=$commit\n }\n \n@@ -45,10 +45,10 @@ pull_to_client () {\n \n \t\t\tcase \"$heads\" in\n \t\t\t *A*)\n-\t\t\t\t echo $ATIP > .git/refs/heads/A;;\n+\t\t\t\t git update-ref refs/heads/A $ATIP;;\n \t\t\tesac &&\n \t\t\tcase \"$heads\" in *B*)\n-\t\t\t echo $BTIP > .git/refs/heads/B;;\n+\t\t\t git update-ref refs/heads/B $BTIP;;\n \t\t\tesac &&\n \t\t\tgit symbolic-ref HEAD refs/heads/$(echo $heads \\\n \t\t\t\t| sed -e \"s/^\\(.\\).*$/\\1/\") &&\n@@ -92,8 +92,8 @@ test_expect_success 'setup' '\n \t\tcur=$(($cur+1))\n \tdone &&\n \tadd B1 $A1 &&\n-\techo $ATIP > .git/refs/heads/A &&\n-\techo $BTIP > .git/refs/heads/B &&\n+\tgit update-ref refs/heads/A $ATIP &&\n+\tgit update-ref refs/heads/B $BTIP &&\n \tgit symbolic-ref HEAD refs/heads/B\n '\n \ndiff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh\nindex 0c10c85..9591271 100755\n--- a/t/t5510-fetch.sh\n+++ b/t/t5510-fetch.sh\n@@ -28,20 +28,20 @@ test_expect_success setup '\n \tgit commit -a -m original'\n \n test_expect_success \"clone and setup child repos\" '\n-\tgit clone . one &&\n+\tgit clone $ref_storage_arg . one &&\n \t(\n \t\tcd one &&\n \t\techo >file updated by one &&\n \t\tgit commit -a -m \"updated by one\"\n \t) &&\n-\tgit clone . two &&\n+\tgit clone $ref_storage_arg . two &&\n \t(\n \t\tcd two &&\n \t\tgit config branch.master.remote one &&\n \t\tgit config remote.one.url ../one/.git/ &&\n \t\tgit config remote.one.fetch refs/heads/master:refs/heads/one\n \t) &&\n-\tgit clone . three &&\n+\tgit clone $ref_storage_arg . three &&\n \t(\n \t\tcd three &&\n \t\tgit config branch.master.remote two &&\n@@ -53,8 +53,8 @@ test_expect_success \"clone and setup child repos\" '\n \t\t\techo \"Pull: refs/heads/one:refs/heads/one\"\n \t\t} >.git/remotes/two\n \t) &&\n-\tgit clone . bundle &&\n-\tgit clone . seven\n+\tgit clone $ref_storage_arg . bundle &&\n+\tgit clone $ref_storage_arg . seven\n '\n \n test_expect_success \"fetch test\" '\n@@ -63,7 +63,7 @@ test_expect_success \"fetch test\" '\n \tgit commit -a -m \"updated by origin\" &&\n \tcd two &&\n \tgit fetch &&\n-\ttest -f .git/refs/heads/one &&\n+\tgit rev-parse --verify refs/heads/one &&\n \tmine=$(git rev-parse refs/heads/one) &&\n \this=$(cd ../one && git rev-parse refs/heads/master) &&\n \ttest \"z$mine\" = \"z$his\"\n@@ -73,8 +73,8 @@ test_expect_success \"fetch test for-merge\" '\n \tcd \"$D\" &&\n \tcd three &&\n \tgit fetch &&\n-\ttest -f .git/refs/heads/two &&\n-\ttest -f .git/refs/heads/one &&\n+\tgit rev-parse --verify refs/heads/two &&\n+\tgit rev-parse --verify refs/heads/one &&\n \tmaster_in_two=$(cd ../two && git rev-parse master) &&\n \tone_in_two=$(cd ../two && git rev-parse one) &&\n \t{\n@@ -180,7 +180,7 @@ test_expect_success 'fetch tags when there is no tags' '\n \n mkdir notags &&\n cd notags &&\n- git init &&\n+ git init $ref_storage_arg &&\n \n git fetch -t ..\n \n@@ -194,7 +194,7 @@ test_expect_success 'fetch following tags' '\n \n \tmkdir four &&\n \tcd four &&\n-\tgit init &&\n+\tgit init $ref_storage_arg &&\n \n \tgit fetch .. :track &&\n \tgit show-ref --verify refs/tags/anno &&\n@@ -204,7 +204,7 @@ test_expect_success 'fetch following tags' '\n \n test_expect_success 'fetch uses remote ref names to describe new refs' '\n \tcd \"$D\" &&\n-\tgit init descriptive &&\n+\tgit init $ref_storage_arg descriptive &&\n \t(\n \t\tcd descriptive &&\n \t\tgit config remote.o.url .. &&\n@@ -238,7 +238,7 @@ test_expect_success 'fetch must not resolve short tag name' '\n \n \tmkdir five &&\n \tcd five &&\n-\tgit init &&\n+\tgit init $ref_storage_arg &&\n \n \ttest_must_fail git fetch .. anno:five\n \n@@ -251,7 +251,7 @@ test_expect_success 'fetch can now resolve short remote name' '\n \n \tmkdir six &&\n \tcd six &&\n-\tgit init &&\n+\tgit init $ref_storage_arg &&\n \n \tgit fetch .. six:six\n '\n@@ -529,7 +529,7 @@ test_expect_success \"should be able to fetch with duplicate refspecs\" '\n \tmkdir dups &&\n \t(\n \t\tcd dups &&\n-\t\tgit init &&\n+\t\tgit init $ref_storage_arg &&\n \t\tgit config branch.master.remote three &&\n \t\tgit config remote.three.url ../three/.git &&\n \t\tgit config remote.three.fetch +refs/heads/*:refs/remotes/origin/* &&\n@@ -665,7 +665,7 @@ test_expect_success 'fetching a one-level ref works' '\n \ttest_commit extra &&\n \tgit reset --hard HEAD^ &&\n \tgit update-ref refs/foo extra &&\n-\tgit init one-level &&\n+\tgit init $ref_storage_arg one-level &&\n \t(\n \t\tcd one-level &&\n \t\tgit fetch .. HEAD refs/foo\ndiff --git a/t/t5526-fetch-submodules.sh b/t/t5526-fetch-submodules.sh\nindex 954d0e4..0fef8ac 100755\n--- a/t/t5526-fetch-submodules.sh\n+++ b/t/t5526-fetch-submodules.sh\n@@ -38,7 +38,7 @@ test_expect_success setup '\n \tmkdir deepsubmodule &&\n \t(\n \t\tcd deepsubmodule &&\n-\t\tgit init &&\n+\t\tgit init $ref_storage_arg &&\n \t\techo deepsubcontent > deepsubfile &&\n \t\tgit add deepsubfile &&\n \t\tgit commit -m new deepsubfile\n@@ -46,7 +46,7 @@ test_expect_success setup '\n \tmkdir submodule &&\n \t(\n \t\tcd submodule &&\n-\t\tgit init &&\n+\t\tgit init $ref_storage_arg &&\n \t\techo subcontent > subfile &&\n \t\tgit add subfile &&\n \t\tgit submodule add \"$pwd/deepsubmodule\" subdir/deepsubmodule &&\ndiff --git a/t/t5527-fetch-odd-refs.sh b/t/t5527-fetch-odd-refs.sh\nindex 207899a..b9ecfa0 100755\n--- a/t/t5527-fetch-odd-refs.sh\n+++ b/t/t5527-fetch-odd-refs.sh\n@@ -26,6 +26,13 @@ test_expect_success 'suffix ref is ignored during fetch' '\n \ttest_cmp expect actual\n '\n \n+backend=$ref_storage\n+if test \"$backend\" = \"lmdb\"\n+then\n+ skip=\"The lmdb backend doesn't do crazy-long refs\"\n+ test_done\n+fi\n+\n test_expect_success 'try to create repo with absurdly long refname' '\n \tref240=$_z40/$_z40/$_z40/$_z40/$_z40/$_z40 &&\n \tref1440=$ref240/$ref240/$ref240/$ref240/$ref240/$ref240 &&\ndiff --git a/t/t5537-fetch-shallow.sh b/t/t5537-fetch-shallow.sh\nindex df8d2f0..114d25a 100755\n--- a/t/t5537-fetch-shallow.sh\n+++ b/t/t5537-fetch-shallow.sh\n@@ -173,6 +173,13 @@ EOF\n \t)\n '\n \n+backend=$ref_storage\n+if test \"$backend\" = \"lmdb\"\n+then\n+\tskip=\"The lmdb backend needs write access for its locks\"\n+\ttest_done\n+fi\n+\n test_expect_success POSIXPERM,SANITY 'shallow fetch from a read-only repo' '\n \tcp -R .git read-only.git &&\n \tfind read-only.git -print | xargs chmod -w &&\ndiff --git a/t/t5700-clone-reference.sh b/t/t5700-clone-reference.sh\nindex 4320082..49e7868 100755\n--- a/t/t5700-clone-reference.sh\n+++ b/t/t5700-clone-reference.sh\n@@ -34,14 +34,14 @@ test_expect_success 'preparing first repository' '\n '\n \n test_expect_success 'preparing second repository' '\n-\tgit clone A B &&\n+\tgit clone $ref_storage_arg A B &&\n \tcommit_in B file2 &&\n \tgit -C B repack -ad &&\n \tgit -C B prune\n '\n \n test_expect_success 'cloning with reference (-l -s)' '\n-\tgit clone -l -s --reference B A C\n+\tgit clone $ref_storage_arg -l -s --reference B A C\n '\n \n test_expect_success 'existence of info/alternates' '\n@@ -57,7 +57,7 @@ test_expect_success 'that reference gets used' '\n '\n \n test_expect_success 'cloning with reference (no -l -s)' '\n-\tGIT_TRACE_PACKET=$U.D git clone --reference B \"file://$(pwd)/A\" D\n+\tGIT_TRACE_PACKET=$U.D git clone $ref_storage_arg --reference B \"file://$(pwd)/A\" D\n '\n \n test_expect_success 'fetched no objects' '\n@@ -108,20 +108,20 @@ test_expect_success 'preparing alternate repository #1' '\n '\n \n test_expect_success 'cloning alternate repo #2 and adding changes to repo #1' '\n-\tgit clone F G &&\n+\tgit clone $ref_storage_arg F G &&\n \tcommit_in F file2\n '\n \n test_expect_success 'cloning alternate repo #1, using #2 as reference' '\n-\tgit clone --reference G F H\n+\tgit clone $ref_storage_arg --reference G F H\n '\n \n test_expect_success 'cloning with reference being subset of source (-l -s)' '\n-\tgit clone -l -s --reference A B E\n+\tgit clone $ref_storage_arg -l -s --reference A B E\n '\n \n test_expect_success 'cloning with multiple references drops duplicates' '\n-\tgit clone -s --reference B --reference A --reference B A dups &&\n+\tgit clone $ref_storage_arg -s --reference B --reference A --reference B A dups &&\n \ttest_line_count = 2 dups/.git/objects/info/alternates\n '\n \n@@ -129,11 +129,11 @@ test_expect_success 'clone with reference from a tagged repository' '\n \t(\n \t\tcd A && git tag -a -m tagged HEAD\n \t) &&\n-\tgit clone --reference=A A I\n+\tgit clone $ref_storage_arg --reference=A A I\n '\n \n test_expect_success 'prepare branched repository' '\n-\tgit clone A J &&\n+\tgit clone $ref_storage_arg A J &&\n \t(\n \t\tcd J &&\n \t\tgit checkout -b other master^ &&\n@@ -145,7 +145,7 @@ test_expect_success 'prepare branched repository' '\n '\n \n test_expect_success 'fetch with incomplete alternates' '\n-\tgit init K &&\n+\tgit init $ref_storage_arg K &&\n \techo \"$base_dir/A/.git/objects\" >K/.git/objects/info/alternates &&\n \t(\n \t\tcd K &&\n@@ -160,29 +160,29 @@ test_expect_success 'fetch with incomplete alternates' '\n '\n \n test_expect_success 'clone using repo with gitfile as a reference' '\n-\tgit clone --separate-git-dir=L A M &&\n-\tgit clone --reference=M A N &&\n+\tgit clone $ref_storage_arg --separate-git-dir=L A M &&\n+\tgit clone $ref_storage_arg --reference=M A N &&\n \techo \"$base_dir/L/objects\" >expected &&\n \ttest_cmp expected \"$base_dir/N/.git/objects/info/alternates\"\n '\n \n test_expect_success 'clone using repo pointed at by gitfile as reference' '\n-\tgit clone --reference=M/.git A O &&\n+\tgit clone $ref_storage_arg --reference=M/.git A O &&\n \techo \"$base_dir/L/objects\" >expected &&\n \ttest_cmp expected \"$base_dir/O/.git/objects/info/alternates\"\n '\n \n test_expect_success 'clone and dissociate from reference' '\n-\tgit init P &&\n+\tgit init $ref_storage_arg P &&\n \t(\n \t\tcd P &&\ttest_commit one\n \t) &&\n-\tgit clone P Q &&\n+\tgit clone $ref_storage_arg P Q &&\n \t(\n \t\tcd Q && test_commit two\n \t) &&\n-\tgit clone --no-local --reference=P Q R &&\n-\tgit clone --no-local --reference=P --dissociate Q S &&\n+\tgit clone $ref_storage_arg --no-local --reference=P Q R &&\n+\tgit clone $ref_storage_arg --no-local --reference=P --dissociate Q S &&\n \t# removing the reference P would corrupt R but not S\n \trm -fr P &&\n \ttest_must_fail git -C R fsck &&\n@@ -198,14 +198,14 @@ test_expect_success 'clone, dissociate from partial reference and repack' '\n \t\ttest_commit two &&\n \t\tgit repack\n \t) &&\n-\tgit clone --bare P Q &&\n+\tgit clone $ref_storage_arg --bare P Q &&\n \t(\n \t\tcd P &&\n \t\tgit checkout -b second &&\n \t\ttest_commit three &&\n \t\tgit repack\n \t) &&\n-\tgit clone --bare --dissociate --reference=P Q R &&\n+\tgit clone $ref_storage_arg --bare --dissociate --reference=P Q R &&\n \tls R/objects/pack/*.pack >packs.txt &&\n \ttest_line_count = 1 packs.txt\n '\n@@ -214,9 +214,9 @@ test_expect_success 'clone, dissociate from alternates' '\n \trm -fr A B C &&\n \ttest_create_repo A &&\n \tcommit_in A file1 &&\n-\tgit clone --reference=A A B &&\n+\tgit clone $ref_storage_arg --reference=A A B &&\n \ttest_line_count = 1 B/.git/objects/info/alternates &&\n-\tgit clone --local --dissociate B C &&\n+\tgit clone $ref_storage_arg --local --dissociate B C &&\n \t! test -f C/.git/objects/info/alternates &&\n \t( cd C && git fsck )\n '\ndiff --git a/t/t6001-rev-list-graft.sh b/t/t6001-rev-list-graft.sh\nindex 05ddc69..0c009ab 100755\n--- a/t/t6001-rev-list-graft.sh\n+++ b/t/t6001-rev-list-graft.sh\n@@ -20,7 +20,8 @@ test_expect_success setup '\n \tgit commit -a -m \"Third in one history.\" &&\n \tA2=$(git rev-parse --verify HEAD) &&\n \n-\trm -f .git/refs/heads/master .git/index &&\n+\tdelete_ref refs/heads/master &&\n+\trm -f .git/index &&\n \n \techo >fileA fileA again &&\n \techo >subdir/fileB fileB again &&\ndiff --git a/t/t6010-merge-base.sh b/t/t6010-merge-base.sh\nindex 39b3238..b2003c5 100755\n--- a/t/t6010-merge-base.sh\n+++ b/t/t6010-merge-base.sh\n@@ -34,7 +34,7 @@ doit () {\n \n \tcommit=$(echo $NAME | git commit-tree $T $PARENTS) &&\n \n-\techo $commit >.git/refs/tags/$NAME &&\n+\tgit update-ref refs/tags/$NAME $commit &&\n \techo $commit\n }\n \ndiff --git a/t/t6050-replace.sh b/t/t6050-replace.sh\nindex c630aba..60f0011 100755\n--- a/t/t6050-replace.sh\n+++ b/t/t6050-replace.sh\n@@ -124,13 +124,13 @@ tagger T A Gger <> 0 +0000\n EOF\n \n test_expect_success 'tag replaced commit' '\n- git mktag .git/refs/tags/mytag 2>message\n+ write_ref refs/tags/mytag $(git mktag message)\n '\n \n test_expect_success '\"git fsck\" works' '\n git fsck master >fsck_master.out &&\n grep \"dangling commit $R\" fsck_master.out &&\n- grep \"dangling tag $(cat .git/refs/tags/mytag)\" fsck_master.out &&\n+ grep \"dangling tag $(raw_ref refs/tags/mytag)\" fsck_master.out &&\n test -z \"$(git fsck)\"\n '\n \ndiff --git a/t/t6120-describe.sh b/t/t6120-describe.sh\nindex 85f2694..ca30c18 100755\n--- a/t/t6120-describe.sh\n+++ b/t/t6120-describe.sh\n@@ -128,7 +128,8 @@ test_expect_success 'no warning was displayed for A' '\n '\n \n test_expect_success 'rename tag A to Q locally' '\n-\tmv .git/refs/tags/A .git/refs/tags/Q\n+\twrite_ref refs/tags/Q $(raw_ref refs/tags/A) &&\n+\tdelete_ref refs/tags/A\n '\n cat - >err.expect <.git/$r &&\n-\ttest_when_finished \"rm -f .git/$r\" &&\n+\twrite_ref $r '' &&\n+\ttest_when_finished \"delete_ref $r\" &&\n \techo \"warning: ignoring broken ref $r\" >broken-err &&\n \tgit for-each-ref >out 2>err &&\n \ttest_cmp full-list out &&\n@@ -26,8 +26,8 @@ test_expect_success 'Broken refs are reported correctly' '\n \n test_expect_success 'NULL_SHA1 refs are reported correctly' '\n \tr=refs/heads/zeros &&\n-\techo $ZEROS >.git/$r &&\n-\ttest_when_finished \"rm -f .git/$r\" &&\n+\twrite_ref $r $ZEROS &&\n+\ttest_when_finished \"delete_ref $r\" &&\n \techo \"warning: ignoring broken ref $r\" >zeros-err &&\n \tgit for-each-ref >out 2>err &&\n \ttest_cmp full-list out &&\n@@ -39,8 +39,8 @@ test_expect_success 'NULL_SHA1 refs are reported correctly' '\n \n test_expect_success 'Missing objects are reported correctly' '\n \tr=refs/heads/missing &&\n-\techo $MISSING >.git/$r &&\n-\ttest_when_finished \"rm -f .git/$r\" &&\n+\twrite_ref $r $MISSING &&\n+\ttest_when_finished \"delete_ref $r\" &&\n \techo \"fatal: missing object $MISSING for $r\" >missing-err &&\n \ttest_must_fail git for-each-ref 2>err &&\n \ttest_cmp missing-err err &&\ndiff --git a/t/t7201-co.sh b/t/t7201-co.sh\nindex 8859236..ab1fb99 100755\n--- a/t/t7201-co.sh\n+++ b/t/t7201-co.sh\n@@ -65,7 +65,7 @@ test_expect_success setup '\n test_expect_success \"checkout from non-existing branch\" '\n \n \tgit checkout -b delete-me master &&\n-\trm .git/refs/heads/delete-me &&\n+\tgit update-ref -d --no-deref refs/heads/delete-me &&\n \ttest refs/heads/delete-me = \"$(git symbolic-ref HEAD)\" &&\n \tgit checkout master &&\n \ttest refs/heads/master = \"$(git symbolic-ref HEAD)\"\ndiff --git a/t/t7300-clean.sh b/t/t7300-clean.sh\nindex 86ceb38..36832ec 100755\n--- a/t/t7300-clean.sh\n+++ b/t/t7300-clean.sh\n@@ -431,7 +431,7 @@ test_expect_success 'nested git work tree' '\n \tmkdir -p foo bar baz/boo &&\n \t(\n \t\tcd foo &&\n-\t\tgit init &&\n+\t\tgit init $ref_storage_arg &&\n \t\ttest_commit nested hello.world\n \t) &&\n \t(\n@@ -440,7 +440,7 @@ test_expect_success 'nested git work tree' '\n \t) &&\n \t(\n \t\tcd baz/boo &&\n-\t\tgit init &&\n+\t\tgit init $ref_storage_arg &&\n \t\ttest_commit deeply.nested deeper.world\n \t) &&\n \tgit clean -f -d &&\n@@ -455,6 +455,7 @@ test_expect_success 'should clean things that almost look like git but are not'\n \trm -fr almost_git almost_bare_git almost_submodule &&\n \tmkdir -p almost_git/.git/objects &&\n \tmkdir -p almost_git/.git/refs &&\n+\tmkdir -p almost_git/.git/refs.lmdb &&\n \tcat >almost_git/.git/HEAD <<-\\EOF &&\n \tgarbage\n \tEOF\n@@ -475,7 +476,7 @@ test_expect_success 'should not clean submodules' '\n \tmkdir repo to_clean &&\n \t(\n \t\tcd repo &&\n-\t\tgit init &&\n+\t\tgit init $ref_storage_arg &&\n \t\ttest_commit msg hello.world\n \t) &&\n \tgit submodule add ./repo/.git sub1 &&\n@@ -511,7 +512,7 @@ test_expect_success POSIXPERM 'should avoid cleaning possible submodules' '\n \n test_expect_success 'nested (empty) git should be kept' '\n \trm -fr empty_repo to_clean &&\n-\tgit init empty_repo &&\n+\tgit init $ref_storage_arg empty_repo &&\n \tmkdir to_clean &&\n \t>to_clean/should_clean.this &&\n \tgit clean -f -d &&\n@@ -521,7 +522,7 @@ test_expect_success 'nested (empty) git should be kept' '\n \n test_expect_success 'nested bare repositories should be cleaned' '\n \trm -fr bare1 bare2 subdir &&\n-\tgit init --bare bare1 &&\n+\tgit init $ref_storage_arg --bare bare1 &&\n \tgit clone --local --bare . bare2 &&\n \tmkdir subdir &&\n \tcp -r bare2 subdir/bare3 &&\n@@ -534,7 +535,7 @@ test_expect_success 'nested bare repositories should be cleaned' '\n test_expect_failure 'nested (empty) bare repositories should be cleaned even when in .git' '\n \trm -fr strange_bare &&\n \tmkdir strange_bare &&\n-\tgit init --bare strange_bare/.git &&\n+\tgit init $ref_storage_arg --bare strange_bare/.git &&\n \tgit clean -f -d &&\n \ttest_path_is_missing strange_bare\n '\n@@ -552,7 +553,7 @@ test_expect_success 'giving path in nested git work tree will remove it' '\n \tmkdir repo &&\n \t(\n \t\tcd repo &&\n-\t\tgit init &&\n+\t\tgit init $ref_storage_arg &&\n \t\tmkdir -p bar/baz &&\n \t\ttest_commit msg bar/baz/hello.world\n \t) &&\n@@ -567,7 +568,7 @@ test_expect_success 'giving path to nested .git will not remove it' '\n \tmkdir repo untracked &&\n \t(\n \t\tcd repo &&\n-\t\tgit init &&\n+\t\tgit init $ref_storage_arg &&\n \t\ttest_commit msg hello.world\n \t) &&\n \tgit clean -f -d repo/.git &&\n@@ -582,7 +583,7 @@ test_expect_success 'giving path to nested .git/ will remove contents' '\n \tmkdir repo untracked &&\n \t(\n \t\tcd repo &&\n-\t\tgit init &&\n+\t\tgit init $ref_storage_arg &&\n \t\ttest_commit msg hello.world\n \t) &&\n \tgit clean -f -d repo/.git/ &&\n@@ -596,7 +597,7 @@ test_expect_success 'force removal of nested git work tree' '\n \tmkdir -p foo bar baz/boo &&\n \t(\n \t\tcd foo &&\n-\t\tgit init &&\n+\t\tgit init $ref_storage_arg &&\n \t\ttest_commit nested hello.world\n \t) &&\n \t(\n@@ -605,7 +606,7 @@ test_expect_success 'force removal of nested git work tree' '\n \t) &&\n \t(\n \t\tcd baz/boo &&\n-\t\tgit init &&\n+\t\tgit init $ref_storage_arg &&\n \t\ttest_commit deeply.nested deeper.world\n \t) &&\n \tgit clean -f -f -d &&\n@@ -619,7 +620,7 @@ test_expect_success 'git clean -e' '\n \tmkdir repo &&\n \t(\n \t\tcd repo &&\n-\t\tgit init &&\n+\t\tgit init $ref_storage_arg &&\n \t\ttouch known 1 2 3 &&\n \t\tgit add known &&\n \t\tgit clean -f -e 1 -e 2 &&\ndiff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh\nindex 5991e3c..131a23f 100755\n--- a/t/t7400-submodule-basic.sh\n+++ b/t/t7400-submodule-basic.sh\n@@ -32,7 +32,7 @@ test_expect_success 'setup - repository in init subdirectory' '\n \tmkdir init &&\n \t(\n \t\tcd init &&\n-\t\tgit init &&\n+\t\tgit init $ref_storage_arg &&\n \t\techo a >a &&\n \t\tgit add a &&\n \t\tgit commit -m \"submodule commit 1\" &&\n@@ -52,8 +52,8 @@ test_expect_success 'setup - hide init subdirectory' '\n '\n \n test_expect_success 'setup - repository to add submodules to' '\n-\tgit init addtest &&\n-\tgit init addtest-ignore\n+\tgit init $ref_storage_arg addtest &&\n+\tgit init $ref_storage_arg addtest-ignore\n '\n \n # The 'submodule add' tests need some repository to add as a submodule.\n@@ -540,7 +540,7 @@ test_expect_success 'add submodules without specifying an explicit path' '\n \tmkdir repo &&\n \t(\n \t\tcd repo &&\n-\t\tgit init &&\n+\t\tgit init $ref_storage_arg &&\n \t\techo r >r &&\n \t\tgit add r &&\n \t\tgit commit -m \"repo commit 1\"\n@@ -585,11 +585,11 @@ test_expect_success 'set up for relative path tests' '\n \tmkdir reltest &&\n \t(\n \t\tcd reltest &&\n-\t\tgit init &&\n+\t\tgit init $ref_storage_arg &&\n \t\tmkdir sub &&\n \t\t(\n \t\t\tcd sub &&\n-\t\t\tgit init &&\n+\t\t\tgit init $ref_storage_arg &&\n \t\t\ttest_commit foo\n \t\t) &&\n \t\tgit add sub &&\n@@ -754,7 +754,7 @@ test_expect_success '../bar/a/b/c works with relative local path - ../foo/bar.gi\n \t\tcp pristine-.git-config .git/config &&\n \t\tcp pristine-.gitmodules .gitmodules &&\n \t\tmkdir -p a/b/c &&\n-\t\t(cd a/b/c; git init) &&\n+\t\t(cd a/b/c; git init $ref_storage_arg) &&\n \t\tgit config remote.origin.url ../foo/bar.git &&\n \t\tgit submodule add ../bar/a/b/c ./a/b/c &&\n \t\tgit submodule init &&\n@@ -975,7 +975,7 @@ test_expect_success 'submodule with UTF-8 name' '\n \tmkdir \"$svname\" &&\n \t(\n \t\tcd \"$svname\" &&\n-\t\tgit init &&\n+\t\tgit init $ref_storage_arg &&\n \t\t>sub &&\n \t\tgit add sub &&\n \t\tgit commit -m \"init sub\"\n@@ -990,7 +990,7 @@ test_expect_success 'submodule add clone shallow submodule' '\n \tpwd=$(pwd) &&\n \t(\n \t\tcd super &&\n-\t\tgit init &&\n+\t\tgit init $ref_storage_arg &&\n \t\tgit submodule add --depth=1 file://\"$pwd\"/example2 submodule &&\n \t\t(\n \t\t\tcd submodule &&\ndiff --git a/t/t7402-submodule-rebase.sh b/t/t7402-submodule-rebase.sh\nindex 8e32f19..85166da 100755\n--- a/t/t7402-submodule-rebase.sh\n+++ b/t/t7402-submodule-rebase.sh\n@@ -13,7 +13,7 @@ test_expect_success setup '\n \tgit add file &&\n \ttest_tick &&\n \tgit commit -m initial &&\n-\tgit clone . submodule &&\n+\tgit clone $ref_storage_arg . submodule &&\n \tgit add submodule &&\n \ttest_tick &&\n \tgit commit -m submodule &&\ndiff --git a/t/t7405-submodule-merge.sh b/t/t7405-submodule-merge.sh\nindex 0d5b42a..9d147df 100755\n--- a/t/t7405-submodule-merge.sh\n+++ b/t/t7405-submodule-merge.sh\n@@ -18,7 +18,7 @@ test_expect_success setup '\n \n \tmkdir sub &&\n \t(cd sub &&\n-\t git init &&\n+\t git init $ref_storage_arg &&\n \t echo original > file &&\n \t git add file &&\n \t test_tick &&\n@@ -68,10 +68,10 @@ test_expect_success setup '\n test_expect_success 'setup for merge search' '\n \tmkdir merge-search &&\n \t(cd merge-search &&\n-\tgit init &&\n+\tgit init $ref_storage_arg &&\n \tmkdir sub &&\n \t(cd sub &&\n-\t git init &&\n+\t git init $ref_storage_arg &&\n \t echo \"file-a\" > file-a &&\n \t git add file-a &&\n \t git commit -m \"sub-a\" &&\n@@ -232,10 +232,10 @@ test_expect_success 'merging with a modify/modify conflict between merge bases'\n test_expect_success 'setup for recursive merge with submodule' '\n \tmkdir merge-recursive &&\n \t(cd merge-recursive &&\n-\t git init &&\n+\t git init $ref_storage_arg &&\n \t mkdir sub &&\n \t (cd sub &&\n-\t git init &&\n+\t git init $ref_storage_arg &&\n \t test_commit a &&\n \t git checkout -b sub-b master &&\n \t test_commit b &&\ndiff --git a/t/t9104-git-svn-follow-parent.sh b/t/t9104-git-svn-follow-parent.sh\nindex cd480ed..0c9c8f9 100755\n--- a/t/t9104-git-svn-follow-parent.sh\n+++ b/t/t9104-git-svn-follow-parent.sh\n@@ -213,7 +213,8 @@ test_expect_success \"multi-fetch continues to work\" \"\n \t\"\n \n test_expect_success \"multi-fetch works off a 'clean' repository\" '\n-\trm -r \"$GIT_DIR/svn\" \"$GIT_DIR/refs/remotes\" \"$GIT_DIR/logs\" &&\n+\trm -rf \"$GIT_DIR/svn\" \"$GIT_DIR/refs/remotes\" &&\n+\tgit reflog expire --all --expire=all &&\n \tmkdir \"$GIT_DIR/svn\" &&\n \tgit svn multi-fetch\n \t'\ndiff --git a/t/t9115-git-svn-dcommit-funky-renames.sh b/t/t9115-git-svn-dcommit-funky-renames.sh\nindex 6a48e40..83ea46b 100755\n--- a/t/t9115-git-svn-dcommit-funky-renames.sh\n+++ b/t/t9115-git-svn-dcommit-funky-renames.sh\n@@ -60,7 +60,7 @@ test_expect_success 'add a file with plus signs' '\n \t'\n \n test_expect_success 'clone the repository to test rebase' '\n-\tgit svn clone \"$svnrepo\" test-rebase &&\n+\tgit svn clone $ref_storage_arg \"$svnrepo\" test-rebase &&\n \t(\n \t\tcd test-rebase &&\n \t\techo test-rebase >test-rebase &&\ndiff --git a/t/t9350-fast-export.sh b/t/t9350-fast-export.sh\nindex b5149fd..b36008c 100755\n--- a/t/t9350-fast-export.sh\n+++ b/t/t9350-fast-export.sh\n@@ -42,7 +42,7 @@ test_expect_success 'fast-export | fast-import' '\n \tWER=$(git rev-parse --verify wer) &&\n \tMUSS=$(git rev-parse --verify muss) &&\n \tmkdir new &&\n-\tgit --git-dir=new/.git init &&\n+\tgit --git-dir=new/.git init $ref_storage_arg &&\n \tgit fast-export --all |\n \t(cd new &&\n \t git fast-import &&\n@@ -158,7 +158,7 @@ test_expect_success 'setup submodule' '\n \tmkdir sub &&\n \t(\n \t\tcd sub &&\n-\t\tgit init &&\n+\t\tgit init $ref_storage_arg &&\n \t\techo test file > file &&\n \t\tgit add file &&\n \t\tgit commit -m sub_initial\n@@ -183,7 +183,7 @@ test_expect_success 'submodule fast-export | fast-import' '\n \tSUBENT2=$(git ls-tree master sub) &&\n \trm -rf new &&\n \tmkdir new &&\n-\tgit --git-dir=new/.git init &&\n+\tgit --git-dir=new/.git init $ref_storage_arg &&\n \tgit fast-export --signed-tags=strip --all |\n \t(cd new &&\n \t git fast-import &&\ndiff --git a/t/t9902-completion.sh b/t/t9902-completion.sh\nindex 2ba62fb..d5751e2 100755\n--- a/t/t9902-completion.sh\n+++ b/t/t9902-completion.sh\n@@ -126,7 +126,7 @@ actual=\"$TRASH_DIRECTORY/actual\"\n \n test_expect_success 'setup for __gitdir tests' '\n \tmkdir -p subdir/subsubdir &&\n-\tgit init otherrepo\n+\tgit init $ref_storage_arg otherrepo\n '\n \n test_expect_success '__gitdir - from command line (through $__git_dir)' '\n@@ -177,6 +177,7 @@ test_expect_success '__gitdir - cwd is a .git directory' '\n test_expect_success '__gitdir - parent is a .git directory' '\n \techo \"$(pwd -P)/.git\" >expected &&\n \t(\n+\t\tmkdir -p .git/refs/heads &&\n \t\tcd .git/refs/heads &&\n \t\t__gitdir >\"$actual\"\n \t) &&\ndiff --git a/t/t9903-bash-prompt.sh b/t/t9903-bash-prompt.sh\nindex ffbfa0e..caa706c 100755\n--- a/t/t9903-bash-prompt.sh\n+++ b/t/t9903-bash-prompt.sh\n@@ -148,6 +148,7 @@ test_expect_success 'prompt - inside .git directory' '\n test_expect_success 'prompt - deep inside .git directory' '\n \tprintf \" (GIT_DIR!)\" >expected &&\n \t(\n+\t\tmkdir -p .git/refs/heads &&\n \t\tcd .git/refs/heads &&\n \t\t__git_ps1 >\"$actual\"\n \t) &&\ndiff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh\nindex c64e5a5..9a8bb72 100644\n--- a/t/test-lib-functions.sh\n+++ b/t/test-lib-functions.sh\n@@ -783,8 +783,8 @@ test_create_repo () {\n \trepo=\"$1\"\n \tmkdir -p \"$repo\"\n \t(\n-\t\tcd \"$repo\" || error \"Cannot setup test environment\"\n-\t\t\"$GIT_EXEC_PATH/git-init\" \"--template=$GIT_BUILD_DIR/templates/blt/\" >&3 2>&4 ||\n+\t cd \"$repo\" || error \"Cannot setup test environment\"\n+\t\t\"$GIT_EXEC_PATH/git-init\" $ref_storage_arg \"--template=$GIT_BUILD_DIR/templates/blt/\" >&3 2>&4 ||\n \t\terror \"cannot run git init -- have you built things yet?\"\n \t\tmv .git/hooks .git/hooks-disabled\n \t) || exit\n@@ -941,3 +941,52 @@ mingw_read_file_strip_cr_ () {\n \t\teval \"$1=\\$$1\\$line\"\n \tdone\n }\n+\n+raw_ref() {\n+ if test $ref_storage = \"lmdb\"\n+ then\n+\ttest-refs-lmdb-backend \"$1\" 2>/dev/null\n+ else\n+\tcat \".git/$1\"\n+ fi\n+}\n+\n+delete_ref() {\n+ if test $ref_storage = \"lmdb\"\n+ then\n+\ttest-refs-lmdb-backend -d \"$1\" 2>/dev/null\n+ else\n+\trm \".git/$1\"\n+ fi\n+}\n+\n+write_ref() {\n+ if test $ref_storage = \"lmdb\"\n+ then\n+\ttest-refs-lmdb-backend \"$1\" \"$2\" 2>/dev/null\n+ else\n+\techo \"$2\" > \".git/$1\"\n+ fi\n+}\n+\n+raw_reflog() {\n+ if test $ref_storage = \"lmdb\"\n+ then\n+\ttest-refs-lmdb-backend -l \"$1\" 2>/dev/null\n+ else\n+\tcat \".git/logs/$1\"\n+ fi\n+}\n+\n+delete_all_reflogs() {\n+ if test $ref_storage = \"lmdb\"\n+ then\n+\ttest-refs-lmdb-backend -c\n+ fi\n+ # We have to do this in any case to handle logs for per-worktree refs\n+ rm -rf .git/logs\n+}\n+\n+append_reflog() {\n+\ttest-refs-lmdb-backend -a \"$1\"\n+}\ndiff --git a/t/test-lib.sh b/t/test-lib.sh\nindex ce40770..e736554 100644\n--- a/t/test-lib.sh\n+++ b/t/test-lib.sh\n@@ -186,6 +186,8 @@ test \"x$TERM\" != \"xdumb\" && (\n \t) &&\n \tcolor=t\n \n+ref_storage=\"files\"\n+ref_storage_arg=\n while test \"$#\" -ne 0\n do\n \tcase \"$1\" in\n@@ -201,6 +203,9 @@ do\n \t\t\texit 1;\n \t\t}\n \t\trun_list=$1; shift ;;\n+\t--ref-storage=*)\n+\t GIT_TEST_REF_STORAGE=$(expr \"z$1\" : 'z[^=]*=\\(.*\\)'); shift\n+\t ;;\n \t--run=*)\n \t\trun_list=$(expr \"z$1\" : 'z[^=]*=\\(.*\\)'); shift ;;\n \t-h|--h|--he|--hel|--help)\n@@ -247,6 +252,12 @@ do\n \tesac\n done\n \n+if test -n \"$GIT_TEST_REF_STORAGE\"\n+then\n+\tref_storage=$GIT_TEST_REF_STORAGE\n+\tref_storage_arg=\"--ref-storage=$ref_storage\"\n+fi\n+\n if test -n \"$valgrind_only\"\n then\n \ttest -z \"$valgrind\" && valgrind=memcheck\n-- \n2.4.2.767.g62658d5-twtrsrc\n"},{"id":"278557","messageId":"20160218085023.GA30049@lanh","threadId":"41437","inReplyTo":"1455772670-21142-26-git-send-email-dturner@twopensource.com","subject":"Re: [PATCH v5 25/27] refs: add LMDB refs storage backend","fromName":"Duy Nguyen","fromEmail":"pclouds@gmail.com","sentAt":"2016-02-18T08:50:23Z","receivedAt":"2016-02-18T08:50:23Z","isPatch":true,"sender":{"key":"pclouds@gmail.com","avatar":"https://avatars.githubusercontent.com/u/720?v=4"},"body":"Caveat: I did not study how to use lmdb. I just guessed what it does\nbased on function names. I don't know much about refs handling either\n(especially since the transaction thing is introduced)\n\n> diff --git a/Documentation/technical/refs-lmdb-backend.txt b/Documentation/technical/refs-lmdb-backend.txt\n> new file mode 100644\n> index 0000000..eb81465\n> --- /dev/null\n> +++ b/Documentation/technical/refs-lmdb-backend.txt\n> +Reflog values are in the same format as the original files-based\n> +reflog, including the trailing LF. The date in the reflog value\n> +matches the date in the timestamp field.\n\n..except that SHA-1s are stored in raw values instead of hex strings.\n\n> diff --git a/Documentation/technical/repository-version.txt b/Documentation/technical/repository-version.txt\n> index 00ad379..fca5ecd 100644\n> --- a/Documentation/technical/repository-version.txt\n> +++ b/Documentation/technical/repository-version.txt\n> @@ -86,3 +86,8 @@ for testing format-1 compatibility.\n> When the config key `extensions.preciousObjects` is set to `true`,\n> objects in the repository MUST NOT be deleted (e.g., by `git-prune` or\n> `git repack -d`).\n> +\n> +`refStorage`\n> +~~~~~~~~~~~~\n> +This extension allows the use of alternate ref storage backends. The\n> +only defined value is `lmdb`.\n\nrefStorage accepts empty string and `files` as well, should probably\nbe worth mentioning.\n\n> diff --git a/refs/lmdb-backend.c b/refs/lmdb-backend.c\n> +#include \"../cache.h\"\n> +#include \n> +#include \"../object.h\"\n> +#include \"../refs.h\"\n> +#include \"refs-internal.h\"\n> +#include \"../tag.h\"\n> +#include \"../lockfile.h\"\n\nI'm quite sure we don't need \"../\". We have plenty of source files in\nsubdirs and many of them (haven't checked all) just go with\n#include \"cache.h\".\n\n> +struct lmdb_transaction transaction;\n\nstatic?\n\n> +\n> +static int in_write_transaction(void)\n> +{\n> +\treturn transaction.txn && !(transaction.flags & MDB_RDONLY);\n> +}\n> +\n> +static void init_env(MDB_env **env, const char *path)\n> +{\n> +\tint ret;\n> +\tif (*env)\n> +\t\treturn;\n> +\n> +\tassert(path);\n> +\n> +\tret = mdb_env_create(env);\n> +\tif (ret)\n> +\t\tdie(\"BUG: mdb_env_create failed: %s\", mdb_strerror(ret));\n> +\tret = mdb_env_set_maxreaders(*env, 1000);\n> +\tif (ret)\n> +\t\tdie(\"BUG: mdb_env_set_maxreaders failed: %s\", mdb_strerror(ret));\n> +\tret = mdb_env_set_mapsize(*env, (1<<30));\n> +\tif (ret)\n> +\t\tdie(\"BUG: mdb_set_mapsize failed: %s\", mdb_strerror(ret));\n> +\tret = mdb_env_open(*env, path, 0 , 0664);\n\nThis permission makes me wonder if we need adjust_shared_perm() here\nand some other places.\n\n> +\tif (ret)\n> +\t\tdie(\"BUG: mdb_env_open (%s) failed: %s\", path,\n> +\t\t mdb_strerror(ret));\n> +}\n> +\n> +static int lmdb_init_db(int shared, struct strbuf *err)\n> +{\n> +\t/*\n> +\t * To create a db, all we need to do is make a directory for\n> +\t * it to live in; lmdb will do the rest.\n> +\t */\n> +\n> +\tif (!db_path)\n> +\t\tdb_path = xstrdup(real_path(git_path(\"refs.lmdb\")));\n> +\n> +\tif (mkdir(db_path, 0775) && errno != EEXIST) {\n> +\t\tstrbuf_addf(err, \"%s\", strerror(errno));\n\nmaybe strbuf_addstr, unless want to add something more, \"mkdir failed\"?\n\n> +static int read_per_worktree_ref(const char *submodule, const char *refname,\n> +\t\t\t\t struct MDB_val *val, int *needs_free)\n\n>From what I read, I suspect these _per_worktree functions will be\nidentical for the next backend. Should we just hand over the job for\nfiles backend? For all entry points that may deal with per-worktree\nrefs, e.g. lmdb_resolve_ref_unsafe, can we check ref_type() first\nthing, if it's per-worktree we call refs_be_files.resolve_ref_unsafe()\ninstead? It could even be done at frontend level,\ne.g. refs.c:resolve_ref_unsafe().\n\nThough I may be talking rubbish here because I don't know how whether\nit has anything to do with transactions.\n\n> +{\n> +\tstruct strbuf sb = STRBUF_INIT;\n> +\tstruct strbuf path = STRBUF_INIT;\n> +\tstruct stat st;\n> +\tint ret = -1;\n> +\n> +\tsubmodule_path(&path, submodule, refname);\n> +\n> +#ifndef NO_SYMLINK_HEAD\n\nIt started with the compiler warns about unused \"st\" when this macro\nis defined. Which makes me wonder, should we do something like this to\nmake sure this code compiles unconditionally?\n\n+#ifndef NO_SYMLINK_HEAD\n+ int no_symlink_head = 0;\n+#else\n+ int no_symlink_head = 1;\n+#endif\n...\n+ if (!no_symlink_head) {\n...\n\n\n> +int lmdb_transaction_begin_flags(struct strbuf *err, unsigned int flags)\n\nstatic?\n\n> +#define MAXDEPTH 5\n> +\n> +static const char *parse_ref_data(struct lmdb_transaction *transaction,\n> +\t\t\t\t const char *refname, const char *ref_data,\n> +\t\t\t\t unsigned char *sha1, int resolve_flags,\n> +\t\t\t\t int *flags, int bad_name)\n> +{\n> +\tint depth = MAXDEPTH;\n> +\tconst char *buf;\n> +\tstatic struct strbuf refname_buffer = STRBUF_INIT;\n> +\tstatic struct strbuf refdata_buffer = STRBUF_INIT;\n> +\tMDB_val key, val;\n> +\tint needs_free = 0;\n> +\n> +\tfor (;;) {\n> +\t\tif (--depth < 0)\n> +\t\t\treturn NULL;\n> +\n> +\t\tif (!starts_with(ref_data, \"ref:\")) {\n> +\t\t\tif (get_sha1_hex(ref_data, sha1) ||\n> +\t\t\t (ref_data[40] != '\\0' && !isspace(ref_data[40]))) {\n> +\t\t\t\tif (flags)\n> +\t\t\t\t\t*flags |= REF_ISBROKEN;\n> +\t\t\t\terrno = EINVAL;\n> +\t\t\t\treturn NULL;\n> +\t\t\t}\n> +\n> +\t\t\tif (bad_name) {\n> +\t\t\t\thashclr(sha1);\n> +\t\t\t\tif (flags)\n> +\t\t\t\t\t*flags |= REF_ISBROKEN;\n> +\t\t\t} else if (is_null_sha1(sha1)) {\n> +\t\t\t\tif (flags)\n> +\t\t\t\t\t*flags |= REF_ISBROKEN;\n> +\t\t\t}\n> +\t\t\treturn refname;\n> +\t\t}\n> +\t\tif (flags)\n> +\t\t\t*flags |= REF_ISSYMREF;\n> +\t\tbuf = ref_data + 4;\n> +\t\twhile (isspace(*buf))\n> +\t\t\tbuf++;\n> +\t\tstrbuf_reset(&refname_buffer);\n> +\t\tstrbuf_addstr(&refname_buffer, buf);\n> +\t\trefname = refname_buffer.buf;\n> +\t\tif (resolve_flags & RESOLVE_REF_NO_RECURSE) {\n> +\t\t\thashclr(sha1);\n> +\t\t\treturn refname;\n> +\t\t}\n> +\t\tif (check_refname_format(buf, REFNAME_ALLOW_ONELEVEL)) {\n> +\t\t\tif (flags)\n> +\t\t\t\t*flags |= REF_ISBROKEN;\n> +\n> +\t\t\tif (!(resolve_flags & RESOLVE_REF_ALLOW_BAD_NAME) ||\n> +\t\t\t !refname_is_safe(buf)) {\n> +\t\t\t\terrno = EINVAL;\n> +\t\t\t\treturn NULL;\n> +\t\t\t}\n> +\t\t\tbad_name = 1;\n> +\t\t}\n\nThis code looks a lot like near the end of resolve_ref_1(). Maybe we\ncould share the code in refs/backend-common.c or something and call\nhere instead?\n\n> +static const char *resolve_ref_unsafe_txn(struct lmdb_transaction *transaction,\n> +\t\t\t\t\t const char *refname,\n> +\t\t\t\t\t int resolve_flags,\n> +\t\t\t\t\t unsigned char *sha1,\n> +\t\t\t\t\t int *flags)\n> +{\n...\n> +\tif (flags)\n> +\t\t*flags = 0;\n> +\n> +\tif (check_refname_format(refname, REFNAME_ALLOW_ONELEVEL)) {\n> +\t\tif (flags)\n> +\t\t\t*flags |= REF_BAD_NAME;\n> +\n> +\t\tif (!(resolve_flags & RESOLVE_REF_ALLOW_BAD_NAME) ||\n> +\t\t !refname_is_safe(refname)) {\n> +\t\t\terrno = EINVAL;\n> +\t\t\treturn NULL;\n> +\t\t}\n> +\t\t/*\n> +\t\t * dwim_ref() uses REF_ISBROKEN to distinguish between\n> +\t\t * missing refs and refs that were present but invalid,\n> +\t\t * to complain about the latter to stderr.\n> +\t\t *\n> +\t\t * We don't know whether the ref exists, so don't set\n> +\t\t * REF_ISBROKEN yet.\n> +\t\t */\n> +\t\tbad_name = 1;\n> +\t}\n\nThis code too.\n\n> +static int show_one_reflog_ent(struct strbuf *sb, each_reflog_ent_fn fn, void *cb_data)\n> +{\n> +\tunsigned char osha1[20], nsha1[20];\n> +\tchar *email_end, *message;\n> +\tunsigned long timestamp;\n> +\tint tz;\n> +\n> +\t/* old (raw sha) new (raw sha) name SP time TAB msg LF */\n\nHmm.. since you're going with raw sha-1, this is clearly not a text\nstring anymore, any reason to still keep LF at the end?\n\n> +static int lmdb_delete_reflog(const char *refname)\n> +{\n> +\tMDB_val key, val;\n> +\tchar *log_path;\n> +\tint len;\n> +\tMDB_cursor *cursor;\n> +\tint ret = 0;\n> +\tint mdb_ret;\n> +\tstruct strbuf err = STRBUF_INIT;\n> +\tint in_transaction;\n> +\n> +\tif (ref_type(refname) != REF_TYPE_NORMAL)\n> +\t\treturn refs_be_files.delete_reflog(refname);\n\nYay.. delegating work to files backend. I still think doing this in\nrefs.c:delete_reflog() may be a good idea.\n\n> +int lmdb_reflog_expire(const char *refname, const unsigned char *sha1,\n\nstatic?\n\n> +static int lmdb_create_symref(const char *ref_target,\n> +\t\t\t const char *refs_heads_master,\n> +\t\t\t const char *logmsg)\n> +{\n> +\n...\n> +\tmdb_put_or_die(&transaction, &key, &val, 0);\n> +\n> +\t/* TODO: Don't create ref d/f conflicts */\n\nI'm not sure I get this comment. D/F conflicts are no longer a thing\nfor lmdb backend, right?\n\n> +MDB_env *submodule_txn_begin(struct lmdb_transaction *transaction)\n\nstatic?\n\n> +{\n> +\tint ret;\n> +\tMDB_env *submodule_env = NULL;\n> +\tstruct strbuf path = STRBUF_INIT;\n> +\n> +\tstrbuf_git_path_submodule(&path, transaction->submodule, \"refs.lmdb\");\n> +\n> +\tif (!is_directory(path.buf))\n> +\t\tgoto done;\n> +\n> +\tmkdir(path.buf, 0775);\n\nA few other places where mkdir() is called, we may need to\nadjust_shared_perm().\n\n> diff --git a/setup.c b/setup.c\n> index 1a62277..00625ab 100644\n> --- a/setup.c\n> +++ b/setup.c\n> @@ -279,7 +279,7 @@ int ref_storage_backend_config(const char *var, const char *value, void *ptr)\n> *\n> * - either an objects/ directory _or_ the proper\n> * GIT_OBJECT_DIRECTORY environment variable\n> - * - a refs/ directory\n> + * - a refs.lmdb/ directory or a refs/ directory\n> * - either a HEAD symlink or a HEAD file that is formatted as\n> * a proper \"ref:\", or a regular file HEAD that has a properly\n> * formatted sha1 object name.\n> @@ -313,8 +313,13 @@ int is_git_directory(const char *suspect)\n> \n> \tstrbuf_setlen(&path, len);\n> \tstrbuf_addstr(&path, \"/refs\");\n> -\tif (access(path.buf, X_OK))\n> -\t\tgoto done;\n> +\n> +\tif (access(path.buf, X_OK)) {\n> +\t\tstrbuf_setlen(&path, len);\n> +\t\tstrbuf_addstr(&path, \"/refs.lmdb\");\n> +\t\tif (access(path.buf, X_OK))\n> +\t\t\tgoto done;\n> +\t}\n>\n\nI think it's ok leaving this function unmodified, which means \"refs\"\ndirectory will always be there and \"refs.lmdb\" does not matter. If\nsomehow \"refs\" is deleted, old binaries get confused anyway so we\ncan't delete it.\n\n> @@ -1089,8 +1089,11 @@ static int refs_from_alternate_cb(struct alternate_object_database *e,\n> \t\tgoto out;\n> \t/* Is this a git repository with refs? */\n> \tmemcpy(other + len - 8, \"/refs\", 6);\n> -\tif (!is_directory(other))\n> -\t\tgoto out;\n> +\tif (!is_directory(other)) {\n> +\t\tmemcpy(other + len - 8, \"/refs.lmdb\", 11);\n> +\t\tif (!is_directory(other))\n> +\t\t\tgoto out;\n> +\t}\n\nand probably the same here. I have no idea what this code does though,\nbut if it's about detecting git directory, it should call\nis_git_directory() instead.\n\n> \tother[len - 8] = '\\0';\n> \tremote = remote_get(other);\n> \ttransport = transport_get(remote, other);\n--\nDuy\n"},{"id":"278570","messageId":"1455827001.7528.87.camel@twopensource.com","threadId":"41437","inReplyTo":"20160218085023.GA30049@lanh","subject":"Re: [PATCH v5 25/27] refs: add LMDB refs storage backend","fromName":"David Turner","fromEmail":"dturner@twopensource.com","sentAt":"2016-02-18T20:23:21Z","receivedAt":"2016-02-18T20:23:21Z","isPatch":true,"sender":{"key":"novalis@novalis.org","avatar":"https://avatars.githubusercontent.com/u/77003?v=4"},"body":"On Thu, 2016-02-18 at 15:50 +0700, Duy Nguyen wrote:\n\n[snip]\n\nThanks; applied the above\n\n> This permission makes me wonder if we need adjust_shared_perm() here\n> and some other places.\n\nSo just add this after every mkdir?\n\n\tif (shared_repository)\n\t\tadjust_shared_perm(db_path);\n\n> > +\tif (ret)\n> > +\t\tdie(\"BUG: mdb_env_open (%s) failed: %s\", path,\n> > +\t\t mdb_strerror(ret));\n> > +}\n> > +\n> > +static int lmdb_init_db(int shared, struct strbuf *err)\n> > +{\n> > +\t/*\n> > +\t * To create a db, all we need to do is make a directory\n> > for\n> > +\t * it to live in; lmdb will do the rest.\n> > +\t */\n> > +\n> > +\tif (!db_path)\n> > +\t\tdb_path =\n> > xstrdup(real_path(git_path(\"refs.lmdb\")));\n> > +\n> > +\tif (mkdir(db_path, 0775) && errno != EEXIST) {\n> > +\t\tstrbuf_addf(err, \"%s\", strerror(errno));\n> \n> maybe strbuf_addstr, unless want to add something more, \"mkdir\n> failed\"?\n\nadded more\n\n> > +static int read_per_worktree_ref(const char *submodule, const char\n> > *refname,\n> > +\t\t\t\t struct MDB_val *val, int\n> > *needs_free)\n> \n> From what I read, I suspect these _per_worktree functions will be\n> identical for the next backend. Should we just hand over the job for\n> files backend? For all entry points that may deal with per-worktree\n> refs, e.g. lmdb_resolve_ref_unsafe, can we check ref_type() first\n> thing, if it's per-worktree we call\n> refs_be_files.resolve_ref_unsafe()\n> instead? It could even be done at frontend level,\n> e.g. refs.c:resolve_ref_unsafe().\n> \n> Though I may be talking rubbish here because I don't know how whether\n> it has anything to do with transactions.\n\nThe reason I did it this way is that some ref chains cross backend\nboundaries (e.g. HEAD -> refs/heads/master). But if we have other\nbackends later, we could generalize.\n\n> > +{\n> > +\tstruct strbuf sb = STRBUF_INIT;\n> > +\tstruct strbuf path = STRBUF_INIT;\n> > +\tstruct stat st;\n> > +\tint ret = -1;\n> > +\n> > +\tsubmodule_path(&path, submodule, refname);\n> > +\n> > +#ifndef NO_SYMLINK_HEAD\n> \n> It started with the compiler warns about unused \"st\" when this macro\n> is defined. Which makes me wonder, should we do something like this\n> to\n> make sure this code compiles unconditionally?\n> \n> +#ifndef NO_SYMLINK_HEAD\n> + int no_symlink_head = 0;\n> +#else\n> + int no_symlink_head = 1;\n> +#endif\n> ...\n> + if (!no_symlink_head) {\n> ...\n\nOK.\n\n> > +int lmdb_transaction_begin_flags(struct strbuf *err, unsigned int\n> > flags)\n> \n> static?\n\nyep\n\n> > +static const char *parse_ref_data(struct lmdb_transaction\n> > *transaction,\n> > +\t\t\t\t const char *refname, const char\n> > *ref_data,\n> > +\t\t\t\t unsigned char *sha1, int\n> > resolve_flags,\n> > +\t\t\t\t int *flags, int bad_name)\n> > +{\n>[snip]\n> This code looks a lot like near the end of resolve_ref_1(). Maybe we\n> could share the code in refs/backend-common.c or something and call\n> here instead?\n\nWhen I wrote this, I couldn't find a straightforward way to factor out\nthe commonalities, but I'll try again now that I understand the refs\ncode better.\n\n> > +static int show_one_reflog_ent(struct strbuf *sb,\n> > each_reflog_ent_fn fn, void *cb_data)\n> > +{\n> > +\tunsigned char osha1[20], nsha1[20];\n> > +\tchar *email_end, *message;\n> > +\tunsigned long timestamp;\n> > +\tint tz;\n> > +\n> > +\t/* old (raw sha) new (raw sha) name SP time TAB\n> > msg LF */\n> \n> Hmm.. since you're going with raw sha-1, this is clearly not a text\n> string anymore, any reason to still keep LF at the end?\n\nIIRC, some of the common funcs depend on this.\n\n> > +static int lmdb_delete_reflog(const char *refname)\n> > +{\n> > +\tMDB_val key, val;\n> > +\tchar *log_path;\n> > +\tint len;\n> > +\tMDB_cursor *cursor;\n> > +\tint ret = 0;\n> > +\tint mdb_ret;\n> > +\tstruct strbuf err = STRBUF_INIT;\n> > +\tint in_transaction;\n> > +\n> > +\tif (ref_type(refname) != REF_TYPE_NORMAL)\n> > +\t\treturn refs_be_files.delete_reflog(refname);\n> \n> Yay.. delegating work to files backend. I still think doing this in\n> refs.c:delete_reflog() may be a good idea.\n\nYes, I agree.\n\n> > +int lmdb_reflog_expire(const char *refname, const unsigned char\n> > *sha1,\n> \n> static?\n\nYep.\n\n> > +static int lmdb_create_symref(const char *ref_target,\n> > +\t\t\t const char *refs_heads_master,\n> > +\t\t\t const char *logmsg)\n> > +{\n> > +\n> ...\n> > +\tmdb_put_or_die(&transaction, &key, &val, 0);\n> > +\n> > +\t/* TODO: Don't create ref d/f conflicts */\n> \n> I'm not sure I get this comment. D/F conflicts are no longer a thing\n> for lmdb backend, right?\n\nI'm trying to avoid the lmdb backend creating a set of refs that the\nfiles backend can't handle. This would make collaboration with other\nversions of git more difficult.\n\n> > +MDB_env *submodule_txn_begin(struct lmdb_transaction *transaction)\n> \n> static?\n\nYes.\n\n> > +{\n> > +\tint ret;\n> > +\tMDB_env *submodule_env = NULL;\n> > +\tstruct strbuf path = STRBUF_INIT;\n> > +\n> > +\tstrbuf_git_path_submodule(&path, transaction->submodule,\n> > \"refs.lmdb\");\n> > +\n> > +\tif (!is_directory(path.buf))\n> > +\t\tgoto done;\n> > +\n> > +\tmkdir(path.buf, 0775);\n> \n> A few other places where mkdir() is called, we may need to\n> adjust_shared_perm().\n\nOK.\n\n> > diff --git a/setup.c b/setup.c\n> > index 1a62277..00625ab 100644\n> > --- a/setup.c\n> > +++ b/setup.c\n> > @@ -279,7 +279,7 @@ int ref_storage_backend_config(const char *var,\n> > const char *value, void *ptr)\n> > *\n> > * - either an objects/ directory _or_ the proper\n> > * GIT_OBJECT_DIRECTORY environment variable\n> > - * - a refs/ directory\n> > + * - a refs.lmdb/ directory or a refs/ directory\n> > * - either a HEAD symlink or a HEAD file that is formatted as\n> > * a proper \"ref:\", or a regular file HEAD that has a properly\n> > * formatted sha1 object name.\n> > @@ -313,8 +313,13 @@ int is_git_directory(const char *suspect)\n> > \n> > \tstrbuf_setlen(&path, len);\n> > \tstrbuf_addstr(&path, \"/refs\");\n> > -\tif (access(path.buf, X_OK))\n> > -\t\tgoto done;\n> > +\n> > +\tif (access(path.buf, X_OK)) {\n> > +\t\tstrbuf_setlen(&path, len);\n> > +\t\tstrbuf_addstr(&path, \"/refs.lmdb\");\n> > +\t\tif (access(path.buf, X_OK))\n> > +\t\t\tgoto done;\n> > +\t}\n> > \n> \n> I think it's ok leaving this function unmodified, which means \"refs\"\n> directory will always be there and \"refs.lmdb\" does not matter. If\n> somehow \"refs\" is deleted, old binaries get confused anyway so we\n> can't delete it.\n\nOK.\n\n> > @@ -1089,8 +1089,11 @@ static int refs_from_alternate_cb(struct\n> > alternate_object_database *e,\n> > \t\tgoto out;\n> > \t/* Is this a git repository with refs? */\n> > \tmemcpy(other + len - 8, \"/refs\", 6);\n> > -\tif (!is_directory(other))\n> > -\t\tgoto out;\n> > +\tif (!is_directory(other)) {\n> > +\t\tmemcpy(other + len - 8, \"/refs.lmdb\", 11);\n> > +\t\tif (!is_directory(other))\n> > +\t\t\tgoto out;\n> > +\t}\n> \n> and probably the same here. I have no idea what this code does\n> though,\n> but if it's about detecting git directory, it should call\n> is_git_directory() instead.\n\nI'll back out my change, but not do the the is_git_directory thing\nsince I don't have a strong sense of why this code is the way it is.\n"},{"id":"278573","messageId":"xmqqh9h5g1p5.fsf@gitster.mtv.corp.google.com","threadId":"41437","inReplyTo":"1455827001.7528.87.camel@twopensource.com","subject":"Re: [PATCH v5 25/27] refs: add LMDB refs storage backend","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2016-02-18T21:15:18Z","receivedAt":"2016-02-18T21:15:18Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"David Turner writes:\n\n> On Thu, 2016-02-18 at 15:50 +0700, Duy Nguyen wrote:\n>\n> [snip]\n>\n> Thanks; applied the above\n\nPlease. Your other messages did excessively quote parts of the\nmessage you are not responding to, but this will not tell anybody\nbut you what \"the above\" refers to, not even to Duy if the message\nsuggested more than one thing and you took only some but not all of\nthem.\n\n>> This permission makes me wonder if we need adjust_shared_perm() here\n>> and some other places.\n>\n> So just add this after every mkdir?\n>\n> \tif (shared_repository)\n> \t\tadjust_shared_perm(db_path);\n\nThat reads as if the caller is saying \"if we are in a shared\nrepository, tweak the permission bits to make it sharable.\"\n\nRather, think of \"adjust_shared_perm(path)\" as a declaration that\nyou know \"path\" is something that needs to be accessible by those\nwho needs write access to the repository. The caller does not need\n\"if (shared_repository)\"; the callee knows to become no-op.\n"},{"id":"278606","messageId":"CACsJy8AEOzSi-yJo3eJLSv5s6RW1sZBw+G2Y7cypGb2b+p0QLg@mail.gmail.com","threadId":"41437","inReplyTo":"1455827001.7528.87.camel@twopensource.com","subject":"Re: [PATCH v5 25/27] refs: add LMDB refs storage backend","fromName":"Duy Nguyen","fromEmail":"pclouds@gmail.com","sentAt":"2016-02-19T02:54:32Z","receivedAt":"2016-02-19T02:54:32Z","isPatch":true,"sender":{"key":"pclouds@gmail.com","avatar":"https://avatars.githubusercontent.com/u/720?v=4"},"body":"On Fri, Feb 19, 2016 at 3:23 AM, David Turner wrote:\n>> > +static int read_per_worktree_ref(const char *submodule, const char\n>> > *refname,\n>> > + struct MDB_val *val, int\n>> > *needs_free)\n>>\n>> From what I read, I suspect these _per_worktree functions will be\n>> identical for the next backend. Should we just hand over the job for\n>> files backend? For all entry points that may deal with per-worktree\n>> refs, e.g. lmdb_resolve_ref_unsafe, can we check ref_type() first\n>> thing, if it's per-worktree we call\n>> refs_be_files.resolve_ref_unsafe()\n>> instead? It could even be done at frontend level,\n>> e.g. refs.c:resolve_ref_unsafe().\n>>\n>> Though I may be talking rubbish here because I don't know how whether\n>> it has anything to do with transactions.\n>\n> The reason I did it this way is that some ref chains cross backend\n> boundaries (e.g. HEAD -> refs/heads/master). But if we have other\n> backends later, we could generalize.\n\nCrossing backends should go through frontend again, imo. But I don't\nreally know if it's efficient.\n\n>> > +static int lmdb_create_symref(const char *ref_target,\n>> > + const char *refs_heads_master,\n>> > + const char *logmsg)\n>> > +{\n>> > +\n>> ...\n>> > + mdb_put_or_die(&transaction, &key, &val, 0);\n>> > +\n>> > + /* TODO: Don't create ref d/f conflicts */\n>>\n>> I'm not sure I get this comment. D/F conflicts are no longer a thing\n>> for lmdb backend, right?\n>\n> I'm trying to avoid the lmdb backend creating a set of refs that the\n> files backend can't handle. This would make collaboration with other\n> versions of git more difficult.\n\nIt already is. If you create refs \"foo\" and \"FOO\" on case sensitive\nfile system and clone it on a case-insensitive one, you face the same\nproblem. We may have an optional configuration knob to prevent\nincompatibilities with files backend, but I think that should be done\n(and enforced if necessary) outside backends.\n-- \nDuy\n"},{"id":"278694","messageId":"1455909039.7528.89.camel@twopensource.com","threadId":"41437","inReplyTo":"CACsJy8AEOzSi-yJo3eJLSv5s6RW1sZBw+G2Y7cypGb2b+p0QLg@mail.gmail.com","subject":"Re: [PATCH v5 25/27] refs: add LMDB refs storage backend","fromName":"David Turner","fromEmail":"dturner@twopensource.com","sentAt":"2016-02-19T19:10:39Z","receivedAt":"2016-02-19T19:10:39Z","isPatch":true,"sender":{"key":"novalis@novalis.org","avatar":"https://avatars.githubusercontent.com/u/77003?v=4"},"body":"On Fri, 2016-02-19 at 09:54 +0700, Duy Nguyen wrote:\n> On Fri, Feb 19, 2016 at 3:23 AM, David Turner <\n> dturner@twopensource.com> wrote:\n> > > > +static int read_per_worktree_ref(const char *submodule, const\n> > > > char\n> > > > *refname,\n> > > > + struct MDB_val *val, int\n> > > > *needs_free)\n> > > \n> > > From what I read, I suspect these _per_worktree functions will be\n> > > identical for the next backend. Should we just hand over the job\n> > > for\n> > > files backend? For all entry points that may deal with per\n> > > -worktree\n> > > refs, e.g. lmdb_resolve_ref_unsafe, can we check ref_type() first\n> > > thing, if it's per-worktree we call\n> > > refs_be_files.resolve_ref_unsafe()\n> > > instead? It could even be done at frontend level,\n> > > e.g. refs.c:resolve_ref_unsafe().\n> > > \n> > > Though I may be talking rubbish here because I don't know how\n> > > whether\n> > > it has anything to do with transactions.\n> > \n> > The reason I did it this way is that some ref chains cross backend\n> > boundaries (e.g. HEAD -> refs/heads/master). But if we have other\n> > backends later, we could generalize.\n> \n> Crossing backends should go through frontend again, imo. But I don't\n> really know if it's efficient.\n\nIt's pretty tricky to maintain state (e.g. count of symref redirects)\nacross that barrier. So I'm not sure how to do it cleanly.\n\n> > > > +static int lmdb_create_symref(const char *ref_target,\n> > > > + const char *refs_heads_master,\n> > > > + const char *logmsg)\n> > > > +{\n> > > > +\n> > > ...\n> > > > + mdb_put_or_die(&transaction, &key, &val, 0);\n> > > > +\n> > > > + /* TODO: Don't create ref d/f conflicts */\n> > > \n> > > I'm not sure I get this comment. D/F conflicts are no longer a\n> > > thing\n> > > for lmdb backend, right?\n> > \n> > I'm trying to avoid the lmdb backend creating a set of refs that\n> > the\n> > files backend can't handle. This would make collaboration with\n> > other\n> > versions of git more difficult.\n> \n> It already is. If you create refs \"foo\" and \"FOO\" on case sensitive\n> file system and clone it on a case-insensitive one, you face the same\n> problem. We may have an optional configuration knob to prevent\n> incompatibilities with files backend, but I think that should be done\n> (and enforced if necessary) outside backends.\n\nSure, the current state isn't perfect, but why make it worse? \n"},{"id":"278709","messageId":"1455922186.7528.97.camel@twopensource.com","threadId":"41437","inReplyTo":"20160218085023.GA30049@lanh","subject":"Re: [PATCH v5 25/27] refs: add LMDB refs storage backend","fromName":"David Turner","fromEmail":"dturner@twopensource.com","sentAt":"2016-02-19T22:49:46Z","receivedAt":"2016-02-19T22:49:46Z","isPatch":true,"sender":{"key":"novalis@novalis.org","avatar":"https://avatars.githubusercontent.com/u/77003?v=4"},"body":"On Thu, 2016-02-18 at 15:50 +0700, Duy Nguyen wrote:\n> Caveat: I did not study how to use lmdb. I just guessed what it does\n> based on function names. I don't know much about refs handling either\n> (especially since the transaction thing is introduced)\n> \n> > diff --git a/Documentation/technical/refs-lmdb-backend.txt\n> > b/Documentation/technical/refs-lmdb-backend.txt\n> > new file mode 100644\n> > index 0000000..eb81465\n> > --- /dev/null\n> > +++ b/Documentation/technical/refs-lmdb-backend.txt\n> > +Reflog values are in the same format as the original files-based\n> > +reflog, including the trailing LF. The date in the reflog value\n> > +matches the date in the timestamp field.\n> \n> ..except that SHA-1s are stored in raw values instead of hex strings.\n> \n> > diff --git a/Documentation/technical/repository-version.txt\n> > b/Documentation/technical/repository-version.txt\n> > index 00ad379..fca5ecd 100644\n> > --- a/Documentation/technical/repository-version.txt\n> > +++ b/Documentation/technical/repository-version.txt\n> > @@ -86,3 +86,8 @@ for testing format-1 compatibility.\n> > When the config key `extensions.preciousObjects` is set to `true`,\n> > objects in the repository MUST NOT be deleted (e.g., by `git\n> > -prune` or\n> > `git repack -d`).\n> > +\n> > +`refStorage`\n> > +~~~~~~~~~~~~\n> > +This extension allows the use of alternate ref storage backends. \n> > The\n> > +only defined value is `lmdb`.\n> \n> refStorage accepts empty string and `files` as well, should probably\n> be worth mentioning.\n> \n> > diff --git a/refs/lmdb-backend.c b/refs/lmdb-backend.c\n> > +#include \"../cache.h\"\n> > +#include \n> > +#include \"../object.h\"\n> > +#include \"../refs.h\"\n> > +#include \"refs-internal.h\"\n> > +#include \"../tag.h\"\n> > +#include \"../lockfile.h\"\n> \n> I'm quite sure we don't need \"../\". We have plenty of source files in\n> subdirs and many of them (haven't checked all) just go with\n> #include \"cache.h\".\n> \n> > +struct lmdb_transaction transaction;\n> \n> static?\n> \n> > +\n> > +static int in_write_transaction(void)\n> > +{\n> > +\treturn transaction.txn && !(transaction.flags &\n> > MDB_RDONLY);\n> > +}\n> > +\n> > +static void init_env(MDB_env **env, const char *path)\n> > +{\n> > +\tint ret;\n> > +\tif (*env)\n> > +\t\treturn;\n> > +\n> > +\tassert(path);\n> > +\n> > +\tret = mdb_env_create(env);\n> > +\tif (ret)\n> > +\t\tdie(\"BUG: mdb_env_create failed: %s\",\n> > mdb_strerror(ret));\n> > +\tret = mdb_env_set_maxreaders(*env, 1000);\n> > +\tif (ret)\n> > +\t\tdie(\"BUG: mdb_env_set_maxreaders failed: %s\",\n> > mdb_strerror(ret));\n> > +\tret = mdb_env_set_mapsize(*env, (1<<30));\n> > +\tif (ret)\n> > +\t\tdie(\"BUG: mdb_set_mapsize failed: %s\",\n> > mdb_strerror(ret));\n> > +\tret = mdb_env_open(*env, path, 0 , 0664);\n> \n> This permission makes me wonder if we need adjust_shared_perm() here\n> and some other places.\n> \n> > +\tif (ret)\n> > +\t\tdie(\"BUG: mdb_env_open (%s) failed: %s\", path,\n> > +\t\t mdb_strerror(ret));\n> > +}\n> > +\n> > +static int lmdb_init_db(int shared, struct strbuf *err)\n> > +{\n> > +\t/*\n> > +\t * To create a db, all we need to do is make a directory\n> > for\n> > +\t * it to live in; lmdb will do the rest.\n> > +\t */\n> > +\n> > +\tif (!db_path)\n> > +\t\tdb_path =\n> > xstrdup(real_path(git_path(\"refs.lmdb\")));\n> > +\n> > +\tif (mkdir(db_path, 0775) && errno != EEXIST) {\n> > +\t\tstrbuf_addf(err, \"%s\", strerror(errno));\n> \n> maybe strbuf_addstr, unless want to add something more, \"mkdir\n> failed\"?\n> \n> > +static int read_per_worktree_ref(const char *submodule, const char\n> > *refname,\n> > +\t\t\t\t struct MDB_val *val, int\n> > *needs_free)\n> \n> From what I read, I suspect these _per_worktree functions will be\n> identical for the next backend. Should we just hand over the job for\n> files backend? For all entry points that may deal with per-worktree\n> refs, e.g. lmdb_resolve_ref_unsafe, can we check ref_type() first\n> thing, if it's per-worktree we call\n> refs_be_files.resolve_ref_unsafe()\n> instead? It could even be done at frontend level,\n> e.g. refs.c:resolve_ref_unsafe().\n> \n> Though I may be talking rubbish here because I don't know how whether\n> it has anything to do with transactions.\n> \n> > +{\n> > +\tstruct strbuf sb = STRBUF_INIT;\n> > +\tstruct strbuf path = STRBUF_INIT;\n> > +\tstruct stat st;\n> > +\tint ret = -1;\n> > +\n> > +\tsubmodule_path(&path, submodule, refname);\n> > +\n> > +#ifndef NO_SYMLINK_HEAD\n> \n> It started with the compiler warns about unused \"st\" when this macro\n> is defined. Which makes me wonder, should we do something like this\n> to\n> make sure this code compiles unconditionally?\n> \n> +#ifndef NO_SYMLINK_HEAD\n> + int no_symlink_head = 0;\n> +#else\n> + int no_symlink_head = 1;\n> +#endif\n> ...\n> + if (!no_symlink_head) {\n> ...\n> \n> \n> > +int lmdb_transaction_begin_flags(struct strbuf *err, unsigned int\n> > flags)\n> \n> static?\n> \n> > +#define MAXDEPTH 5\n> > +\n> > +static const char *parse_ref_data(struct lmdb_transaction\n> > *transaction,\n> > +\t\t\t\t const char *refname, const char\n> > *ref_data,\n> > +\t\t\t\t unsigned char *sha1, int\n> > resolve_flags,\n> > +\t\t\t\t int *flags, int bad_name)\n> > +{\n> > +\tint depth = MAXDEPTH;\n> > +\tconst char *buf;\n> > +\tstatic struct strbuf refname_buffer = STRBUF_INIT;\n> > +\tstatic struct strbuf refdata_buffer = STRBUF_INIT;\n> > +\tMDB_val key, val;\n> > +\tint needs_free = 0;\n> > +\n> > +\tfor (;;) {\n> > +\t\tif (--depth < 0)\n> > +\t\t\treturn NULL;\n> > +\n> > +\t\tif (!starts_with(ref_data, \"ref:\")) {\n> > +\t\t\tif (get_sha1_hex(ref_data, sha1) ||\n> > +\t\t\t (ref_data[40] != '\\0' &&\n> > !isspace(ref_data[40]))) {\n> > +\t\t\t\tif (flags)\n> > +\t\t\t\t\t*flags |= REF_ISBROKEN;\n> > +\t\t\t\terrno = EINVAL;\n> > +\t\t\t\treturn NULL;\n> > +\t\t\t}\n> > +\n> > +\t\t\tif (bad_name) {\n> > +\t\t\t\thashclr(sha1);\n> > +\t\t\t\tif (flags)\n> > +\t\t\t\t\t*flags |= REF_ISBROKEN;\n> > +\t\t\t} else if (is_null_sha1(sha1)) {\n> > +\t\t\t\tif (flags)\n> > +\t\t\t\t\t*flags |= REF_ISBROKEN;\n> > +\t\t\t}\n> > +\t\t\treturn refname;\n> > +\t\t}\n> > +\t\tif (flags)\n> > +\t\t\t*flags |= REF_ISSYMREF;\n> > +\t\tbuf = ref_data + 4;\n> > +\t\twhile (isspace(*buf))\n> > +\t\t\tbuf++;\n> > +\t\tstrbuf_reset(&refname_buffer);\n> > +\t\tstrbuf_addstr(&refname_buffer, buf);\n> > +\t\trefname = refname_buffer.buf;\n> > +\t\tif (resolve_flags & RESOLVE_REF_NO_RECURSE) {\n> > +\t\t\thashclr(sha1);\n> > +\t\t\treturn refname;\n> > +\t\t}\n> > +\t\tif (check_refname_format(buf,\n> > REFNAME_ALLOW_ONELEVEL)) {\n> > +\t\t\tif (flags)\n> > +\t\t\t\t*flags |= REF_ISBROKEN;\n> > +\n> > +\t\t\tif (!(resolve_flags &\n> > RESOLVE_REF_ALLOW_BAD_NAME) ||\n> > +\t\t\t !refname_is_safe(buf)) {\n> > +\t\t\t\terrno = EINVAL;\n> > +\t\t\t\treturn NULL;\n> > +\t\t\t}\n> > +\t\t\tbad_name = 1;\n> > +\t\t}\n> \n> This code looks a lot like near the end of resolve_ref_1(). Maybe we\n> could share the code in refs/backend-common.c or something and call\n> here instead?\n\nSomething like the following?\n\ncommit aad6b84fd1869f6e1cf6ed15bcece0c2f6429e9d\nAuthor: David Turner \nDate: Thu Feb 18 17:09:29 2016 -0500\n\n refs: break out some functions from resolve_ref_1\n \n A bunch of resolve_ref_1 is not backend-specific, so we can\n break it out into separate internal functions that other\n backends can use.\n \n Signed-off-by: David Turner \n\ndiff --git a/refs.c b/refs.c\nindex c9fa34d..680c2a5 100644\n--- a/refs.c\n+++ b/refs.c\n@@ -1221,6 +1221,66 @@ int for_each_rawref(each_ref_fn fn, void\n*cb_data)\n \t\t\t DO_FOR_EACH_INCLUDE_BROKEN, cb_data);\n }\n \n+int parse_simple_ref(const char *buf, unsigned char *sha1, unsigned\nint *flags, int bad_name)\n+{\n+\t/*\n+\t * Please note that FETCH_HEAD has a second\n+\t * line containing other data.\n+\t */\n+\tif (get_sha1_hex(buf, sha1) ||\n+\t (buf[40] != '\\0' && !isspace(buf[40]))) {\n+\t\tif (flags)\n+\t\t\t*flags |= REF_ISBROKEN;\n+\t\terrno = EINVAL;\n+\t\treturn -1;\n+\t}\n+\tif (bad_name) {\n+\t\thashclr(sha1);\n+\t\tif (flags)\n+\t\t\t*flags |= REF_ISBROKEN;\n+\t}\n+\treturn 0;\n+}\n+\n+int check_bad_refname(const char *refname, int *flags, int\nresolve_flags)\n+{\n+\tif (!check_refname_format(refname, REFNAME_ALLOW_ONELEVEL))\n+\t\treturn 0;\n+\n+\tif (flags)\n+\t\t*flags |= REF_BAD_NAME;\n+\n+\tif (!(resolve_flags & RESOLVE_REF_ALLOW_BAD_NAME) ||\n+\t !refname_is_safe(refname)) {\n+\t\terrno = EINVAL;\n+\t\treturn -1;\n+\t}\n+\t/*\n+\t * dwim_ref() uses REF_ISBROKEN to distinguish between\n+\t * missing refs and refs that were present but invalid,\n+\t * to complain about the latter to stderr.\n+\t *\n+\t * We don't know whether the ref exists, so don't set\n+\t * REF_ISBROKEN yet.\n+\t */\n+\treturn 1;\n+}\n+\n+/*\n+ * Parse a refname out of the contents of a symref into a provided\n+ * strbuf. Return a pointer to the strbuf's contents.\n+ */\n+char *parse_symref_data(const char *buf, struct strbuf *sb_refname)\n+{\n+\tbuf += 4;\n+\twhile (isspace(*buf))\n+\t\tbuf++;\n+\tstrbuf_reset(sb_refname);\n+\tstrbuf_addstr(sb_refname, buf);\n+\treturn sb_refname->buf;\n+}\n+\n+\n /* backend functions */\n int refs_init_db(int shared, struct strbuf *err)\n {\ndiff --git a/refs/files-backend.c b/refs/files-backend.c\nindex da06408..52972e6 100644\n--- a/refs/files-backend.c\n+++ b/refs/files-backend.c\n@@ -1427,25 +1427,9 @@ static const char *resolve_ref_1(const char\n*refname,\n \tif (flags)\n \t\t*flags = 0;\n \n-\tif (check_refname_format(refname, REFNAME_ALLOW_ONELEVEL)) {\n-\t\tif (flags)\n-\t\t\t*flags |= REF_BAD_NAME;\n-\n-\t\tif (!(resolve_flags & RESOLVE_REF_ALLOW_BAD_NAME) ||\n-\t\t !refname_is_safe(refname)) {\n-\t\t\terrno = EINVAL;\n-\t\t\treturn NULL;\n-\t\t}\n-\t\t/*\n-\t\t * dwim_ref() uses REF_ISBROKEN to distinguish between\n-\t\t * missing refs and refs that were present but\ninvalid,\n-\t\t * to complain about the latter to stderr.\n-\t\t *\n-\t\t * We don't know whether the ref exists, so don't set\n-\t\t * REF_ISBROKEN yet.\n-\t\t */\n-\t\tbad_name = 1;\n-\t}\n+\tbad_name = check_bad_refname(refname, flags, resolve_flags);\n+\tif (bad_name < 0)\n+\t\treturn NULL;\n \tfor (;;) {\n \t\tconst char *path;\n \t\tstruct stat st;\n@@ -1541,47 +1525,20 @@ static const char *resolve_ref_1(const char\n*refname,\n \t\t * Is it a symbolic ref?\n \t\t */\n \t\tif (!starts_with(sb_contents->buf, \"ref:\")) {\n-\t\t\t/*\n-\t\t\t * Please note that FETCH_HEAD has a second\n-\t\t\t * line containing other data.\n-\t\t\t */\n-\t\t\tif (get_sha1_hex(sb_contents->buf, sha1) ||\n-\t\t\t (sb_contents->buf[40] != '\\0' &&\n!isspace(sb_contents->buf[40]))) {\n-\t\t\t\tif (flags)\n-\t\t\t\t\t*flags |= REF_ISBROKEN;\n-\t\t\t\terrno = EINVAL;\n-\t\t\t\treturn NULL;\n-\t\t\t}\n-\t\t\tif (bad_name) {\n-\t\t\t\thashclr(sha1);\n-\t\t\t\tif (flags)\n-\t\t\t\t\t*flags |= REF_ISBROKEN;\n-\t\t\t}\n+\t\t\tif (parse_simple_ref(sb_contents->buf, sha1,\nflags, bad_name))\n+\t\t\t\trefname = NULL;\n \t\t\treturn refname;\n \t\t}\n \t\tif (flags)\n \t\t\t*flags |= REF_ISSYMREF;\n-\t\tbuf = sb_contents->buf + 4;\n-\t\twhile (isspace(*buf))\n-\t\t\tbuf++;\n-\t\tstrbuf_reset(sb_refname);\n-\t\tstrbuf_addstr(sb_refname, buf);\n-\t\trefname = sb_refname->buf;\n+\t\trefname = parse_symref_data(sb_contents->buf,\nsb_refname);\n \t\tif (resolve_flags & RESOLVE_REF_NO_RECURSE) {\n \t\t\thashclr(sha1);\n \t\t\treturn refname;\n \t\t}\n-\t\tif (check_refname_format(buf, REFNAME_ALLOW_ONELEVEL))\n{\n-\t\t\tif (flags)\n-\t\t\t\t*flags |= REF_ISBROKEN;\n-\n-\t\t\tif (!(resolve_flags &\nRESOLVE_REF_ALLOW_BAD_NAME) ||\n-\t\t\t !refname_is_safe(buf)) {\n-\t\t\t\terrno = EINVAL;\n-\t\t\t\treturn NULL;\n-\t\t\t}\n-\t\t\tbad_name = 1;\n-\t\t}\n+\t\tbad_name |= check_bad_refname(refname, flags,\nresolve_flags);\n+\t\tif (bad_name < 0)\n+\t\t\treturn NULL;\n \t}\n }\n \ndiff --git a/refs/refs-internal.h b/refs/refs-internal.h\nindex efdde82..7cdfffe 100644\n--- a/refs/refs-internal.h\n+++ b/refs/refs-internal.h\n@@ -218,6 +218,26 @@ int do_for_each_per_worktree_ref(const char\n*submodule, const char *base,\n int do_for_each_ref(const char *submodule, const char *base,\n \t\t each_ref_fn fn, int trim, int flags, void\n*cb_data);\n \n+/*\n+ * Parse a non-symref -- a buf hopefully containing 40 hex characters.\n+ * Set errno and flags appropriately. If the buf can be parsed but\n+ * bad_name is set, the ref is broken: zero out sha1.\n+ */\n+int parse_simple_ref(const char *buf, unsigned char *sha1, unsigned\nint *flags,\n+\t\t int bad_name);\n+/*\n+ * Parse a refname out of the contents of a symref into a provided\n+ * strbuf. Return a pointer to the strbuf's contents.\n+ */\n+char *parse_symref_data(const char *buf, struct strbuf *sb_refname);\n+\n+/*\n+ * Check the format of refname. Set flags and errno appropriately.\n+ * Returns 0 if the refname is good, -1 if it is bad enough that we\n+ * have to stop parsing and 1 if we just have to note that it is bad.\n+ */\n+int check_bad_refname(const char *refname, int *flags, int\nresolve_flags);\n+\n /* refs backends */\n typedef int ref_init_db_fn(int shared, struct strbuf *err);\n typedef int ref_transaction_commit_fn(struct ref_transaction\n*transaction,\n\n\n\n\nfollowed by this version of parse_ref_data:\n\nstatic const char *parse_ref_data(struct lmdb_transaction *transaction,\n\t\t\t\t const char *refname, const char\n*ref_data,\n\t\t\t\t unsigned char *sha1, int\nresolve_flags,\n\t\t\t\t int *flags, int bad_name)\n{\n\tint depth = MAXDEPTH;\n\tconst char *buf;\n\tstatic struct strbuf refname_buffer = STRBUF_INIT;\n\tstatic struct strbuf refdata_buffer = STRBUF_INIT;\n\tMDB_val key, val;\n\tint needs_free = 0;\n\n\tfor (;;) {\n\t\tif (--depth < 0)\n\t\t\treturn NULL;\n\n\t\t/*\n\t\t * Is it a symbolic ref?\n\t\t */\n\t\tif (!starts_with(ref_data, \"ref:\")) {\n\t\t\tif (parse_simple_ref(ref_data, sha1, flags,\nbad_name))\n\t\t\t\trefname = NULL;\n\t\t\t if (is_null_sha1(sha1) && flags)\n\t\t\t\t*flags |= REF_ISBROKEN;\n\t\t\treturn refname;\n\t\t}\n\t\tif (flags)\n\t\t\t*flags |= REF_ISSYMREF;\n\n\t\trefname = parse_symref_data(ref_data, &refname_buffer);\n\t\tif (resolve_flags & RESOLVE_REF_NO_RECURSE) {\n\t\t\thashclr(sha1);\n\t\t\treturn refname;\n\t\t}\n\t\tbad_name |= check_bad_refname(refname, flags,\nresolve_flags);\n\t\tif (bad_name < 0)\n\t\t\treturn NULL;\n\n\t\tkey.mv_data = (char *)refname;\n\t\tkey.mv_size = strlen(refname) + 1;\n\t\tif (mdb_get_or_die(transaction, &key, &val,\n&needs_free)) {\n\t\t\thashclr(sha1);\n\t\t\tif (bad_name) {\n\t\t\t\tif (flags)\n\t\t\t\t\t*flags |= REF_ISBROKEN;\n\t\t\t}\n\t\t\tif (resolve_flags & RESOLVE_REF_READING)\n\t\t\t\treturn NULL;\n\n\t\t\treturn refname;\n\t\t}\n\t\tstrbuf_reset(&refdata_buffer);\n\t\tstrbuf_add(&refdata_buffer, val.mv_data, val.mv_size);\n\t\tif (needs_free)\n\t\t\tfree(val.mv_data);\n\t\tref_data = refdata_buffer.buf;\n\t}\n\treturn refname;\n}\n\n----------------\n\nI'm not sure I like it, because it breaks out these weird tiny\nfunctions that take a lot of arguments. But maybe it's worth it? What\ndo you think?\n"},{"id":"278711","messageId":"xmqq37sob8my.fsf@gitster.mtv.corp.google.com","threadId":"41437","inReplyTo":"1455922186.7528.97.camel@twopensource.com","subject":"Re: [PATCH v5 25/27] refs: add LMDB refs storage backend","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2016-02-19T23:08:53Z","receivedAt":"2016-02-19T23:08:53Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"David Turner writes:\n\n> Something like the following?\n>\n> commit aad6b84fd1869f6e1cf6ed15bcece0c2f6429e9d\n> Author: David Turner \n> Date: Thu Feb 18 17:09:29 2016 -0500\n>\n> refs: break out some functions from resolve_ref_1\n> \n> A bunch of resolve_ref_1 is not backend-specific, so we can\n> break it out into separate internal functions that other\n> backends can use.\n> \n> Signed-off-by: David Turner \n> \n> diff --git a/refs.c b/refs.c\n> index c9fa34d..680c2a5 100644\n> --- a/refs.c\n> +++ b/refs.c\n> @@ -1221,6 +1221,66 @@ int for_each_rawref(each_ref_fn fn, void\n> *cb_data)\n> \t\t\t DO_FOR_EACH_INCLUDE_BROKEN, cb_data);\n> }\n> \n> +int parse_simple_ref(const char *buf, unsigned char *sha1, unsigned\n> int *flags, int bad_name)\n> +{\n> +\t/*\n> +\t * Please note that FETCH_HEAD has a second\n> +\t * line containing other data.\n> +\t */\n\nThis comment is not quite correct; the reason why the latter half of\nthis condition is more convoluted than just !buf[40] is not because\nFETCH_HEAD has a second line, but it has an additional info at the\ntail on the first line.\n\nAlso the caller is expected to have already checked for \"ref:\"\nprefix to decide not to call this.\n\n> +\tif (get_sha1_hex(buf, sha1) ||\n> +\t (buf[40] != '\\0' && !isspace(buf[40]))) {\n\n> +/*\n> + * Parse a refname out of the contents of a symref into a provided\n> + * strbuf. Return a pointer to the strbuf's contents.\n> + */\n> +char *parse_symref_data(const char *buf, struct strbuf *sb_refname)\n> +{\n> +\tbuf += 4;\n> +\twhile (isspace(*buf))\n> +\t\tbuf++;\n\nThis is expecting to be called by somebody who read \"ref:...\" into\nbuf and the caller must decide by checking the \"ref:\" prefix before\ncalling into this function.\n\n> ... I'm not sure I like it, because it breaks out these weird\n> tiny functions that take a lot of arguments. But maybe it's worth\n> it? What do you think?\n\nI wasn't Cc'ed but if you ask me, I do not think I can say I like\nit, either. Somehow it smells that the responsibility of inspecting\ndata and doing different things based on normal vs symbolic ref is\nsplit between the caller and the callees at a wrong level. The\ncaller also is responsible to rtrim the line before calling the\nlatter function if I am reading the code correctly, which smells\ninconsistent given that an equivalent ltrim() is done by the \"skip\nthe leading spaces\" loop inside.\n"},{"id":"278716","messageId":"20160220025826.GA9338@lanh","threadId":"41437","inReplyTo":"1455922186.7528.97.camel@twopensource.com","subject":"Re: [PATCH v5 25/27] refs: add LMDB refs storage backend","fromName":"Duy Nguyen","fromEmail":"pclouds@gmail.com","sentAt":"2016-02-20T02:58:27Z","receivedAt":"2016-02-20T02:58:27Z","isPatch":true,"sender":{"key":"pclouds@gmail.com","avatar":"https://avatars.githubusercontent.com/u/720?v=4"},"body":"> On Fri, 2016-02-19 at 09:54 +0700, Duy Nguyen wrote:\n>> On Fri, Feb 19, 2016 at 3:23 AM, David Turner <\n>> dturner@twopensource.com> wrote:\n>> > > > +static int read_per_worktree_ref(const char *submodule, const\n>> > > > char\n>> > > > *refname,\n>> > > > + struct MDB_val *val, int\n>> > > > *needs_free)\n>> > >\n>> > > From what I read, I suspect these _per_worktree functions will be\n>> > > identical for the next backend. Should we just hand over the job\n>> > > for\n>> > > files backend? For all entry points that may deal with per\n>> > > -worktree\n>> > > refs, e.g. lmdb_resolve_ref_unsafe, can we check ref_type() first\n>> > > thing, if it's per-worktree we call\n>> > > refs_be_files.resolve_ref_unsafe()\n>> > > instead? It could even be done at frontend level,\n>> > > e.g. refs.c:resolve_ref_unsafe().\n>> > >\n>> > > Though I may be talking rubbish here because I don't know how\n>> > > whether\n>> > > it has anything to do with transactions.\n>> >\n>> > The reason I did it this way is that some ref chains cross backend\n>> > boundaries (e.g. HEAD -> refs/heads/master). But if we have other\n>> > backends later, we could generalize.\n>>\n>> Crossing backends should go through frontend again, imo. But I don't\n>> really know if it's efficient.\n>\n> It's pretty tricky to maintain state (e.g. count of symref redirects)\n> across that barrier. So I'm not sure how to do it cleanly.\n\nI notice files backend does pretty much the same thing. \"files\"\nbackend looks more like two backends combined in one, one is files,\nthe other is packed-refs. And it looks like we could solve it by\nproviding a lower level api, read_raw_ref() or something, that\nretrieves the ref without any validation or link following. More on\nthis later.\n\n>> > > I'm not sure I get this comment. D/F conflicts are no longer a\n>> > > thing\n>> > > for lmdb backend, right?\n>> >\n>> > I'm trying to avoid the lmdb backend creating a set of refs that\n>> > the\n>> > files backend can't handle. This would make collaboration with\n>> > other\n>> > versions of git more difficult.\n>>\n>> It already is. If you create refs \"foo\" and \"FOO\" on case sensitive\n>> file system and clone it on a case-insensitive one, you face the same\n>> problem. We may have an optional configuration knob to prevent\n>> incompatibilities with files backend, but I think that should be done\n>> (and enforced if necessary) outside backends.\n>\n> Sure, the current state isn't perfect, but why make it worse?\n\nI see it from a different angle. The current state isn't perfect, but\nwe will be moving to a better future where \"files\" backend may\neventually be deprecated. Why hold back?\n\nBut this line of reasoning only works if we have a new backend capable\nof replacing \"files\" without regressions or introducing new\ndependency. Which is why I suggest a new backend [1] (or implement\nShawn's RefTree if it's proven as good with small repos)\n\nI have no problem if you want to stay strictly compatible with \"files\"\nthough.\n\n[1] http://thread.gmane.org/gmane.comp.version-control.git/285893/focus=286654\n\nOn Fri, Feb 19, 2016 at 05:49:46PM -0500, David Turner wrote:\n> > \n> > This code looks a lot like near the end of resolve_ref_1(). Maybe we\n> > could share the code in refs/backend-common.c or something and call\n> > here instead?\n> \n> Something like the following?\n> \n> commit aad6b84fd1869f6e1cf6ed15bcece0c2f6429e9d\n> Author: David Turner \n> Date: Thu Feb 18 17:09:29 2016 -0500\n> \n> refs: break out some functions from resolve_ref_1\n> \n> A bunch of resolve_ref_1 is not backend-specific, so we can\n> break it out into separate internal functions that other\n> backends can use.\n...\n> \n> I'm not sure I like it, because it breaks out these weird tiny\n> functions that take a lot of arguments. But maybe it's worth it? What\n> do you think?\n\nOK how about we keep resolve_ref_1() whole and split real backend code\nout? Something like these three patches (only built, did not test). A\nbit ugly with continue_symlink, but it's just demonstration.\n\ncommit ef46fcdc62ef89fd5260ca054cd1d98f9f2d7c2b\nAuthor: Nguyễn Thái Ngọc Duy \nDate: Sat Feb 20 09:18:45 2016 +0700\n\n refs/files: move ref I/O code out of resolve_refs_1()\n\ndiff --git a/refs/files-backend.c b/refs/files-backend.c\nindex 4bddfb3..f54f2ae 100644\n--- a/refs/files-backend.c\n+++ b/refs/files-backend.c\n@@ -1407,6 +1407,95 @@ static int resolve_missing_loose_ref(const char *refname,\n \t}\n }\n \n+static const char *continue_normal_ref = \"read_ref returns a normal ref\";\n+static const char *continue_symlink = \"read_ref returns a symlink\";\n+\n+/*\n+ * Read a ref from backend. Returning any values except\n+ * continue_normal_ref or continue_symlink ends resolve_ref_1()\n+ * execution. If the return value is not NULL, sha1 and flags must be\n+ * updated correctly. except REF_ISBROKEN which is set by\n+ * resolve_ref_1().\n+ *\n+ * If continue_* is returned, sb_contents must contain the ref data.\n+ */\n+static const char *parse_ref(const char *refname,\n+\t\t\t int resolve_flags,\n+\t\t\t unsigned char *sha1,\n+\t\t\t int *flags,\n+\t\t\t struct strbuf *sb_path,\n+\t\t\t struct strbuf *sb_contents)\n+{\n+\tconst char *path;\n+\tstruct stat st;\n+\tint fd;\n+\n+\tstrbuf_reset(sb_path);\n+\tstrbuf_git_path(sb_path, \"%s\", refname);\n+\tpath = sb_path->buf;\n+\n+\t/*\n+\t * We might have to loop back here to avoid a race\n+\t * condition: first we lstat() the file, then we try\n+\t * to read it as a link or as a file. But if somebody\n+\t * changes the type of the file (file <-> directory\n+\t * <-> symlink) between the lstat() and reading, then\n+\t * we don't want to report that as an error but rather\n+\t * try again starting with the lstat().\n+\t */\n+stat_ref:\n+\tif (lstat(path, &st) < 0) {\n+\t\tif (errno != ENOENT)\n+\t\t\treturn NULL;\n+\t\tif (resolve_missing_loose_ref(refname, resolve_flags,\n+\t\t\t\t\t sha1, flags))\n+\t\t\treturn NULL;\n+\t\treturn refname;\n+\t}\n+\n+\t/* Follow \"normalized\" - ie \"refs/..\" symlinks by hand */\n+\tif (S_ISLNK(st.st_mode)) {\n+\t\tstrbuf_reset(sb_contents);\n+\t\tif (strbuf_readlink(sb_contents, path, 0) < 0) {\n+\t\t\tif (errno == ENOENT || errno == EINVAL)\n+\t\t\t\t/* inconsistent with lstat; retry */\n+\t\t\t\tgoto stat_ref;\n+\t\t\telse\n+\t\t\t\treturn NULL;\n+\t\t}\n+\t\treturn continue_symlink;\n+\t}\n+\n+\t/* Is it a directory? */\n+\tif (S_ISDIR(st.st_mode)) {\n+\t\terrno = EISDIR;\n+\t\treturn NULL;\n+\t}\n+\n+\t/*\n+\t * Anything else, just open it and try to use it as\n+\t * a ref\n+\t */\n+\tfd = open(path, O_RDONLY);\n+\tif (fd < 0) {\n+\t\tif (errno == ENOENT)\n+\t\t\t/* inconsistent with lstat; retry */\n+\t\t\tgoto stat_ref;\n+\t\telse\n+\t\t\treturn NULL;\n+\t}\n+\tstrbuf_reset(sb_contents);\n+\tif (strbuf_read(sb_contents, fd, 256) < 0) {\n+\t\tint save_errno = errno;\n+\t\tclose(fd);\n+\t\terrno = save_errno;\n+\t\treturn NULL;\n+\t}\n+\tclose(fd);\n+\n+\treturn continue_normal_ref;\n+}\n+\n /* This function needs to return a meaningful errno on failure */\n static const char *resolve_ref_1(const char *refname,\n \t\t\t\t int resolve_flags,\n@@ -1442,54 +1531,18 @@ static const char *resolve_ref_1(const char *refname,\n \t\tbad_name = 1;\n \t}\n \tfor (;;) {\n-\t\tconst char *path;\n-\t\tstruct stat st;\n+\t\tconst char *ret;\n \t\tchar *buf;\n-\t\tint fd;\n \n \t\tif (--depth < 0) {\n \t\t\terrno = ELOOP;\n \t\t\treturn NULL;\n \t\t}\n \n-\t\tstrbuf_reset(sb_path);\n-\t\tstrbuf_git_path(sb_path, \"%s\", refname);\n-\t\tpath = sb_path->buf;\n+\t\tret = parse_ref(refname, resolve_flags, sha1,\n+\t\t\t\tflags, sb_path, sb_contents);\n \n-\t\t/*\n-\t\t * We might have to loop back here to avoid a race\n-\t\t * condition: first we lstat() the file, then we try\n-\t\t * to read it as a link or as a file. But if somebody\n-\t\t * changes the type of the file (file <-> directory\n-\t\t * <-> symlink) between the lstat() and reading, then\n-\t\t * we don't want to report that as an error but rather\n-\t\t * try again starting with the lstat().\n-\t\t */\n-\tstat_ref:\n-\t\tif (lstat(path, &st) < 0) {\n-\t\t\tif (errno != ENOENT)\n-\t\t\t\treturn NULL;\n-\t\t\tif (resolve_missing_loose_ref(refname, resolve_flags,\n-\t\t\t\t\t\t sha1, flags))\n-\t\t\t\treturn NULL;\n-\t\t\tif (bad_name) {\n-\t\t\t\thashclr(sha1);\n-\t\t\t\tif (flags)\n-\t\t\t\t\t*flags |= REF_ISBROKEN;\n-\t\t\t}\n-\t\t\treturn refname;\n-\t\t}\n-\n-\t\t/* Follow \"normalized\" - ie \"refs/..\" symlinks by hand */\n-\t\tif (S_ISLNK(st.st_mode)) {\n-\t\t\tstrbuf_reset(sb_contents);\n-\t\t\tif (strbuf_readlink(sb_contents, path, 0) < 0) {\n-\t\t\t\tif (errno == ENOENT || errno == EINVAL)\n-\t\t\t\t\t/* inconsistent with lstat; retry */\n-\t\t\t\t\tgoto stat_ref;\n-\t\t\t\telse\n-\t\t\t\t\treturn NULL;\n-\t\t\t}\n+\t\tif (ret == continue_symlink) {\n \t\t\tif (starts_with(sb_contents->buf, \"refs/\") &&\n \t\t\t !check_refname_format(sb_contents->buf, 0)) {\n \t\t\t\tstrbuf_swap(sb_refname, sb_contents);\n@@ -1502,35 +1555,10 @@ static const char *resolve_ref_1(const char *refname,\n \t\t\t\t}\n \t\t\t\tcontinue;\n \t\t\t}\n-\t\t}\n-\n-\t\t/* Is it a directory? */\n-\t\tif (S_ISDIR(st.st_mode)) {\n-\t\t\terrno = EISDIR;\n-\t\t\treturn NULL;\n-\t\t}\n-\n-\t\t/*\n-\t\t * Anything else, just open it and try to use it as\n-\t\t * a ref\n-\t\t */\n-\t\tfd = open(path, O_RDONLY);\n-\t\tif (fd < 0) {\n-\t\t\tif (errno == ENOENT)\n-\t\t\t\t/* inconsistent with lstat; retry */\n-\t\t\t\tgoto stat_ref;\n-\t\t\telse\n-\t\t\t\treturn NULL;\n-\t\t}\n-\t\tstrbuf_reset(sb_contents);\n-\t\tif (strbuf_read(sb_contents, fd, 256) < 0) {\n-\t\t\tint save_errno = errno;\n-\t\t\tclose(fd);\n-\t\t\terrno = save_errno;\n-\t\t\treturn NULL;\n-\t\t}\n-\t\tclose(fd);\n-\t\tstrbuf_rtrim(sb_contents);\n+\t\t} else if (ret == refname)\n+\t\t\tbreak;\n+\t\telse if (ret != continue_normal_ref)\n+\t\t\treturn ret;\n \n \t\t/*\n \t\t * Is it a symbolic ref?\n@@ -1547,12 +1575,7 @@ static const char *resolve_ref_1(const char *refname,\n \t\t\t\terrno = EINVAL;\n \t\t\t\treturn NULL;\n \t\t\t}\n-\t\t\tif (bad_name) {\n-\t\t\t\thashclr(sha1);\n-\t\t\t\tif (flags)\n-\t\t\t\t\t*flags |= REF_ISBROKEN;\n-\t\t\t}\n-\t\t\treturn refname;\n+\t\t\tbreak;\n \t\t}\n \t\tif (flags)\n \t\t\t*flags |= REF_ISSYMREF;\n@@ -1578,6 +1601,13 @@ static const char *resolve_ref_1(const char *refname,\n \t\t\tbad_name = 1;\n \t\t}\n \t}\n+\n+\tif (bad_name) {\n+\t\thashclr(sha1);\n+\t\tif (flags)\n+\t\t\t*flags |= REF_ISBROKEN;\n+\t}\n+\treturn refname;\n }\n \n static const char *files_resolve_ref_unsafe(const char *refname,\n\nAfter this resolve_ref_1() is backend independent. So we can make it\ntake parse_ref() as a function pointer instead.\n\ncommit 50d96b6f79b30b5ba17fa00ec3ee42845546a123\nAuthor: Nguyễn Thái Ngọc Duy \nDate: Sat Feb 20 09:22:03 2016 +0700\n\n refs/files-backend.c: let resolve_refs_1() accept parse_ref as callback\n\ndiff --git a/refs/files-backend.c b/refs/files-backend.c\nindex f54f2ae..9b4de9f 100644\n--- a/refs/files-backend.c\n+++ b/refs/files-backend.c\n@@ -1424,7 +1424,8 @@ static const char *parse_ref(const char *refname,\n \t\t\t unsigned char *sha1,\n \t\t\t int *flags,\n \t\t\t struct strbuf *sb_path,\n-\t\t\t struct strbuf *sb_contents)\n+\t\t\t struct strbuf *sb_contents,\n+\t\t\t void *cb_data)\n {\n \tconst char *path;\n \tstruct stat st;\n@@ -1497,13 +1498,21 @@ stat_ref:\n }\n \n /* This function needs to return a meaningful errno on failure */\n-static const char *resolve_ref_1(const char *refname,\n-\t\t\t\t int resolve_flags,\n-\t\t\t\t unsigned char *sha1,\n-\t\t\t\t int *flags,\n-\t\t\t\t struct strbuf *sb_refname,\n-\t\t\t\t struct strbuf *sb_path,\n-\t\t\t\t struct strbuf *sb_contents)\n+const char *resolve_ref_1(const char *refname,\n+\t\t\t int resolve_flags,\n+\t\t\t unsigned char *sha1,\n+\t\t\t int *flags,\n+\t\t\t struct strbuf *sb_refname,\n+\t\t\t struct strbuf *sb_path,\n+\t\t\t struct strbuf *sb_contents,\n+\t\t\t const char *(*parse_ref)(const char *refname,\n+\t\t\t\t\t\t int resolve_flags,\n+\t\t\t\t\t\t unsigned char *sha1,\n+\t\t\t\t\t\t int *flags,\n+\t\t\t\t\t\t struct strbuf *sb_path,\n+\t\t\t\t\t\t struct strbuf *sb_contents,\n+\t\t\t\t\t\t void *cb_data),\n+\t\t\t void *cb_data)\n {\n \tint depth = MAXDEPTH;\n \tint bad_name = 0;\n@@ -1540,7 +1549,8 @@ static const char *resolve_ref_1(const char *refname,\n \t\t}\n \n \t\tret = parse_ref(refname, resolve_flags, sha1,\n-\t\t\t\tflags, sb_path, sb_contents);\n+\t\t\t\tflags, sb_path, sb_contents,\n+\t\t\t\tcb_data);\n \n \t\tif (ret == continue_symlink) {\n \t\t\tif (starts_with(sb_contents->buf, \"refs/\") &&\n@@ -1621,7 +1631,8 @@ static const char *files_resolve_ref_unsafe(const char *refname,\n \tconst char *ret;\n \n \tret = resolve_ref_1(refname, resolve_flags, sha1, flags,\n-\t\t\t &sb_refname, &sb_path, &sb_contents);\n+\t\t\t &sb_refname, &sb_path, &sb_contents,\n+\t\t\t parse_ref, NULL);\n \tstrbuf_release(&sb_path);\n \tstrbuf_release(&sb_contents);\n \treturn ret;\n\nAnd finally we can make lmdb use resolve_ref_1(). lmdb-specific code\nis in the new retrieve_ref() function.\n\ncommit 62a5df3117c0f825bc26fd09dda29e713f94d743 (HEAD -> lmdb)\nAuthor: Nguyễn Thái Ngọc Duy \nDate: Sat Feb 20 09:33:01 2016 +0700\n\n refs/lmdb-backend: use resolve_ref_1()\n\ndiff --git a/refs/files-backend.c b/refs/files-backend.c\nindex 9b4de9f..44b7136 100644\n--- a/refs/files-backend.c\n+++ b/refs/files-backend.c\n@@ -1407,7 +1407,7 @@ static int resolve_missing_loose_ref(const char *refname,\n \t}\n }\n \n-static const char *continue_normal_ref = \"read_ref returns a normal ref\";\n+const char *continue_normal_ref = \"read_ref returns a normal ref\";\n static const char *continue_symlink = \"read_ref returns a symlink\";\n \n /*\ndiff --git a/refs/lmdb-backend.c b/refs/lmdb-backend.c\nindex 6c0d7fb..7f169bd 100644\n--- a/refs/lmdb-backend.c\n+++ b/refs/lmdb-backend.c\n@@ -544,74 +544,64 @@ done:\n \treturn ret;\n }\n \n+extern const char *continue_normal_ref;\n+\n+static const char *retrieve_ref(const char *refname,\n+\t\t\t\tint resolve_flags,\n+\t\t\t\tunsigned char *sha1,\n+\t\t\t\tint *flags,\n+\t\t\t\tstruct strbuf *sb_path,\n+\t\t\t\tstruct strbuf *sb_contents,\n+\t\t\t\tvoid *cb_data)\n+{\n+\tstruct lmdb_transaction *transaction = cb_data;\n+\tMDB_val key, val;\n+\tint needs_free;\t\t/* dont care, leak */\n+\n+\tkey.mv_data = (void *)refname;\n+\tkey.mv_size = strlen(refname) + 1;\n+\n+\tval.mv_data = NULL;\n+\tval.mv_size = 0;\n+\n+\tif (mdb_get_or_die(transaction, &key, &val, &needs_free)) {\n+\t\tstruct strbuf err = STRBUF_INIT;\n+\n+\t\tif (resolve_flags & RESOLVE_REF_READING)\n+\t\t\treturn NULL;\n+\n+\t\tif (verify_refname_available_txn(transaction,\n+\t\t\t\t\t\t refname, NULL, NULL, &err)) {\n+\t\t\terror(\"%s\", err.buf);\n+\t\t\tstrbuf_release(&err);\n+\t\t\treturn NULL;\n+\t\t}\n+\n+\t\thashclr(sha1);\n+\t\treturn refname;\n+\t}\n+\n+\tstrbuf_reset(sb_contents);\n+\tstrbuf_add(sb_contents, val.mv_data, val.mv_size);\n+\treturn continue_normal_ref;\n+}\n+\n static const char *resolve_ref_unsafe_txn(struct lmdb_transaction *transaction,\n \t\t\t\t\t const char *refname,\n \t\t\t\t\t int resolve_flags,\n \t\t\t\t\t unsigned char *sha1,\n \t\t\t\t\t int *flags)\n {\n-\tint bad_name = 0;\n-\tchar *ref_data;\n-\tstruct MDB_val key, val;\n-\tstruct strbuf err = STRBUF_INIT;\n-\tint needs_free = 0;\n+\tstatic struct strbuf sb_refname = STRBUF_INIT;\n+\tstruct strbuf sb_contents = STRBUF_INIT;\n+\tstruct strbuf sb_path = STRBUF_INIT;\n \tconst char *ret;\n \n-\tval.mv_size = 0;\n-\tval.mv_data = NULL;\n-\n-\tif (flags)\n-\t\t*flags = 0;\n-\n-\tif (check_refname_format(refname, REFNAME_ALLOW_ONELEVEL)) {\n-\t\tif (flags)\n-\t\t\t*flags |= REF_BAD_NAME;\n-\n-\t\tif (!(resolve_flags & RESOLVE_REF_ALLOW_BAD_NAME) ||\n-\t\t !refname_is_safe(refname)) {\n-\t\t\terrno = EINVAL;\n-\t\t\treturn NULL;\n-\t\t}\n-\t\t/*\n-\t\t * dwim_ref() uses REF_ISBROKEN to distinguish between\n-\t\t * missing refs and refs that were present but invalid,\n-\t\t * to complain about the latter to stderr.\n-\t\t *\n-\t\t * We don't know whether the ref exists, so don't set\n-\t\t * REF_ISBROKEN yet.\n-\t\t */\n-\t\tbad_name = 1;\n-\t}\n-\n-\tkey.mv_data = (void *)refname;\n-\tkey.mv_size = strlen(refname) + 1;\n-\tif (mdb_get_or_die(transaction, &key, &val, &needs_free)) {\n-\t\tif (bad_name) {\n-\t\t\thashclr(sha1);\n-\t\t\tif (flags)\n-\t\t\t\t*flags |= REF_ISBROKEN;\n-\t\t}\n-\n-\t\tif (resolve_flags & RESOLVE_REF_READING)\n-\t\t\treturn NULL;\n-\n-\t\tif (verify_refname_available_txn(transaction, refname, NULL, NULL, &err)) {\n-\t\t\terror(\"%s\", err.buf);\n-\t\t\tstrbuf_release(&err);\n-\t\t\treturn NULL;\n-\t\t}\n-\n-\t\thashclr(sha1);\n-\t\treturn refname;\n-\t}\n-\n-\tref_data = val.mv_data;\n-\tassert(ref_data[val.mv_size - 1] == 0);\n-\n-\tret = parse_ref_data(transaction, refname, ref_data, sha1,\n-\t\t\t resolve_flags, flags, bad_name);\n-\tif (needs_free)\n-\t\tfree(ref_data);\n+\tret = resolve_ref_1(refname, resolve_flags, sha1, flags,\n+\t\t\t &sb_refname, &sb_path, &sb_contents,\n+\t\t\t retrieve_ref, transaction);\n+\tstrbuf_release(&sb_path);\n+\tstrbuf_release(&sb_contents);\n \treturn ret;\n } \n\nlmdb-backend.c:retrieve_ref(), files-backend.c:parse_ref() can be made\npart of ref api that, given a ref name, returns the ref raw data and\ntype. The frontend can decide what backend callback to use based on\nrefname, so retrieve_ref() in the end does not have to call\nread_per_worktree_ref() internally anymore.\n\nHmm?\n--\nDuy\n"},{"id":"278717","messageId":"CACsJy8B0Lt8Eq4GqSCKyA08g0Vvu-1B6dDjpkNmRre3M8DebDg@mail.gmail.com","threadId":"41437","inReplyTo":"1455772670-21142-13-git-send-email-dturner@twopensource.com","subject":"Re: [PATCH v5 12/27] refs: forbid cross-backend ref renames","fromName":"Duy Nguyen","fromEmail":"pclouds@gmail.com","sentAt":"2016-02-20T04:30:45Z","receivedAt":"2016-02-20T04:30:45Z","isPatch":true,"sender":{"key":"pclouds@gmail.com","avatar":"https://avatars.githubusercontent.com/u/720?v=4"},"body":"On Thu, Feb 18, 2016 at 12:17 PM, David Turner wrote:\n> This would be pretty weird, but since it will break, we should prevent\n> it.\n>\n> Signed-off-by: David Turner \n> ---\n> refs.c | 6 ++++++\n> 1 file changed, 6 insertions(+)\n>\n> diff --git a/refs.c b/refs.c\n> index f5754f2..8eb04da 100644\n> --- a/refs.c\n> +++ b/refs.c\n> @@ -1306,5 +1306,11 @@ int delete_refs(struct string_list *refnames)\n>\n> int rename_ref(const char *oldref, const char *newref, const char *logmsg)\n> {\n> + if ((ref_type(oldref) == REF_TYPE_NORMAL) !=\n> + (ref_type(newref) == REF_TYPE_NORMAL)) {\n> + error(_(\"Both ref arguments to rename_ref must be normal \"\n> + \"(or both must be per-worktree/pseudorefs)\"));\n> + return -1;\n\nYou can do return error(...);\n\n> + }\n> return the_refs_backend->rename_ref(oldref, newref, logmsg);\n\nLMDB backend can't deal with per-worktree rename. So either forbid\nper-worktree rename here too, or fall back to files backend.\n-- \nDuy\n"},{"id":"278726","messageId":"CACsJy8BQZCBpfmvXk+o5PqM7=zad7cxgA9B2995Rb0D0YBxEVw@mail.gmail.com","threadId":"41437","inReplyTo":"1455772670-21142-26-git-send-email-dturner@twopensource.com","subject":"Re: [PATCH v5 25/27] refs: add LMDB refs storage backend","fromName":"Duy Nguyen","fromEmail":"pclouds@gmail.com","sentAt":"2016-02-20T08:59:09Z","receivedAt":"2016-02-20T08:59:09Z","isPatch":true,"sender":{"key":"pclouds@gmail.com","avatar":"https://avatars.githubusercontent.com/u/720?v=4"},"body":"On Thu, Feb 18, 2016 at 12:17 PM, David Turner wrote:\n> LMDB has a few features that make it suitable for usage in git:\n> ...\n\nI'm reading lmdb documents and hitting the caveat section [1]. Random thoughts\n\n* \"There is normally no pure read-only mode, since readers need write\naccess to locks and lock file.\".\n\nThis will be a problem for server side that serves git:// protocol\nonly. Some of those servers disable write access to the entire\nrepository and git still works fine (but won't when lmdb is used).\nShould we do something in this case? Just tell server admins to relax\nfile access, or use MDB_NOLOCK (and when? based on config var?)\n\n* \" Use an MDB_env* in the process which opened it, without\nfork()ing.\". We do use fork on non-Windows in run-command.c, but it\nshould be followed by exec() with no ref access in between, so we're\nalmost good.\n\nI notice atexit() is used in this for/exec code, which reminds me we\nalso use atexit() in many other places. I hope none of them access\nrefs, or we could be in trouble.\n\n* \"Do not have open an LMDB database twice in the same process at the\nsame time. Not even from a plain open() call - close()ing it breaks\nflock() advisory locking\"\n\nI wonder what happens if we do open twice, will it error out or\nsilently ignore and move on? Because if it's the latter case, we need\nsome protection from the caller and I'm not sure if\nlmdb-backend.c:init_env() has it, especially when it open submodule's\nlmdb.\n\n* \"Avoid long-lived transactions....\"\n\nOK we don't have a problem with this. But it makes me realize lmdb\ntransactions do not map with ref transactions. We don't open lmdb\ntransaction at ref_transaction_begin(), for example. Is it simply more\nconvenient to do transactions the current way, or is it impossible or\nincorrect to attach lmdb transactions to ref_transaction_*()?\n\n* \"Avoid aborting a process with an active transaction. The\ntransaction becomes \"long-lived\" as above until a check for stale\nreaders is performed or the lockfile is reset, since the process may\nnot remove it from the lockfile.\"\n\nDoes it mean we should at atexit() and signal handler to release\ncurrently active transaction?\n\n* \"Do not use LMDB databases on remote filesystems, even between\nprocesses on the same host. This breaks flock() on some OSes, possibly\nmemory map sync, and certainly sync between programs on different\nhosts.\"\n\nOK can't do anything about it anyway, but maybe it should be mentioned\nsomewhere in Git documentation.\n\n* \"Opening a database can fail if another process is opening or\nclosing it at exactly the same time.\"\n\nWe have some retry logic in resolve_ref_1(). Do we need the same for\nlmdb? Not very important though.\n\n[1] http://symas.com/mdb/doc/\n-- \nDuy\n"},{"id":"278732","messageId":"CACsJy8Ci_U+=Nw+9mzebQ1w3xtvb_=TZKyKC4nkRMPjhwDQ-mg@mail.gmail.com","threadId":"41437","inReplyTo":"1455827001.7528.87.camel@twopensource.com","subject":"Re: [PATCH v5 25/27] refs: add LMDB refs storage backend","fromName":"Duy Nguyen","fromEmail":"pclouds@gmail.com","sentAt":"2016-02-20T13:14:35Z","receivedAt":"2016-02-20T13:14:35Z","isPatch":true,"sender":{"key":"pclouds@gmail.com","avatar":"https://avatars.githubusercontent.com/u/720?v=4"},"body":"On Fri, Feb 19, 2016 at 3:23 AM, David Turner wrote:\n> On Thu, 2016-02-18 at 15:50 +0700, Duy Nguyen wrote:\n>\n> [snip]\n>\n> Thanks; applied the above\n>\n>> This permission makes me wonder if we need adjust_shared_perm() here\n>> and some other places.\n>\n> So just add this after every mkdir?\n>\n> if (shared_repository)\n> adjust_shared_perm(db_path);\n>\n\nAnother option is avoid mkdir entirely. Getting started page [1] says\nif you do mdb_open_env(.., \"refs.lmdb\", MDB_NOSUBDIR,..) then it will\ncreate two files refs.lmdb and refs.lmdb.lock. No need for the\ndirectory \"refs.lmdb\" just to contain two files.\n\n[1] http://symas.com/mdb/doc/starting.html\n-- \nDuy\n"},{"id":"278740","messageId":"xmqqr3g79ify.fsf@gitster.mtv.corp.google.com","threadId":"41437","inReplyTo":"1455827001.7528.87.camel@twopensource.com","subject":"Re: [PATCH v5 25/27] refs: add LMDB refs storage backend","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2016-02-20T21:32:17Z","receivedAt":"2016-02-20T21:32:17Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"David Turner writes:\n\n> So just add this after every mkdir?\n>\n> \tif (shared_repository)\n> \t\tadjust_shared_perm(db_path);\n\nThe function itself checks shared_repository configuration, so the\ncaller does not have to bother. You should rather treat it as a\ndeclaration and a documentation that says \"this path in $GIT_DIR\nshould be writable\".\n\nYou should check its exit value for errors, though.\n"},{"id":"278745","messageId":"20160220235514.GA2311@dcvr.yhbt.net","threadId":"41437","inReplyTo":"1455772670-21142-24-git-send-email-dturner@twopensource.com","subject":"Re: [PATCH v5 23/27] svn: learn ref-storage argument","fromName":"Eric Wong","fromEmail":"normalperson@yhbt.net","sentAt":"2016-02-20T23:55:14Z","receivedAt":"2016-02-20T23:55:14Z","isPatch":true,"sender":{"key":"e@80x24.org","avatar":null},"body":"David Turner wrote:\n> +++ b/git-svn.perl\n\n> +\t\tif (defined $_ref_storage) {\n> +\t\t push @init_db, \"--ref-storage=\" . $_ref_storage;\n> +\t\t}\n\nMinor nit: git-svn uses tabs for indentation.\nOtherwise, if we go this route, consider it:\n\nSigned-off-by: Eric Wong \n\nThanks.\n\nI would favor Shawn's RefTree or similar to reuse existing\ncode + commands and avoid the external dependency, though.\n"},{"id":"279048","messageId":"1456250903.7528.105.camel@twopensource.com","threadId":"41437","inReplyTo":"20160220235514.GA2311@dcvr.yhbt.net","subject":"Re: [PATCH v5 23/27] svn: learn ref-storage argument","fromName":"David Turner","fromEmail":"dturner@twopensource.com","sentAt":"2016-02-23T18:08:23Z","receivedAt":"2016-02-23T18:08:23Z","isPatch":true,"sender":{"key":"novalis@novalis.org","avatar":"https://avatars.githubusercontent.com/u/77003?v=4"},"body":"On Sat, 2016-02-20 at 23:55 +0000, Eric Wong wrote:\n> David Turner wrote:\n> > +++ b/git-svn.perl\n> \n> > +\t\tif (defined $_ref_storage) {\n> > +\t\t push @init_db, \"--ref-storage=\" .\n> > $_ref_storage;\n> > +\t\t}\n> \n> Minor nit: git-svn uses tabs for indentation.\n> Otherwise, if we go this route, consider it:\n\nGot it, thanks.\n\n> Signed-off-by: Eric Wong \n> \n> Thanks.\n> \n> I would favor Shawn's RefTree or similar to reuse existing\n> code + commands and avoid the external dependency, though.\n\nIt's an interesting idea. I'm not sure how good the performance would\nbe in the case where there are a large number of refs in a single\ndirectory, but it would be worth a try.\n"},{"id":"279171","messageId":"1456346242.18017.16.camel@twopensource.com","threadId":"41437","inReplyTo":"CACsJy8BQZCBpfmvXk+o5PqM7=zad7cxgA9B2995Rb0D0YBxEVw@mail.gmail.com","subject":"Re: [PATCH v5 25/27] refs: add LMDB refs storage backend","fromName":"David Turner","fromEmail":"dturner@twopensource.com","sentAt":"2016-02-24T20:37:22Z","receivedAt":"2016-02-24T20:37:22Z","isPatch":true,"sender":{"key":"novalis@novalis.org","avatar":"https://avatars.githubusercontent.com/u/77003?v=4"},"body":"On Sat, 2016-02-20 at 15:59 +0700, Duy Nguyen wrote:\n> On Thu, Feb 18, 2016 at 12:17 PM, David Turner <\n> dturner@twopensource.com> wrote:\n> > LMDB has a few features that make it suitable for usage in git:\n> > ...\n> \n> I'm reading lmdb documents and hitting the caveat section [1].\n> Random thoughts\n> \n> * \"There is normally no pure read-only mode, since readers need write\n> access to locks and lock file.\".\n> \n> This will be a problem for server side that serves git:// protocol\n> only. Some of those servers disable write access to the entire\n> repository and git still works fine (but won't when lmdb is used).\n> Should we do something in this case? Just tell server admins to relax\n> file access, or use MDB_NOLOCK (and when? based on config var?)\n\nMDB_NOLOCK is a good idea. I'm going to add this to the \"Weaknesses\"\nsection of the docs and plan to fix it later, unless you feel strongly\notherwise.\n\n> * \" Use an MDB_env* in the process which opened it, without\n> fork()ing.\". We do use fork on non-Windows in run-command.c, but it\n> should be followed by exec() with no ref access in between, so we're\n> almost good.\n> \n> I notice atexit() is used in this for/exec code, which reminds me we\n> also use atexit() in many other places. I hope none of them access\n> refs, or we could be in trouble.\n\nI don't think they should do that anyway -- it's too much complexity\nfor an atexit handler.\n\n> * \"Do not have open an LMDB database twice in the same process at the\n> same time. Not even from a plain open() call - close()ing it breaks\n> flock() advisory locking\"\n> \n> I wonder what happens if we do open twice, will it error out or\n> silently ignore and move on? Because if it's the latter case, we need\n> some protection from the caller and I'm not sure if\n> lmdb-backend.c:init_env() has it, especially when it open submodule's\n> lmdb.\n\nI think LMDB could check this, but it doesn't seem to. I've refactored\nsome of the submodule transaction stuff so that now we have more\nprotection there.\n\n> * \"Avoid long-lived transactions....\"\n> \n> OK we don't have a problem with this. But it makes me realize lmdb\n> transactions do not map with ref transactions. We don't open lmdb\n> transaction at ref_transaction_begin(), for example. Is it simply\n> more\n> convenient to do transactions the current way, or is it impossible or\n> incorrect to attach lmdb transactions to ref_transaction_*()?\n\nThat was what I did originally, but reviewers here noted that it had\nsome problems:\n1. What if, while a transaction is open, git opens a subprocess that\nwants to make its own transaction? There can only be one writer\ntransaction open at a time.\n2. As you note, long-lived transactions.\n\nAlso, the files backend also doesn't do any locking until the last\nmoment, and it's reasonable to try to be compatible with that.\n\n> * \"Avoid aborting a process with an active transaction. The\n> transaction becomes \"long-lived\" as above until a check for stale\n> readers is performed or the lockfile is reset, since the process may\n> not remove it from the lockfile.\"\n> \n> Does it mean we should at atexit() and signal handler to release\n> currently active transaction?\n\nProbably a good idea.\n\n> * \"Do not use LMDB databases on remote filesystems, even between\n> processes on the same host. This breaks flock() on some OSes,\n> possibly\n> memory map sync, and certainly sync between programs on different\n> hosts.\"\n> \n> OK can't do anything about it anyway, but maybe it should be\n> mentioned\n> somewhere in Git documentation.\n\nSure.\n\n> * \"Opening a database can fail if another process is opening or\n> closing it at exactly the same time.\"\n> \n> We have some retry logic in resolve_ref_1(). Do we need the same for\n> lmdb? Not very important though.\n> \n> [1] http://symas.com/mdb/doc/\n\nwat.\n\nOK, I'll add a retry loop on that. I guess we can just keep retrying\non EACCES or EAGAIN.\n"},{"id":"279172","messageId":"1456346510.18017.21.camel@twopensource.com","threadId":"41437","inReplyTo":"CACsJy8Ci_U+=Nw+9mzebQ1w3xtvb_=TZKyKC4nkRMPjhwDQ-mg@mail.gmail.com","subject":"Re: [PATCH v5 25/27] refs: add LMDB refs storage backend","fromName":"David Turner","fromEmail":"dturner@twopensource.com","sentAt":"2016-02-24T20:41:50Z","receivedAt":"2016-02-24T20:41:50Z","isPatch":true,"sender":{"key":"novalis@novalis.org","avatar":"https://avatars.githubusercontent.com/u/77003?v=4"},"body":"On Sat, 2016-02-20 at 20:14 +0700, Duy Nguyen wrote:\n> On Fri, Feb 19, 2016 at 3:23 AM, David Turner <\n> dturner@twopensource.com> wrote:\n> > On Thu, 2016-02-18 at 15:50 +0700, Duy Nguyen wrote:\n> > \n> > [snip]\n> > \n> > Thanks; applied the above\n> > \n> > > This permission makes me wonder if we need adjust_shared_perm()\n> > > here\n> > > and some other places.\n> > \n> > So just add this after every mkdir?\n> > \n> > if (shared_repository)\n> > adjust_shared_perm(db_path);\n> > \n> \n> Another option is avoid mkdir entirely. Getting started page [1] says\n> if you do mdb_open_env(.., \"refs.lmdb\", MDB_NOSUBDIR,..) then it will\n> create two files refs.lmdb and refs.lmdb.lock. No need for the\n> directory \"refs.lmdb\" just to contain two files.\n> \n> [1] http://symas.com/mdb/doc/starting.html\n\nGood idea.\n"},{"id":"279173","messageId":"1456346620.18017.23.camel@twopensource.com","threadId":"41437","inReplyTo":"20160220025826.GA9338@lanh","subject":"Re: [PATCH v5 25/27] refs: add LMDB refs storage backend","fromName":"David Turner","fromEmail":"dturner@twopensource.com","sentAt":"2016-02-24T20:43:40Z","receivedAt":"2016-02-24T20:43:40Z","isPatch":true,"sender":{"key":"novalis@novalis.org","avatar":"https://avatars.githubusercontent.com/u/77003?v=4"},"body":"On Sat, 2016-02-20 at 09:58 +0700, Duy Nguyen wrote:\n> > On Fri, 2016-02-19 at 09:54 +0700, Duy Nguyen wrote:\n> > > On Fri, Feb 19, 2016 at 3:23 AM, David Turner <\n> > > dturner@twopensource.com> wrote:\n> > > > > > +static int read_per_worktree_ref(const char *submodule,\n> > > > > > const\n> > > > > > char\n> > > > > > *refname,\n> > > > > > + struct MDB_val *val, int\n> > > > > > *needs_free)\n> > > > > \n> > > > > From what I read, I suspect these _per_worktree functions\n> > > > > will be\n> > > > > identical for the next backend. Should we just hand over the\n> > > > > job\n> > > > > for\n> > > > > files backend? For all entry points that may deal with per\n> > > > > -worktree\n> > > > > refs, e.g. lmdb_resolve_ref_unsafe, can we check ref_type()\n> > > > > first\n> > > > > thing, if it's per-worktree we call\n> > > > > refs_be_files.resolve_ref_unsafe()\n> > > > > instead? It could even be done at frontend level,\n> > > > > e.g. refs.c:resolve_ref_unsafe().\n> > > > > \n> > > > > Though I may be talking rubbish here because I don't know how\n> > > > > whether\n> > > > > it has anything to do with transactions.\n> > > > \n> > > > The reason I did it this way is that some ref chains cross\n> > > > backend\n> > > > boundaries (e.g. HEAD -> refs/heads/master). But if we have\n> > > > other\n> > > > backends later, we could generalize.\n> > > \n> > > Crossing backends should go through frontend again, imo. But I\n> > > don't\n> > > really know if it's efficient.\n> > \n> > It's pretty tricky to maintain state (e.g. count of symref\n> > redirects)\n> > across that barrier. So I'm not sure how to do it cleanly.\n> \n> I notice files backend does pretty much the same thing. \"files\"\n> backend looks more like two backends combined in one, one is files,\n> the other is packed-refs. And it looks like we could solve it by\n> providing a lower level api, read_raw_ref() or something, that\n> retrieves the ref without any validation or link following. More on\n> this later.\n\nThat basica pproach appears to mostly work. I'll send another series\nwith read_raw_ref as soon as I'm done applying all comments on this\nseries.\n\n> > > > > I'm not sure I get this comment. D/F conflicts are no longer\n> > > > > a\n> > > > > thing\n> > > > > for lmdb backend, right?\n> > > > \n> > > > I'm trying to avoid the lmdb backend creating a set of refs\n> > > > that\n> > > > the\n> > > > files backend can't handle. This would make collaboration with\n> > > > other\n> > > > versions of git more difficult.\n> > > \n> > > It already is. If you create refs \"foo\" and \"FOO\" on case\n> > > sensitive\n> > > file system and clone it on a case-insensitive one, you face the\n> > > same\n> > > problem. We may have an optional configuration knob to prevent\n> > > incompatibilities with files backend, but I think that should be\n> > > done\n> > > (and enforced if necessary) outside backends.\n> > \n> > Sure, the current state isn't perfect, but why make it worse?\n> \n> I see it from a different angle. The current state isn't perfect, but\n> we will be moving to a better future where \"files\" backend may\n> eventually be deprecated. Why hold back?\n> \n> But this line of reasoning only works if we have a new backend\n> capable\n> of replacing \"files\" without regressions or introducing new\n> dependency. Which is why I suggest a new backend [1] (or implement\n> Shawn's RefTree if it's proven as good with small repos)\n> \n> I have no problem if you want to stay strictly compatible with\n> \"files\"\n> though.\n> \n> [1] http://thread.gmane.org/gmane.comp.version-control.git/285893/foc\n> us=286654\n\nWon't RefTree have the same d/f conflict issue?\n\n> OK how about we keep resolve_ref_1() whole and split real backend\n> code\n> out? Something like these three patches (only built, did not test). A\n> bit ugly with continue_symlink, but it's just demonstration.\n\nI did this a somewhat different way -- will see what you think when I\nsend it.\n"},{"id":"279174","messageId":"1456346921.18017.25.camel@twopensource.com","threadId":"41437","inReplyTo":"CACsJy8B0Lt8Eq4GqSCKyA08g0Vvu-1B6dDjpkNmRre3M8DebDg@mail.gmail.com","subject":"Re: [PATCH v5 12/27] refs: forbid cross-backend ref renames","fromName":"David Turner","fromEmail":"dturner@twopensource.com","sentAt":"2016-02-24T20:48:41Z","receivedAt":"2016-02-24T20:48:41Z","isPatch":true,"sender":{"key":"novalis@novalis.org","avatar":"https://avatars.githubusercontent.com/u/77003?v=4"},"body":"On Sat, 2016-02-20 at 11:30 +0700, Duy Nguyen wrote:\n> On Thu, Feb 18, 2016 at 12:17 PM, David Turner <\n> dturner@twopensource.com> wrote:\n> > This would be pretty weird, but since it will break, we should\n> > prevent\n> > it.\n> > \n> > Signed-off-by: David Turner \n> > ---\n> > refs.c | 6 ++++++\n> > 1 file changed, 6 insertions(+)\n> > \n> > diff --git a/refs.c b/refs.c\n> > index f5754f2..8eb04da 100644\n> > --- a/refs.c\n> > +++ b/refs.c\n> > @@ -1306,5 +1306,11 @@ int delete_refs(struct string_list\n> > *refnames)\n> > \n> > int rename_ref(const char *oldref, const char *newref, const char\n> > *logmsg)\n> > {\n> > + if ((ref_type(oldref) == REF_TYPE_NORMAL) !=\n> > + (ref_type(newref) == REF_TYPE_NORMAL)) {\n> > + error(_(\"Both ref arguments to rename_ref must be\n> > normal \"\n> > + \"(or both must be per\n> > -worktree/pseudorefs)\"));\n> > + return -1;\n> \n> You can do return error(...);\n> \n> > + }\n> > return the_refs_backend->rename_ref(oldref, newref,\n> > logmsg);\n> \n> LMDB backend can't deal with per-worktree rename. So either forbid\n> per-worktree rename here too, or fall back to files backend.\n\nWill do, thanks.\n"},{"id":"279307","messageId":"CACsJy8CpCrHRGJojx7_kqghp7rEVis3eS790Y81L7vBNnBrtEQ@mail.gmail.com","threadId":"41437","inReplyTo":"1456346620.18017.23.camel@twopensource.com","subject":"Re: [PATCH v5 25/27] refs: add LMDB refs storage backend","fromName":"Duy Nguyen","fromEmail":"pclouds@gmail.com","sentAt":"2016-02-25T10:07:36Z","receivedAt":"2016-02-25T10:07:36Z","isPatch":true,"sender":{"key":"pclouds@gmail.com","avatar":"https://avatars.githubusercontent.com/u/720?v=4"},"body":"On Thu, Feb 25, 2016 at 3:43 AM, David Turner wrote:\n>> > > > > I'm not sure I get this comment. D/F conflicts are no longer\n>> > > > > a\n>> > > > > thing\n>> > > > > for lmdb backend, right?\n>> > > >\n>> > > > I'm trying to avoid the lmdb backend creating a set of refs\n>> > > > that\n>> > > > the\n>> > > > files backend can't handle. This would make collaboration with\n>> > > > other\n>> > > > versions of git more difficult.\n>> > >\n>> > > It already is. If you create refs \"foo\" and \"FOO\" on case\n>> > > sensitive\n>> > > file system and clone it on a case-insensitive one, you face the\n>> > > same\n>> > > problem. We may have an optional configuration knob to prevent\n>> > > incompatibilities with files backend, but I think that should be\n>> > > done\n>> > > (and enforced if necessary) outside backends.\n>> >\n>> > Sure, the current state isn't perfect, but why make it worse?\n>>\n>> I see it from a different angle. The current state isn't perfect, but\n>> we will be moving to a better future where \"files\" backend may\n>> eventually be deprecated. Why hold back?\n>>\n>> But this line of reasoning only works if we have a new backend\n>> capable\n>> of replacing \"files\" without regressions or introducing new\n>> dependency. Which is why I suggest a new backend [1] (or implement\n>> Shawn's RefTree if it's proven as good with small repos)\n>>\n>> I have no problem if you want to stay strictly compatible with\n>> \"files\"\n>> though.\n>>\n>> [1] http://thread.gmane.org/gmane.comp.version-control.git/285893/foc\n>> us=286654\n>\n> Won't RefTree have the same d/f conflict issue?\n\nIt's trees all the way down if I understand it correctly, so yes\nRefTree should have d/f conflict issue as well.\n-- \nDuy\n"},{"id":"279308","messageId":"CACsJy8DDVbz9LnX5HM_2HB+uDvqzS7LU=12gxhxJFqYPHp0Tvg@mail.gmail.com","threadId":"41437","inReplyTo":"1456346242.18017.16.camel@twopensource.com","subject":"Re: [PATCH v5 25/27] refs: add LMDB refs storage backend","fromName":"Duy Nguyen","fromEmail":"pclouds@gmail.com","sentAt":"2016-02-25T10:12:32Z","receivedAt":"2016-02-25T10:12:32Z","isPatch":true,"sender":{"key":"pclouds@gmail.com","avatar":"https://avatars.githubusercontent.com/u/720?v=4"},"body":"On Thu, Feb 25, 2016 at 3:37 AM, David Turner wrote:\n> On Sat, 2016-02-20 at 15:59 +0700, Duy Nguyen wrote:\n>> On Thu, Feb 18, 2016 at 12:17 PM, David Turner <\n>> dturner@twopensource.com> wrote:\n>> > LMDB has a few features that make it suitable for usage in git:\n>> > ...\n>>\n>> I'm reading lmdb documents and hitting the caveat section [1].\n>> Random thoughts\n>>\n>> * \"There is normally no pure read-only mode, since readers need write\n>> access to locks and lock file.\".\n>>\n>> This will be a problem for server side that serves git:// protocol\n>> only. Some of those servers disable write access to the entire\n>> repository and git still works fine (but won't when lmdb is used).\n>> Should we do something in this case? Just tell server admins to relax\n>> file access, or use MDB_NOLOCK (and when? based on config var?)\n>\n> MDB_NOLOCK is a good idea. I'm going to add this to the \"Weaknesses\"\n> section of the docs and plan to fix it later, unless you feel strongly\n> otherwise.\n\nNo I'm fine as long as it's documented. I was a bit disappointed when\nI found out about this because after reading lmdb paper I almost\nsuggested we add lmdb to git.git as a submodule and prepare it to be\nthe next default ref backend. The quest for the \"next generation\"\ndefault ref backend continues.\n\n>> * \"Avoid long-lived transactions....\"\n>>\n>> OK we don't have a problem with this. But it makes me realize lmdb\n>> transactions do not map with ref transactions. We don't open lmdb\n>> transaction at ref_transaction_begin(), for example. Is it simply\n>> more\n>> convenient to do transactions the current way, or is it impossible or\n>> incorrect to attach lmdb transactions to ref_transaction_*()?\n>\n> That was what I did originally, but reviewers here noted that it had\n> some problems:\n> 1. What if, while a transaction is open, git opens a subprocess that\n> wants to make its own transaction? There can only be one writer\n> transaction open at a time.\n> 2. As you note, long-lived transactions.\n>\n> Also, the files backend also doesn't do any locking until the last\n> moment, and it's reasonable to try to be compatible with that.\n\nSome of these should be kept in the commit message for future reference.\n-- \nDuy\n"},{"id":"279373","messageId":"1456430746-5565-1-git-send-email-dturner@twopensource.com","threadId":"41437","inReplyTo":"CACsJy8DDVbz9LnX5HM_2HB+uDvqzS7LU=12gxhxJFqYPHp0Tvg@mail.gmail.com","subject":"[PATCH] refs: document transaction semantics","fromName":"David Turner","fromEmail":"dturner@twopensource.com","sentAt":"2016-02-25T20:05:46Z","receivedAt":"2016-02-25T20:05:46Z","isPatch":true,"sender":{"key":"novalis@novalis.org","avatar":"https://avatars.githubusercontent.com/u/77003?v=4"},"body":"Add some comments on ref transaction semantics to refs.h\n\nSigned-off-by: David Turner \n---\n refs.h | 12 ++++++++++++\n 1 file changed, 12 insertions(+)\n\ndiff --git a/refs.h b/refs.h\nindex c0964f5..9b3eaf3 100644\n--- a/refs.h\n+++ b/refs.h\n@@ -112,6 +112,11 @@ extern int dwim_log(const char *str, int len, unsigned char *sha1, char **ref);\n * If this succeeds, the ref updates will have taken place and\n * the transaction cannot be rolled back.\n *\n+ * - Instead of `ref_transaction_commit`, use\n+ * `initial_ref_transaction_commit()` if the ref database is known\n+ * to be empty (e.g. during clone). This is likely to be much\n+ * faster.\n+ *\n * - At any time call `ref_transaction_free()` to discard the\n * transaction and free associated resources. In particular,\n * this rolls back the transaction if it has not been\n@@ -127,6 +132,13 @@ extern int dwim_log(const char *str, int len, unsigned char *sha1, char **ref);\n *\n * The message is appended to err without first clearing err.\n * err will not be '\\n' terminated.\n+ *\n+ * Caveats\n+ * -------\n+ *\n+ * Note that no locks are taken, and no refs are read, until\n+ * `ref_transaction_commit` is called. So `ref_transaction_verify`\n+ * won't report a verification failure until the commit is attempted.\n */\n struct ref_transaction;\n \n-- \n2.4.2.767.g62658d5-twtrsrc\n"},{"id":"279375","messageId":"1456431013.18017.50.camel@twopensource.com","threadId":"41437","inReplyTo":"1456430746-5565-1-git-send-email-dturner@twopensource.com","subject":"Re: [PATCH] refs: document transaction semantics","fromName":"David Turner","fromEmail":"dturner@twopensource.com","sentAt":"2016-02-25T20:10:13Z","receivedAt":"2016-02-25T20:10:13Z","isPatch":true,"sender":{"key":"novalis@novalis.org","avatar":"https://avatars.githubusercontent.com/u/77003?v=4"},"body":"I thought it would be better in the api docs, since it's a design\ndecision that all backends should follow.\n\nOn Thu, 2016-02-25 at 15:05 -0500, David Turner wrote:\n> Add some comments on ref transaction semantics to refs.h\n> \n> Signed-off-by: David Turner \n> ---\n> refs.h | 12 ++++++++++++\n> 1 file changed, 12 insertions(+)\n> \n> diff --git a/refs.h b/refs.h\n> index c0964f5..9b3eaf3 100644\n> --- a/refs.h\n> +++ b/refs.h\n> @@ -112,6 +112,11 @@ extern int dwim_log(const char *str, int len,\n> unsigned char *sha1, char **ref);\n> * If this succeeds, the ref updates will have taken place and\n> * the transaction cannot be rolled back.\n> *\n> + * - Instead of `ref_transaction_commit`, use\n> + * `initial_ref_transaction_commit()` if the ref database is known\n> + * to be empty (e.g. during clone). This is likely to be much\n> + * faster.\n> + *\n> * - At any time call `ref_transaction_free()` to discard the\n> * transaction and free associated resources. In particular,\n> * this rolls back the transaction if it has not been\n> @@ -127,6 +132,13 @@ extern int dwim_log(const char *str, int len,\n> unsigned char *sha1, char **ref);\n> *\n> * The message is appended to err without first clearing err.\n> * err will not be '\\n' terminated.\n> + *\n> + * Caveats\n> + * -------\n> + *\n> + * Note that no locks are taken, and no refs are read, until\n> + * `ref_transaction_commit` is called. So `ref_transaction_verify`\n> + * won't report a verification failure until the commit is\n> attempted.\n> */\n> struct ref_transaction;\n> \n"},{"id":"279383","messageId":"xmqqvb5cmsup.fsf@gitster.mtv.corp.google.com","threadId":"41437","inReplyTo":"1456431013.18017.50.camel@twopensource.com","subject":"Re: [PATCH] refs: document transaction semantics","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2016-02-25T20:34:54Z","receivedAt":"2016-02-25T20:34:54Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"David Turner writes:\n\n> I thought it would be better in the api docs, since it's a design\n> decision that all backends should follow.\n\nMakes sense; as this describes an already available API, it\nshouldn't have to wait for the remainder of your series and can just\ngo to 'master' (or even to 'maint' if we wanted to), right?\n\n\n\n> On Thu, 2016-02-25 at 15:05 -0500, David Turner wrote:\n>> Add some comments on ref transaction semantics to refs.h\n>> \n>> Signed-off-by: David Turner \n>> ---\n>> refs.h | 12 ++++++++++++\n>> 1 file changed, 12 insertions(+)\n>> \n>> diff --git a/refs.h b/refs.h\n>> index c0964f5..9b3eaf3 100644\n>> --- a/refs.h\n>> +++ b/refs.h\n>> @@ -112,6 +112,11 @@ extern int dwim_log(const char *str, int len,\n>> unsigned char *sha1, char **ref);\n>> * If this succeeds, the ref updates will have taken place and\n>> * the transaction cannot be rolled back.\n>> *\n>> + * - Instead of `ref_transaction_commit`, use\n>> + * `initial_ref_transaction_commit()` if the ref database is known\n>> + * to be empty (e.g. during clone). This is likely to be much\n>> + * faster.\n>> + *\n>> * - At any time call `ref_transaction_free()` to discard the\n>> * transaction and free associated resources. In particular,\n>> * this rolls back the transaction if it has not been\n>> @@ -127,6 +132,13 @@ extern int dwim_log(const char *str, int len,\n>> unsigned char *sha1, char **ref);\n>> *\n>> * The message is appended to err without first clearing err.\n>> * err will not be '\\n' terminated.\n>> + *\n>> + * Caveats\n>> + * -------\n>> + *\n>> + * Note that no locks are taken, and no refs are read, until\n>> + * `ref_transaction_commit` is called. So `ref_transaction_verify`\n>> + * won't report a verification failure until the commit is\n>> attempted.\n>> */\n>> struct ref_transaction;\n>> \n"},{"id":"279386","messageId":"1456433438.18017.53.camel@twopensource.com","threadId":"41437","inReplyTo":"xmqqvb5cmsup.fsf@gitster.mtv.corp.google.com","subject":"Re: [PATCH] refs: document transaction semantics","fromName":"David Turner","fromEmail":"dturner@twopensource.com","sentAt":"2016-02-25T20:50:38Z","receivedAt":"2016-02-25T20:50:38Z","isPatch":true,"sender":{"key":"novalis@novalis.org","avatar":"https://avatars.githubusercontent.com/u/77003?v=4"},"body":"On Thu, 2016-02-25 at 12:34 -0800, Junio C Hamano wrote:\n> David Turner writes:\n> \n> > I thought it would be better in the api docs, since it's a design\n> > decision that all backends should follow.\n> \n> Makes sense; as this describes an already available API, it\n> shouldn't have to wait for the remainder of your series and can just\n> go to 'master' (or even to 'maint' if we wanted to), right?\n\nYes.\n"}]}