Hi,
Øystein Walle wrote:
> Running `git fetch --unshallow` on a repo that is not in fact shallow
> produces a fatal error message.
Hm, can you say more about the context? From a certain point of view,
it might make sense for that command to succeed instead: if the repo
is already unshallow, then why should't "fetch --unshallow" complain
instead of declaring victory?
> Add a helper to rev-parse that scripters
> can use to determine whether a repo is shallow or not.
>
> Signed-off-by: Øystein Walle <oystwa@xxxxxxxxx>
> ---
> Documentation/git-rev-parse.txt | 3 +++
> builtin/rev-parse.c | 5 +++++
> t/t1500-rev-parse.sh | 15 +++++++++++++++
> 3 files changed, 23 insertions(+)
Regardless, this new rev-parse --is-shallow helper looks like a good
feature.
[...]
> --- a/builtin/rev-parse.c
> +++ b/builtin/rev-parse.c
> @@ -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;
> + }
The implementation is straightforward and correct.
[...]
> --- a/t/t1500-rev-parse.sh
> +++ b/t/t1500-rev-parse.sh
Thanks for writing tests. \o/
> @@ -116,6 +116,21 @@ test_expect_success 'git-path inside sub-dir' '
> test_cmp expect actual
> '
>
> +test_expect_success 'git-path shallow repository' '
What does git-path mean here? I wonder if it's a copy/paste error.
Did you mean something like
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 'git-path notshallow repository' '
Likewise: should this be
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' '
With the two tweaks mentioned above,
Reviewed-by: Jonathan Nieder <jrnieder@xxxxxxxxx>
Thanks.
