From: Jeff King <peff@peff.net>
To: Johannes Sixt <j6t@kdbg.org>
Cc: Junio C Hamano <gitster@pobox.com>,
Klaus Ethgen <Klaus@Ethgen.ch>,
git@vger.kernel.org
Subject: Re: [PATCH 2/2] tmp-objdir: quote paths we add to alternates
Date: Tue, 13 Dec 2016 06:44:15 -0500 [thread overview]
Message-ID: <20161213114414.masgfo7lf7e3utym@sigill.intra.peff.net> (raw)
In-Reply-To: <d83cd58f-9b52-cbc5-04dd-5aafe2822533@kdbg.org>
On Mon, Dec 12, 2016 at 09:53:11PM +0100, Johannes Sixt wrote:
> > The appropriate check there would be ";" anyway, but I am not
> > sure _that_ is allowed in paths, either.
>
> That was also my line of thought. I tested earlier today whether a file name
> can have ";", and the OS did not reject it bluntly. Let me see whether I can
> adjust the test case for Windows.
The naive conversion is just:
diff --git a/t/t5547-push-quarantine.sh b/t/t5547-push-quarantine.sh
index 6275ec807..e195e168b 100755
--- a/t/t5547-push-quarantine.sh
+++ b/t/t5547-push-quarantine.sh
@@ -33,8 +33,13 @@ test_expect_success 'rejected objects are removed' '
test_cmp expect actual
'
-# MINGW does not allow colons in pathnames in the first place
-test_expect_success !MINGW 'push to repo path with colon' '
+if test_have_prereq MINGW
+then
+ path_sep=';'
+else
+ path_sep=':'
+fi
+test_expect_success 'push to repo path with (semi-)colon separator' '
# The interesting failure case here is when the
# receiving end cannot access its original object directory,
# so make it likely for us to generate a delta by having
@@ -43,13 +48,13 @@ test_expect_success !MINGW 'push to repo path with colon' '
test-genrandom foo 4096 >file.bin &&
git add file.bin &&
git commit -m bin &&
- git clone --bare . xxx:yyy.git &&
+ git clone --bare . xxx${path_sep}yyy.git &&
echo change >>file.bin &&
git commit -am change &&
# Note that we have to use the full path here, or it gets confused
# with the ssh host:path syntax.
- git push "$PWD/xxx:yyy.git" HEAD
+ git push "$PWD/xxx${path_sep}yyy.git" HEAD
'
test_done
Does that work?
-Peff
next prev parent reply other threads:[~2016-12-13 11:44 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-09 14:02 [BUG] Colon in remote urls Klaus Ethgen
2016-12-09 15:22 ` Jeff King
2016-12-09 19:07 ` Junio C Hamano
2016-12-10 8:51 ` Jeff King
2016-12-12 19:49 ` [PATCH 0/2] handling alternates paths with colons Jeff King
2016-12-12 19:52 ` [PATCH 1/2] alternates: accept double-quoted paths Jeff King
2016-12-13 11:30 ` Duy Nguyen
2016-12-13 11:52 ` Jeff King
2016-12-13 18:08 ` Junio C Hamano
2016-12-17 7:56 ` Duy Nguyen
2016-12-12 19:53 ` [PATCH 2/2] tmp-objdir: quote paths we add to alternates Jeff King
2016-12-12 20:53 ` Johannes Sixt
2016-12-13 11:44 ` Jeff King [this message]
2016-12-13 18:10 ` Junio C Hamano
2016-12-13 18:15 ` Jeff King
2016-12-13 20:10 ` Junio C Hamano
2016-12-13 19:09 ` [PATCH 3/2] t5547-push-quarantine: run the path separator test on Windows, too Johannes Sixt
2016-12-13 19:12 ` Jeff King
2016-12-13 19:23 ` Junio C Hamano
2016-12-21 21:33 ` [PATCH 4/2] t5615-alternate-env: double-quotes in file names do not work on Windows Johannes Sixt
2016-12-21 22:42 ` Jeff King
2016-12-22 6:13 ` Johannes Sixt
2016-12-22 19:06 ` Johannes Sixt
2016-12-22 21:38 ` Johannes Schindelin
2016-12-22 22:19 ` Jeff King
2016-12-12 22:37 ` [PATCH 0/2] handling alternates paths with colons Junio C Hamano
2016-12-13 11:50 ` Jeff King
2016-12-13 18:10 ` Junio C Hamano
2016-12-13 18:17 ` Jeff King
2016-12-13 18:42 ` Junio C Hamano
2016-12-13 18:47 ` Jeff King
2016-12-10 9:29 ` [BUG] Colon in remote urls Klaus Ethgen
2016-12-10 10:24 ` Jeff King
2016-12-10 10:46 ` Klaus Ethgen
2016-12-09 21:32 ` Johannes Sixt
2016-12-10 8:26 ` Jeff King
2016-12-10 9:41 ` Klaus Ethgen
2016-12-10 10:26 ` Jeff King
2016-12-10 10:51 ` Klaus Ethgen
2016-12-10 9:32 ` Klaus Ethgen
2016-12-10 18:18 ` Johannes Schindelin
2016-12-11 11:02 ` Klaus Ethgen
2016-12-11 14:51 ` Philip Oakley
2016-12-12 11:03 ` Johannes Schindelin
2016-12-12 11:50 ` Klaus Ethgen
2016-12-12 14:05 ` Johannes Schindelin
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=20161213114414.masgfo7lf7e3utym@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=Klaus@Ethgen.ch \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j6t@kdbg.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).