diff options
| -rw-r--r-- | Documentation/git-repo.adoc | 3 | ||||
| -rw-r--r-- | builtin/repo.c | 9 | ||||
| -rwxr-xr-x | t/t1900-repo.sh | 13 |
3 files changed, 25 insertions, 0 deletions
diff --git a/Documentation/git-repo.adoc b/Documentation/git-repo.adoc index 932b08c26f..01b7f9c95e 100644 --- a/Documentation/git-repo.adoc +++ b/Documentation/git-repo.adoc @@ -41,6 +41,9 @@ values that they return: `layout.bare`:: `true` if this is a bare repository, otherwise `false`. +`layout.shallow`:: + `true` if this is a shallow repository, otherwise `false`. + `references.format`:: The reference storage format. The valid values are: + diff --git a/builtin/repo.c b/builtin/repo.c index aada476e1c..3c9140593b 100644 --- a/builtin/repo.c +++ b/builtin/repo.c @@ -6,6 +6,7 @@ #include "quote.h" #include "refs.h" #include "strbuf.h" +#include "shallow.h" static const char *const repo_usage[] = { "git repo info [<key>...]", @@ -25,6 +26,13 @@ static int get_layout_bare(struct repository *repo UNUSED, struct strbuf *buf) return 0; } +static int get_layout_shallow(struct repository *repo, struct strbuf *buf) +{ + strbuf_addstr(buf, + is_repository_shallow(repo) ? "true" : "false"); + return 0; +} + static int get_references_format(struct repository *repo, struct strbuf *buf) { strbuf_addstr(buf, @@ -35,6 +43,7 @@ static int get_references_format(struct repository *repo, struct strbuf *buf) /* repo_info_fields keys must be in lexicographical order */ static const struct field repo_info_fields[] = { { "layout.bare", get_layout_bare }, + { "layout.shallow", get_layout_shallow }, { "references.format", get_references_format }, }; diff --git a/t/t1900-repo.sh b/t/t1900-repo.sh index b0438d276e..6a9cbf3d47 100755 --- a/t/t1900-repo.sh +++ b/t/t1900-repo.sh @@ -44,6 +44,19 @@ test_repo_info 'bare repository = false is retrieved correctly' \ test_repo_info 'bare repository = true is retrieved correctly' \ 'git init --bare' 'bare' 'layout.bare' 'true' +test_repo_info 'shallow repository = false is retrieved correctly' \ + 'git init' 'nonshallow' 'layout.shallow' 'false' + +test_expect_success 'setup remote' ' + git init remote && + echo x >remote/x && + git -C remote add x && + git -C remote commit -m x +' + +test_repo_info 'shallow repository = true is retrieved correctly' \ + 'git clone --depth 1 "file://$PWD/remote"' 'shallow' 'layout.shallow' 'true' + test_expect_success 'values returned in order requested' ' cat >expect <<-\EOF && layout.bare=false |