Re: [PATCH 1/2] test-lib.sh: introduce 4th argument to test_commit() specifying a tag name

From: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date: Jul 31, 2010, 00:39 UTC
Message-ID: <AANLkTik3KBCh6Xn8r8odfdEfH=1Uf1bMKW6ic4UQPRsw@mail.gmail.com>
In-Reply-To: <20100731001845.GA24129@wo.int.altlinux.org>

On Sat, Jul 31, 2010 at 00:18, Dmitry V. Levin <ldv@altlinux.org> wrote:

> When fourth argument to test_commit() is specified, use it as a tag
> name, unless it equals to empty string.  In the latter case, skip tag
> creation.

Looks good, mostly.

> Suggested-by: Ęvar Arnfjörš Bjarmason <avarab@gmail.com>

Seems like you sent a ISO-8859-1 E-Mail with UTF-8 content.

My name also doubles as a UUID and a UTF-8 canary, you see.

Show 21 quoted lines

> Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
> ---
>  t/test-lib.sh |    8 +++++---
>  1 files changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/t/test-lib.sh b/t/test-lib.sh
> index 367f053..a203383 100644
> --- a/t/test-lib.sh
> +++ b/t/test-lib.sh
> @@ -277,10 +277,12 @@ test_tick () {
>        export GIT_COMMITTER_DATE GIT_AUTHOR_DATE
>  }
>
> -# Call test_commit with the arguments "<message> [<file> [<contents>]]"
> +# Call test_commit with the arguments
> +# "<message> [<file> [<contents> [<tagname>]]]"
>  #
>  # This will commit a file with the given contents and the given commit
> -# message.  It will also add a tag with <message> as name.
> +# message.  It will also add a tag with the given name unless the latter
> +# is the empty string.

You should also patch t/README, which documents this function.

Show 8 quoted lines

>  # Both <file> and <contents> default to <message>.
>
> @@ -290,7 +292,7 @@ test_commit () {
>        git add "$file" &&
>        test_tick &&
>        git commit -m "$1" &&
> -       git tag "$1"
> +       if test -n "${4-$1}"; then git tag "${4-$1}"; fi

This is just a nit, but I'd write this on 4 lines:

if test..
then
    git tag
fi