git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Pang Yan Han <pangyanhan@gmail.com>
To: git@vger.kernel.org
Cc: gitster@pobox.com, peff@peff.net,
	martin.von.zweigbergk@gmail.com, sdaoden@googlemail.com,
	ib@wupperonline.de, Pang Yan Han <pangyanhan@gmail.com>
Subject: [PATCH/RFCv2 1/2] format-patch: demonstrate that color.ui=always produces colorized patches
Date: Tue, 13 Sep 2011 01:46:40 +0800	[thread overview]
Message-ID: <1315849601-26497-2-git-send-email-pangyanhan@gmail.com> (raw)
In-Reply-To: <1315849601-26497-1-git-send-email-pangyanhan@gmail.com>

commit c9bfb953 (want_color: automatically fallback to color.ui,
2011-08-17) introduced a regression where format-patch produces colorized
patches when color.ui is set to "always".

Demonstrate this through a new test.

Helped-by: Jeff King <peff@peff.net>
Signed-off-by: Pang Yan Han <pangyanhan@gmail.com>
---
 t/t4051-format-patch-config.sh |   23 +++++++++++++++++++++++
 1 files changed, 23 insertions(+), 0 deletions(-)
 create mode 100755 t/t4051-format-patch-config.sh

diff --git a/t/t4051-format-patch-config.sh b/t/t4051-format-patch-config.sh
new file mode 100755
index 0000000..cea9c7d
--- /dev/null
+++ b/t/t4051-format-patch-config.sh
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+test_description='check that format-patch does not respect porcelain config'
+
+. ./test-lib.sh
+
+test_expect_success setup '
+	echo foo >foo &&
+	git add foo &&
+	git commit -m "commit1" &&
+	echo bar >foo &&
+	git add foo &&
+	git commit -m "commit2"
+'
+
+test_expect_failure 'format patch with ui.color=always generates non colorized patch' '
+	git config color.ui always &&
+	git format-patch -1 &&
+	mv 0001-commit2.patch actual &&
+	test_must_fail grep "\[31m-" actual
+'
+
+test_done
-- 
1.7.7.rc0.190.gb47b6

  reply	other threads:[~2011-09-12 17:49 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-09-12 17:46 [PATCH/RFCv2 0/2] format-patch: produce non colorized patches when color.ui=always Pang Yan Han
2011-09-12 17:46 ` Pang Yan Han [this message]
2011-09-12 18:07   ` [PATCH/RFCv2 1/2] format-patch: demonstrate that color.ui=always produces colorized patches Junio C Hamano
2011-09-12 17:46 ` [PATCH/RFCv2 2/2] format-patch: produce non colorized patches when ui.color=always Pang Yan Han
2011-09-12 18:08   ` Junio C Hamano
2011-09-12 18:43     ` 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=1315849601-26497-2-git-send-email-pangyanhan@gmail.com \
    --to=pangyanhan@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=ib@wupperonline.de \
    --cc=martin.von.zweigbergk@gmail.com \
    --cc=peff@peff.net \
    --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).