mirror of
https://github.com/git/git.git
synced 2026-03-27 00:50:11 +01:00
pack-refs: teach pack-refs --include option
Allow users to be more selective over which refs to pack by adding an --include option to git-pack-refs. The existing options allow some measure of selectivity. By default git-pack-refs packs all tags. --all can be used to include all refs, and the previous commit added the ability to exclude certain refs with --exclude. While these knobs give the user some selection over which refs to pack, it could be useful to give more control. For instance, a repository may have a set of branches that are rarely updated and would benefit from being packed. --include would allow the user to easily include a set of branches to be packed while leaving everything else unpacked. Signed-off-by: John Cai <johncai86@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
@@ -5,6 +5,7 @@
|
||||
#include "worktree.h"
|
||||
#include "object-store.h"
|
||||
#include "repository.h"
|
||||
#include "revision.h"
|
||||
|
||||
struct flag_definition {
|
||||
const char *name;
|
||||
@@ -116,7 +117,14 @@ static struct flag_definition pack_flags[] = { FLAG_DEF(PACK_REFS_PRUNE),
|
||||
static int cmd_pack_refs(struct ref_store *refs, const char **argv)
|
||||
{
|
||||
unsigned int flags = arg_flags(*argv++, "flags", pack_flags);
|
||||
struct pack_refs_opts pack_opts = { .flags = flags };
|
||||
static struct ref_exclusions exclusions = REF_EXCLUSIONS_INIT;
|
||||
static struct string_list included_refs = STRING_LIST_INIT_NODUP;
|
||||
struct pack_refs_opts pack_opts = { .flags = flags,
|
||||
.exclusions = &exclusions,
|
||||
.includes = &included_refs };
|
||||
|
||||
if (pack_opts.flags & PACK_REFS_ALL)
|
||||
string_list_append(pack_opts.includes, "*");
|
||||
|
||||
return refs_pack_refs(refs, &pack_opts);
|
||||
}
|
||||
|
||||
@@ -124,6 +124,27 @@ test_expect_success 'test --no-exclude refs clears excluded refs' '
|
||||
! test -f .git/refs/heads/dont_pack3 &&
|
||||
! test -f .git/refs/heads/dont_pack4'
|
||||
|
||||
test_expect_success 'test only included refs are packed' '
|
||||
git branch pack_this1 &&
|
||||
git branch pack_this2 &&
|
||||
git tag dont_pack5 &&
|
||||
git pack-refs --include "refs/heads/pack_this*" &&
|
||||
test -f .git/refs/tags/dont_pack5 &&
|
||||
! test -f .git/refs/heads/pack_this1 &&
|
||||
! test -f .git/refs/heads/pack_this2'
|
||||
|
||||
test_expect_success 'test --no-include refs clears included refs' '
|
||||
git branch pack1 &&
|
||||
git branch pack2 &&
|
||||
git pack-refs --include "refs/heads/pack*" --no-include &&
|
||||
test -f .git/refs/heads/pack1 &&
|
||||
test -f .git/refs/heads/pack2'
|
||||
|
||||
test_expect_success 'test --exclude takes precedence over --include' '
|
||||
git branch dont_pack5 &&
|
||||
git pack-refs --include "refs/heads/pack*" --exclude "refs/heads/pack*" &&
|
||||
test -f .git/refs/heads/dont_pack5'
|
||||
|
||||
test_expect_success \
|
||||
'see if up-to-date packed refs are preserved' \
|
||||
'git branch q &&
|
||||
|
||||
Reference in New Issue
Block a user