Merge branch 'ow/rev-parse-is-shallow-repo'
"git rev-parse" learned "--is-shallow-repository", that is to be used in a way similar to existing "--is-bare-repository" and friends. * ow/rev-parse-is-shallow-repo: rev-parse: rev-parse: add --is-shallow-repository
This commit is contained in:
commit
3430fff768
@ -235,6 +235,9 @@ print a message to stderr and exit with nonzero status.
|
||||
--is-bare-repository::
|
||||
When the repository is bare print "true", otherwise "false".
|
||||
|
||||
--is-shallow-repository::
|
||||
When the repository is shallow print "true", otherwise "false".
|
||||
|
||||
--resolve-git-dir <path>::
|
||||
Check if <path> is a valid repository or a gitfile that
|
||||
points at a valid repository, and print the location of the
|
||||
|
@ -868,6 +868,11 @@ int cmd_rev_parse(int argc, const char **argv, const char *prefix)
|
||||
: "false");
|
||||
continue;
|
||||
}
|
||||
if (!strcmp(arg, "--is-shallow-repository")) {
|
||||
printf("%s\n", is_repository_shallow() ? "true"
|
||||
: "false");
|
||||
continue;
|
||||
}
|
||||
if (!strcmp(arg, "--shared-index-path")) {
|
||||
if (read_cache() < 0)
|
||||
die(_("Could not read the index"));
|
||||
|
@ -116,6 +116,21 @@ test_expect_success 'git-path inside sub-dir' '
|
||||
test_cmp expect actual
|
||||
'
|
||||
|
||||
test_expect_success 'rev-parse --is-shallow-repository in shallow repo' '
|
||||
test_commit test_commit &&
|
||||
echo true >expect &&
|
||||
git clone --depth 1 --no-local . shallow &&
|
||||
test_when_finished "rm -rf shallow" &&
|
||||
git -C shallow rev-parse --is-shallow-repository >actual &&
|
||||
test_cmp expect actual
|
||||
'
|
||||
|
||||
test_expect_success 'rev-parse --is-shallow-repository in non-shallow repo' '
|
||||
echo false >expect &&
|
||||
git rev-parse --is-shallow-repository >actual &&
|
||||
test_cmp expect actual
|
||||
'
|
||||
|
||||
test_expect_success 'showing the superproject correctly' '
|
||||
git rev-parse --show-superproject-working-tree >out &&
|
||||
test_must_be_empty out &&
|
||||
|
Loading…
Reference in New Issue
Block a user