From: Johannes Sixt <j6t@kdbg.org>
To: Jeff King <peff@peff.net>
Cc: Junio C Hamano <gitster@pobox.com>,
Klaus Ethgen <Klaus@Ethgen.ch>,
git@vger.kernel.org
Subject: [PATCH 3/2] t5547-push-quarantine: run the path separator test on Windows, too
Date: Tue, 13 Dec 2016 20:09:31 +0100 [thread overview]
Message-ID: <d9d2580c-a2e5-d9f3-1f56-6814b2b2285d@kdbg.org> (raw)
In-Reply-To: <20161212195355.znqlu44lgnke3ltc@sigill.intra.peff.net>
To perform the test case on Windows in a way that corresponds to the
POSIX version, inject the semicolon in a directory name.
Typically, an absolute POSIX style path, such as the one in $PWD, is
translated into a Windows style path by bash when it invokes git.exe.
However, the presence of the semicolon suppresses this translation;
but the untranslated POSIX style path is useless for git.exe.
Therefore, instead of $PWD pass the Windows style path that $(pwd)
produces.
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
---
Am 12.12.2016 um 20:53 schrieb Jeff King:
> Johannes, please let me know if I am wrong about skipping the test on
> !MINGW. The appropriate check there would be ";" anyway, but I am not
> sure _that_ is allowed in paths, either.
Here is a version for Windows. I'd prefer this patch on top instead
of squashing it into yours to keep the $PWD vs. $(pwd) explanation.
The result is the same as yours in all practical matters; but this
version I have already tested.
t/t5547-push-quarantine.sh | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/t/t5547-push-quarantine.sh b/t/t5547-push-quarantine.sh
index 6275ec807b..af9fcd833a 100755
--- a/t/t5547-push-quarantine.sh
+++ b/t/t5547-push-quarantine.sh
@@ -33,8 +33,7 @@ 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' '
+test_expect_success 'push to repo path with path separator (colon)' '
# 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 +42,20 @@ 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 &&
+
+ if test_have_prereq MINGW
+ then
+ pathsep=";"
+ else
+ pathsep=":"
+ fi &&
+ git clone --bare . "xxx${pathsep}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${pathsep}yyy.git" HEAD
'
test_done
--
2.11.0.55.g6a4dbb1
next prev parent reply other threads:[~2016-12-13 19:09 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
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 ` Johannes Sixt [this message]
2016-12-13 19:12 ` [PATCH 3/2] t5547-push-quarantine: run the path separator test on Windows, too 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=d9d2580c-a2e5-d9f3-1f56-6814b2b2285d@kdbg.org \
--to=j6t@kdbg.org \
--cc=Klaus@Ethgen.ch \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
/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).