summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-04-20 04:37:19 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-04-20 04:37:19 (GMT)
commit5ab8f2261fa2b595abe433dd50be0f2aaec14aa0 (patch)
treea81428eb12d15f62e206a6414bda6cd78ae0a69a /builtin
parent52d77af463ce7be79f777ec7c8bf8adc632a0be2 (diff)
parentadac8115a6e7f9841c48e4fe48b74e0ce652ef58 (diff)
downloadgit-5ab8f2261fa2b595abe433dd50be0f2aaec14aa0.zip
git-5ab8f2261fa2b595abe433dd50be0f2aaec14aa0.tar.gz
git-5ab8f2261fa2b595abe433dd50be0f2aaec14aa0.tar.bz2
Merge branch 'nd/files-backend-git-dir'
The "submodule" specific field in the ref_store structure is replaced with a more generic "gitdir" that can later be used also when dealing with ref_store that represents the set of refs visible from the other worktrees. * nd/files-backend-git-dir: (28 commits) refs.h: add a note about sorting order of for_each_ref_* t1406: new tests for submodule ref store t1405: some basic tests on main ref store t/helper: add test-ref-store to test ref-store functions refs: delete pack_refs() in favor of refs_pack_refs() files-backend: avoid ref api targeting main ref store refs: new transaction related ref-store api refs: add new ref-store api refs: rename get_ref_store() to get_submodule_ref_store() and make it public files-backend: replace submodule_allowed check in files_downcast() refs: move submodule code out of files-backend.c path.c: move some code out of strbuf_git_path_submodule() refs.c: make get_main_ref_store() public and use it refs.c: kill register_ref_store(), add register_submodule_ref_store() refs.c: flatten get_ref_store() a bit refs: rename lookup_ref_store() to lookup_submodule_ref_store() refs.c: introduce get_main_ref_store() files-backend: remove the use of git_path() files-backend: add and use files_ref_path() files-backend: add and use files_reflog_path() ...
Diffstat (limited to 'builtin')
-rw-r--r--builtin/pack-refs.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/pack-refs.c b/builtin/pack-refs.c
index 39f9a55..b106a39 100644
--- a/builtin/pack-refs.c
+++ b/builtin/pack-refs.c
@@ -17,5 +17,5 @@ int cmd_pack_refs(int argc, const char **argv, const char *prefix)
};
if (parse_options(argc, argv, prefix, opts, pack_refs_usage, 0))
usage_with_options(pack_refs_usage, opts);
- return pack_refs(flags);
+ return refs_pack_refs(get_main_ref_store(), flags);
}