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@xxxxxxxxxxxxx>
Helped-by: Junio C Hamano <gitster@xxxxxxxxx>
Helped-by: Justin Tobler <jltobler@xxxxxxxxx>
Helped-by: Eric Sunshine <sunshine@xxxxxxxxxxxxxx>
Mentored-by: Karthik Nayak <karthik.188@xxxxxxxxx>
Mentored-by: Patrick Steinhardt <ps@xxxxxx>
Signed-off-by: Lucas Seiki Oshiro <lucasseikioshiro@xxxxxxxxx>
---
Documentation/git-repo.adoc | 3 +++
builtin/repo.c | 10 ++++++++++
t/t1900-repo.sh | 16 ++++++++++++++++
3 files changed, 29 insertions(+)
diff --git a/Documentation/git-repo.adoc b/Documentation/git-repo.adoc
index 0ee783abc2..0ef851ee9c 100644
--- a/Documentation/git-repo.adoc
+++ b/Documentation/git-repo.adoc
@@ -37,6 +37,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
values that they return:
+`layout.bare`::
+`true` if this is a bare repository, otherwise `false`.
+
`references.format`::
The reference storage format. The valid values are:
+
diff --git a/builtin/repo.c b/builtin/repo.c
index 2b7ab5875e..abdc929e19 100644
--- a/builtin/repo.c
+++ b/builtin/repo.c
@@ -1,4 +1,7 @@
+#define USE_THE_REPOSITORY_VARIABLE
+
#include "builtin.h"
+#include "environment.h"
#include "parse-options.h"
#include "quote.h"
#include "refs.h"
@@ -16,6 +19,12 @@ struct field {
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)
{
strbuf_addstr(buf,
@@ -25,6 +34,7 @@ static int get_references_format(struct repository *repo, struct strbuf *buf)
/* repo_info_fields keys should be in lexicographical order */
static const struct field repo_info_fields[] = {
+ { "layout.bare", get_layout_bare },
{ "references.format", get_references_format },
};
diff --git a/t/t1900-repo.sh b/t/t1900-repo.sh
index 2b2516dbae..e5a624ec71 100755
--- a/t/t1900-repo.sh
+++ b/t/t1900-repo.sh
@@ -35,6 +35,12 @@ test_repo_info 'ref format files is retrieved correctly' '
test_repo_info 'ref format reftable is retrieved correctly' '
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 'git-repo-info fails if an invalid key is requested' '
echo "error: key ${SQ}foo${SQ} not found" >expected_err &&
test_must_fail git repo info foo 2>actual_err &&
@@ -54,4 +60,14 @@ test_expect_success 'only one value is returned if the same key is requested twi
test_cmp expect actual
'
+test_expect_success 'output is returned correctly when two keys are requested' '
+ cat >expected <<-\EOF &&
+ layout.bare=false
+ references.format=files
+ EOF
+ git init --ref-format=files two-keys &&
+ git -C two-keys repo info layout.bare references.format >actual &&
+ test_cmp expected actual
+'
+
test_done
--
2.39.5 (Apple Git-154)
