git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Johannes Sixt <j6t@kdbg.org>
To: Derrick Stolee <dstolee@microsoft.com>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: [PATCH] t3705-add-sparse-checkout: ignore a LF->CRLF warning on Windows
Date: Sat, 15 Jan 2022 15:58:41 +0100	[thread overview]
Message-ID: <df42170b-8659-d496-3454-a4a3ac2827eb@kdbg.org> (raw)
In-Reply-To: <7ed402e0-63cd-2875-b3ac-71c967ccf80a@kdbg.org>

There are checks that certain `git add` invocations do not produce
output on stderr. One of them, the original one, uses
"-c core.autocrlf=input" to ensure that `git add` does not write a
hint about LF to CRLF conversion to stderr on Windows. A second
`git add` was added in later patch, but it was forgotten to add
the same protection. Add it now to let the test pass on Windows.

Signed-off-by: Johannes Sixt <j6t@kdbg.org>
---
Am 13.01.22 um 22:12 schrieb Johannes Sixt:
> is there a reason we don't do this in the test case that you added in
> 63b60b3add75 ("add: update --chmod to skip sparse paths", 2021-09-24).
> Notice that the similar git add earlier also sets core.autocrlf.

Here's a proper patch.

 t/t3705-add-sparse-checkout.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/t/t3705-add-sparse-checkout.sh b/t/t3705-add-sparse-checkout.sh
index 81f3384eee..4fb663e3b4 100755
--- a/t/t3705-add-sparse-checkout.sh
+++ b/t/t3705-add-sparse-checkout.sh
@@ -184,7 +184,7 @@ test_expect_success 'git add fails outside of sparse-checkout definition' '
 	git ls-files --stage >actual &&
 	grep "^100644 .*sparse_entry\$" actual &&
 
-	git add --sparse --chmod=+x sparse_entry 2>stderr &&
+	git -c core.autocrlf=input add --sparse --chmod=+x sparse_entry 2>stderr &&
 	test_must_be_empty stderr &&
 	git ls-files --stage >actual &&
 	grep "^100755 .*sparse_entry\$" actual &&
-- 
2.34.1.141.g867d0e9267

  reply	other threads:[~2022-01-15 14:58 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-01-13 21:12 Test failure on Windows in t3705-add-sparse-checkout.sh Johannes Sixt
2022-01-15 14:58 ` Johannes Sixt [this message]
2022-01-18 16:17   ` [PATCH] t3705-add-sparse-checkout: ignore a LF->CRLF warning on Windows Derrick Stolee
2022-01-16  3:58 ` Test failure on Windows in t3705-add-sparse-checkout.sh Elijah Newren

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

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=df42170b-8659-d496-3454-a4a3ac2827eb@kdbg.org \
    --to=j6t@kdbg.org \
    --cc=dstolee@microsoft.com \
    --cc=git@vger.kernel.org \
    /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.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

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 read-only IMAP folder(s) and NNTP newsgroup(s).