From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 27 Aug 2013 16:36:49 +0000 (-0700)
Subject: Meta/RelBuild: kill GPG agent only if it is still running
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c85809a8bbd1edac43bcc2d738bb400d5f6d059f;p=thirdparty%2Fgit.git

Meta/RelBuild: kill GPG agent only if it is still running
---

diff --git a/RelBuild b/RelBuild
index 5ced4f1d96..dc29440050 100755
--- a/RelBuild
+++ b/RelBuild
@@ -30,7 +30,7 @@ GPG_TTY=$(tty) &&
 export GPG_TTY &&
 eval $(gpg-agent --daemon) &&
 GPG_AGENT_PID=$(expr "$GPG_AGENT_INFO" : ".*:\([1-9][0-9]*\):[1-9][0-9]*$") &&
-trap 'kill -0 $GPG_AGENT_PID && kill $GPG_AGENT_PID' 0 1 2 3 15 &&
+trap 'kill -0 2>/dev/null $GPG_AGENT_PID && kill $GPG_AGENT_PID' 0 1 2 3 15 &&
 kill -0 "$GPG_AGENT_PID" &&
 gpg="gpg --use-agent" || exit