public inbox for git@vger.kernel.org 
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox•com>
To: Nicolas Vigier <boklm@mars-attacks•org>
Cc: git@vger•kernel.org
Subject: Re: [PATCH] test the commit.gpgsign config option
Date: Tue, 17 Dec 2013 15:27:12 -0800	[thread overview]
Message-ID: <xmqqr49bkqi7.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <xmqq38lsrakh.fsf@gitster.dls.corp.google.com> (Junio C. Hamano's message of "Mon, 16 Dec 2013 09:05:02 -0800")

Junio C Hamano <gitster@pobox•com> writes:

> If any of the above fail, the next test will run with an unknown
> random value in commit.gpgsign depending on where the sequence
> failed.  Use one test_when_finished with test_unconfig at the very
> beginning, perhaps.

In other words, I'll squash this in.

diff --git a/t/t7510-signed-commit.sh b/t/t7510-signed-commit.sh
index 537bfba..5ddac1a 100755
--- a/t/t7510-signed-commit.sh
+++ b/t/t7510-signed-commit.sh
@@ -5,6 +5,8 @@ test_description='signed commit tests'
 . "$TEST_DIRECTORY/lib-gpg.sh"
 
 test_expect_success GPG 'create signed commits' '
+	test_when_finished "test_unconfig commit.gpgsign" &&
+
 	echo 1 >file && git add file &&
 	test_tick && git commit -S -m initial &&
 	git tag initial &&
@@ -40,9 +42,7 @@ test_expect_success GPG 'create signed commits' '
 	git tag seventh-unsigned &&
 
 	test_tick && git rebase -f HEAD^^ && git tag sixth-signed HEAD^ &&
-	git tag seventh-signed &&
-
-	git config --unset commit.gpgsign
+	git tag seventh-signed
 '
 
 test_expect_success GPG 'show signatures' '

      reply	other threads:[~2013-12-17 23:27 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-12-13  0:57 What's cooking in git.git (Dec 2013, #03; Thu, 12) Junio C Hamano
2013-12-13  1:05 ` Duy Nguyen
2013-12-13 20:58   ` Junio C Hamano
2013-12-13  7:39 ` Torsten Bögershausen
2013-12-13 20:58   ` Junio C Hamano
2013-12-16  5:34 ` Junio C Hamano
2013-12-16 12:30   ` Nicolas Vigier
2013-12-16 17:14     ` Junio C Hamano
2013-12-16 13:55   ` [PATCH] test the commit.gpgsign config option Nicolas Vigier
2013-12-16 17:05     ` Junio C Hamano
2013-12-17 23:27       ` Junio C Hamano [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqqr49bkqi7.fsf@gitster.dls.corp.google.com \
    --to=gitster@pobox$(echo .)com \
    --cc=boklm@mars-attacks$(echo .)org \
    --cc=git@vger$(echo .)kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox