Thread (13 messages) flat view 13 messages, 3 authors, 2016-06-15

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

From: Ævar Arnfjörð Bjarmason <hidden>
Date: 2016-06-15 22:49:13

On Sat, Jul 31, 2010 at 00:18, Dmitry V. Levin [off-list ref] 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 <redacted>
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.
quoted hunk ↗ jump to hunk
Signed-off-by: Dmitry V. Levin <redacted>
---
 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.
quoted hunk ↗ jump to hunk
 # 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
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help