diff mbox series

[bug#50359,v3,2/3] tests: git: Make 'tag' directive non-interactive.

Message ID c49499e98ed1298567640e53420837b389f3728e.1631865317.git.public@yoctocell.xyz
State Accepted
Headers show
Series Add 'generic-git' updater | expand

Checks

Context Check Description
cbaines/applying patch fail View Laminar job
cbaines/issue success View issue

Commit Message

Xinglu Chen Sept. 17, 2021, 8:04 a.m. UTC 
When running 'git tag TAGNAME', Git will open up the user's default text
editor to make them write a message.  This is not desirable when running
tests.

* guix/tests/git.scm (populate-git-repository): Make the 'tag' directive take
an additional argument, and pass it to the '-m' flag.
* tests/channels.scm ("channel-news, one entry"): Adjust accordingly.
---
 guix/tests/git.scm | 4 ++--
 tests/channels.scm | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
diff mbox series

Patch

diff --git a/guix/tests/git.scm b/guix/tests/git.scm
index e11541e83b..e8d4946e87 100644
--- a/guix/tests/git.scm
+++ b/guix/tests/git.scm
@@ -87,8 +87,8 @@  Return DIRECTORY on success."
       ((('commit text ('signer fingerprint)) rest ...)
        (git "commit" "-m" text (string-append "--gpg-sign=" fingerprint))
        (loop rest))
-      ((('tag name) rest ...)
-       (git "tag" name)
+      ((('tag name text) rest ...)
+       (git "tag" "-m" text name)
        (loop rest))
       ((('branch name) rest ...)
        (git "branch" name)
diff --git a/tests/channels.scm b/tests/channels.scm
index 0264369d9e..8f7ff1e7a8 100644
--- a/tests/channels.scm
+++ b/tests/channels.scm
@@ -329,7 +329,7 @@ 
         (commit "first commit")
         (add "src/a.txt" "A")
         (commit "second commit")
-        (tag "tag-for-first-news-entry")
+        (tag "tag-for-first-news-entry" "First news entry!")
         (add "news.scm"
              ,(lambda (repository)
                 (let ((previous