repo: add the field layout.bare
This commit is part of the series that introduces the new subcommand git-repo-info. The flag --is-bare-repository from git-rev-parse is used for retrieving whether the current repository is bare. This way, it is used for querying repository metadata, fitting in the purpose of git-repo-info. Then, add a new field layout.bare to the git-repo-info subcommand containing that information. Helped-by: Phillip Wood <phillip.wood@dunelm.org.uk> Helped-by: Junio C Hamano <gitster@pobox.com> Helped-by: Justin Tobler <jltobler@gmail.com> Helped-by: Eric Sunshine <sunshine@sunshineco.com> Mentored-by: Karthik Nayak <karthik.188@gmail.com> Mentored-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Lucas Seiki Oshiro <lucasseikioshiro@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
committed by
Junio C Hamano
parent
9adb8a7fd1
commit
acf2669b54
@@ -38,6 +38,9 @@ In order to obtain a set of values from `git repo info`, you should provide
|
|||||||
the keys that identify them. Here's a list of the available keys and the
|
the keys that identify them. Here's a list of the available keys and the
|
||||||
values that they return:
|
values that they return:
|
||||||
|
|
||||||
|
`layout.bare`::
|
||||||
|
`true` if this is a bare repository, otherwise `false`.
|
||||||
|
|
||||||
`references.format`::
|
`references.format`::
|
||||||
The reference storage format. The valid values are:
|
The reference storage format. The valid values are:
|
||||||
+
|
+
|
||||||
|
|||||||
@@ -1,4 +1,7 @@
|
|||||||
|
#define USE_THE_REPOSITORY_VARIABLE
|
||||||
|
|
||||||
#include "builtin.h"
|
#include "builtin.h"
|
||||||
|
#include "environment.h"
|
||||||
#include "parse-options.h"
|
#include "parse-options.h"
|
||||||
#include "quote.h"
|
#include "quote.h"
|
||||||
#include "refs.h"
|
#include "refs.h"
|
||||||
@@ -16,6 +19,12 @@ struct field {
|
|||||||
get_value_fn *get_value;
|
get_value_fn *get_value;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
static int get_layout_bare(struct repository *repo UNUSED, struct strbuf *buf)
|
||||||
|
{
|
||||||
|
strbuf_addstr(buf, is_bare_repository() ? "true" : "false");
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
static int get_references_format(struct repository *repo, struct strbuf *buf)
|
static int get_references_format(struct repository *repo, struct strbuf *buf)
|
||||||
{
|
{
|
||||||
strbuf_addstr(buf,
|
strbuf_addstr(buf,
|
||||||
@@ -25,6 +34,7 @@ static int get_references_format(struct repository *repo, struct strbuf *buf)
|
|||||||
|
|
||||||
/* repo_info_fields keys must be in lexicographical order */
|
/* repo_info_fields keys must be in lexicographical order */
|
||||||
static const struct field repo_info_fields[] = {
|
static const struct field repo_info_fields[] = {
|
||||||
|
{ "layout.bare", get_layout_bare },
|
||||||
{ "references.format", get_references_format },
|
{ "references.format", get_references_format },
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -38,6 +38,23 @@ test_repo_info 'ref format files is retrieved correctly' \
|
|||||||
test_repo_info 'ref format reftable is retrieved correctly' \
|
test_repo_info 'ref format reftable is retrieved correctly' \
|
||||||
'git init --ref-format=reftable' 'format-reftable' 'references.format' 'reftable'
|
'git init --ref-format=reftable' 'format-reftable' 'references.format' 'reftable'
|
||||||
|
|
||||||
|
test_repo_info 'bare repository = false is retrieved correctly' \
|
||||||
|
'git init' 'nonbare' 'layout.bare' 'false'
|
||||||
|
|
||||||
|
test_repo_info 'bare repository = true is retrieved correctly' \
|
||||||
|
'git init --bare' 'bare' 'layout.bare' 'true'
|
||||||
|
|
||||||
|
test_expect_success 'values returned in order requested' '
|
||||||
|
cat >expect <<-\EOF &&
|
||||||
|
layout.bare=false
|
||||||
|
references.format=files
|
||||||
|
layout.bare=false
|
||||||
|
EOF
|
||||||
|
git init --ref-format=files ordered &&
|
||||||
|
git -C ordered repo info layout.bare references.format layout.bare >actual &&
|
||||||
|
test_cmp expect actual
|
||||||
|
'
|
||||||
|
|
||||||
test_expect_success 'git-repo-info fails if an invalid key is requested' '
|
test_expect_success 'git-repo-info fails if an invalid key is requested' '
|
||||||
echo "error: key ${SQ}foo${SQ} not found" >expect &&
|
echo "error: key ${SQ}foo${SQ} not found" >expect &&
|
||||||
test_must_fail git repo info foo 2>actual &&
|
test_must_fail git repo info foo 2>actual &&
|
||||||
|
|||||||
Reference in New Issue
Block a user