From: Dmitry V. Levin Date: Sat, 31 Jul 2010 00:18:46 GMT Subject: [PATCH 1/2] test-lib.sh: introduce 4th argument to test_commit() specifying a tag name Message-ID: <20100731001845.GA24129@wo.int.altlinux.org> In-Reply-To: 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. Suggested-by: Ævar Arnfjörð Bjarmason Signed-off-by: Dmitry V. Levin --- 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 " [ []]" +# Call test_commit with the arguments +# " [ [ []]]" # # This will commit a file with the given contents and the given commit -# message. It will also add a tag with as name. +# message. It will also add a tag with the given name unless the latter +# is the empty string. # # Both and default to . @@ -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 } # Call test_merge with the arguments " ", where -- ldv