git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Ramkumar Ramachandra <artagnon@gmail.com>
To: Git List <git@vger.kernel.org>
Cc: Junio C Hamano <gitster@pobox.com>
Subject: [PATCH 6/8] sh-setup: make die_with_status clear GIT_REFLOG_ACTION
Date: Tue, 18 Jun 2013 17:44:28 +0530	[thread overview]
Message-ID: <1371557670-12534-7-git-send-email-artagnon@gmail.com> (raw)
In-Reply-To: <1371557670-12534-1-git-send-email-artagnon@gmail.com>

Several callers set GIT_REFLOG_ACTION via set_reflog_action(), but
nobody unsets it, leaving a potentially stray variable in the
environment.  Fix this by making die_with_status() unset it.

Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
---
 git-sh-setup.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/git-sh-setup.sh b/git-sh-setup.sh
index 2f78359..3297103 100644
--- a/git-sh-setup.sh
+++ b/git-sh-setup.sh
@@ -51,6 +51,7 @@ die () {
 }
 
 die_with_status () {
+	export GIT_REFLOG_ACTION=
 	status=$1
 	shift
 	echo >&2 "$*"
-- 
1.8.3.1.456.gb7f4cb6

  parent reply	other threads:[~2013-06-18 12:17 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-06-18 12:14 [PATCH 0/8] Re-roll rr/rebase-checkout-reflog Ramkumar Ramachandra
2013-06-18 12:14 ` [PATCH 1/8] t/status-help: test "HEAD detached from" Ramkumar Ramachandra
2013-06-18 12:14 ` [PATCH 2/8] wt-status: remove unused field in grab_1st_switch_cbdata Ramkumar Ramachandra
2013-06-18 12:14 ` [PATCH 3/8] t/checkout-last: test "checkout -" after a rebase Ramkumar Ramachandra
2013-06-18 12:14 ` [PATCH 4/8] status: do not depend on rebase reflog messages Ramkumar Ramachandra
2013-06-18 12:40   ` Peter Krefting
2013-06-18 12:14 ` [PATCH 5/8] checkout: respect GIT_REFLOG_ACTION Ramkumar Ramachandra
2013-06-18 16:53   ` Junio C Hamano
2013-06-18 16:56     ` Ramkumar Ramachandra
2013-06-18 12:14 ` Ramkumar Ramachandra [this message]
2013-06-18 15:13   ` [PATCH 6/8] sh-setup: make die_with_status clear GIT_REFLOG_ACTION Junio C Hamano
2013-06-18 15:47     ` Ramkumar Ramachandra
2013-06-18 16:37       ` Junio C Hamano
2013-06-18 12:14 ` [PATCH 7/8] rebase: write better reflog messages Ramkumar Ramachandra
2013-06-18 12:14 ` [PATCH 8/8] rebase -i: " Ramkumar Ramachandra

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=1371557670-12534-7-git-send-email-artagnon@gmail.com \
    --to=artagnon@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).