git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jeff King <peff@peff.net>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
	"Steffen Daode Nurpmeso" <sdaoden@googlemail.com>,
	"Ingo Brückl" <ib@wupperonline.de>
Subject: [PATCH 01/10] t7006: modernize calls to unset
Date: Wed, 17 Aug 2011 22:00:47 -0700	[thread overview]
Message-ID: <20110818050044.GA2889@sigill.intra.peff.net> (raw)
In-Reply-To: <20110818045821.GA17377@sigill.intra.peff.net>

These tests break &&-chaining to deal with broken "unset"
implementations. Instead, they should just use sane_unset.

Signed-off-by: Jeff King <peff@peff.net>
---
 t/t7006-pager.sh |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/t/t7006-pager.sh b/t/t7006-pager.sh
index ed7575d..c0a3135 100755
--- a/t/t7006-pager.sh
+++ b/t/t7006-pager.sh
@@ -402,7 +402,7 @@ test_core_pager_subdir    expect_success test_must_fail \
 					 'git -p apply </dev/null'
 
 test_expect_success TTY 'command-specific pager' '
-	unset PAGER GIT_PAGER;
+	sane_unset PAGER GIT_PAGER &&
 	echo "foo:initial" >expect &&
 	>actual &&
 	git config --unset core.pager &&
@@ -412,7 +412,7 @@ test_expect_success TTY 'command-specific pager' '
 '
 
 test_expect_success TTY 'command-specific pager overrides core.pager' '
-	unset PAGER GIT_PAGER;
+	sane_unset PAGER GIT_PAGER &&
 	echo "foo:initial" >expect &&
 	>actual &&
 	git config core.pager "exit 1"
-- 
1.7.6.10.g62f04

  reply	other threads:[~2011-08-18  5:00 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-08-18  4:58 [PATCH 0/10] color and pager improvements Jeff King
2011-08-18  5:00 ` Jeff King [this message]
2011-08-18 21:05   ` [PATCH 01/10] t7006: modernize calls to unset Junio C Hamano
2011-08-18  5:01 ` [PATCH 02/10] test-lib: add helper functions for config Jeff King
2011-08-18 21:10   ` Junio C Hamano
2011-08-18  5:02 ` [PATCH 03/10] t7006: use test_config helpers Jeff King
2011-08-18  5:02 ` [PATCH 04/10] setup_pager: set GIT_PAGER_IN_USE Jeff King
2011-08-18  5:03 ` [PATCH 05/10] diff: refactor COLOR_DIFF from a flag into an int Jeff King
2011-08-18  5:03 ` [PATCH 06/10] git_config_colorbool: refactor stdout_is_tty handling Jeff King
2011-08-18  5:04 ` [PATCH 07/10] color: delay auto-color decision until point of use Jeff King
2011-08-18 21:59   ` Junio C Hamano
2011-08-18 22:28     ` Jeff King
2011-08-18  5:04 ` [PATCH 08/10] config: refactor get_colorbool function Jeff King
2011-08-18  5:05 ` [PATCH 09/10] diff: don't load color config in plumbing Jeff King
2011-08-18  5:05 ` [PATCH 10/10] want_color: automatically fallback to color.ui Jeff King
2011-09-04  2:36   ` Martin von Zweigbergk
2011-09-04 12:53     ` Jeff King
2011-09-05 11:31       ` Steffen Daode Nurpmeso
2011-08-18 21:58 ` [PATCH 0/10] color and pager improvements Jeff King
2011-08-18 21:59   ` [PATCH 11/10] support pager.* for aliases Jeff King
2011-08-18 22:54     ` Junio C Hamano
2011-08-19  3:37       ` Jeff King
2011-08-19  4:18         ` Junio C Hamano
2011-08-19  4:40           ` Jeff King
2011-08-19  5:23             ` Junio C Hamano
2011-08-19  5:43               ` Junio C Hamano
2011-08-19  8:30               ` Jeff King
2011-08-18 22:01   ` [PATCH 12/10] support pager.* for external commands Jeff King
2011-08-18 22:56     ` Junio C Hamano
2012-02-12  0:46     ` Ævar Arnfjörð Bjarmason
2012-02-14 19:13       ` Jeff King
2011-08-18 22:33   ` [PATCH 0/10] color and pager improvements Ingo Brückl
2011-08-18 22:46     ` Jeff King
2011-08-19  6:34       ` Ingo Brückl
2011-08-25 20:25         ` Jeff King
2011-08-18 21:59 ` Steffen Daode Nurpmeso
2011-08-18 22:02 ` Junio C Hamano

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=20110818050044.GA2889@sigill.intra.peff.net \
    --to=peff@peff.net \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=ib@wupperonline.de \
    --cc=sdaoden@googlemail.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).