git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: [PATCH] mingw: fix the shortlog --output=<file> test
Date: Mon, 11 Jul 2016 15:11:37 +0200 (CEST)	[thread overview]
Message-ID: <alpine.DEB.2.20.1607111507180.6426@virtualbox> (raw)

Adjust t4201 to pass on Windows; a couple of test cases need to be
skipped on Windows which leads to a different shortlog than on Linux.

Let's just fix that by limiting the shortlog's commit range to traverse
only one commit: that guarantees that it does not matter how many test
cases were skipped.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>

---

	On Fri, 8 Jul 2016, Junio C Hamano wrote:

	> * js/log-to-diffopt-file (2016-06-28) 11 commits
	>   (merged to 'next' on 2016-07-06 at 39e7a5f)
	>  + diff: do not color output when --color=auto and --output=<file>
	>    is given
	>  + t4211: ensure that log respects --output=<file>
	>  + shortlog: respect the --output=<file> setting

	Dang it! My original test series was well-tested on Linux *and* on
	Windows. Over the course of the iterations, Windows support broke.

	My apologies for not catching this earlier.

 t/t4201-shortlog.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/t/t4201-shortlog.sh b/t/t4201-shortlog.sh
index bd699e1..ae08b57 100755
--- a/t/t4201-shortlog.sh
+++ b/t/t4201-shortlog.sh
@@ -185,9 +185,9 @@ test_expect_success 'shortlog with revision pseudo options' '
 '
 
 test_expect_success 'shortlog with --output=<file>' '
-	git shortlog --output=shortlog master >output &&
+	git shortlog --output=shortlog -1 master >output &&
 	test ! -s output &&
-	test_line_count = 7 shortlog
+	test_line_count = 3 shortlog
 '
 
 test_done
-- 
2.9.0.278.g1caae67


                 reply	other threads:[~2016-07-11 13:11 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=alpine.DEB.2.20.1607111507180.6426@virtualbox \
    --to=johannes.schindelin@gmx.de \
    --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).