From: Johannes Sixt <j.sixt@viscovery.net>
To: Bryan Donlan <bdonlan@fushizen.net>
Cc: Git Mailing List <git@vger.kernel.org>,
Adam Roben <aroben@apple.com>, Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH 8/8] Fix tests breaking when checkout path contains shell metacharacters
Date: Thu, 10 Apr 2008 08:49:03 +0200 [thread overview]
Message-ID: <47FDB85F.9070503@viscovery.net> (raw)
In-Reply-To: <20080410063028.GA12562@shion.is.fushizen.net>
Bryan Donlan schrieb:
> (did you mean to send the original reply to the list as well? not ccing for
> now, feel free to re-send/forward to the list if you like)
Sorry, yes, I hit the wrong button. I'm lazy again and simply resend this
reply with the complete Cc list, with everything quoted.
> On Wed, Apr 09, 2008 at 09:01:12AM +0200, Johannes Sixt wrote:
>> Bryan Donlan schrieb:
>>> - GIT_WORK_TREE=$(pwd) GIT_DIR=git-dir-wt-1.git git init
>>> + GIT_WORK_TREE="$(pwd)" GIT_DIR=git-dir-wt-1.git git init
>> This ...
>>
>>> -HERE=`pwd`
>>> +HERE="$(pwd)"
>> ... and this and a lot of similar cases shouldn't be required: The RHS of
>> an assignment does not undergo word-splitting.
>
> Will fix.
>
>>> -export GIT_DIR=$(pwd)/repo.git
>>> -export GIT_CONFIG=$GIT_DIR/config
>>> +export GIT_DIR="$(pwd)/repo.git"
>>> +export GIT_CONFIG="$GIT_DIR/config"
>> This, OTOH, is not an assignment, and the change is to the better. But not
>> all shells support export with assignment. Hence this should be changed to
>> the form
>>
>> GIT_DIR=$(pwd)/repo.git
>> GIT_CONFIG=$GIT_DIR/config
>> export GIT_DIR GIT_CONFIG
>>
>> (and similar cases at other places).
>
> I'll break these bits out into another patch in the sequence and fix.
>
>>> test_expect_success ".rev_db auto-converted to .rev_map.UUID" "
>>> git-svn fetch -i trunk &&
>>> - test -z \"\$(ls $GIT_DIR/svn/trunk/.rev_db.* 2>/dev/null)\" &&
>>> - expect=\"\$(ls $GIT_DIR/svn/trunk/.rev_map.*)\" &&
>>> + test -z \"\$(ls \"\$GIT_DIR\"/svn/trunk/.rev_db.* 2>/dev/null)\" &&
>>> + expect=\"\$(ls \"\$GIT_DIR\"/svn/trunk/.rev_map.*)\" &&
>>> test -n \"\$expect\" &&
>>> - rev_db=\$(echo \$expect | sed -e 's,_map,_db,') &&
>>> - convert_to_rev_db \$expect \$rev_db &&
>>> - rm -f \$expect &&
>>> - test -f \$rev_db &&
>>> + rev_db=\"\$(echo \$expect | sed -e 's,_map,_db,')\" &&
>>> + convert_to_rev_db \"\$expect\" \"\$rev_db\" &&
>>> + rm -f \"\$expect\" &&
>>> + test -f \"\$rev_db\" &&
>>> git-svn fetch -i trunk &&
>>> - test -z \"\$(ls $GIT_DIR/svn/trunk/.rev_db.* 2>/dev/null)\" &&
>>> - test ! -e $GIT_DIR/svn/trunk/.rev_db &&
>>> - test -f \$expect
>>> + test -z \"\$(ls \"\$GIT_DIR\"/svn/trunk/.rev_db.* 2>/dev/null)\" &&
>>> + test ! -e \"\$GIT_DIR\"/svn/trunk/.rev_db &&
>>> + test -f \"\$expect\"
>>> "
>> While looking at this test: Wouldn't it be easier to just place the whole
>> thing (and probably similar cases, too) in single-quotes?
>
> To be honest, I fixed all the git-svn tests with a suitably clever vim s///
> expression, so at the time this way was actually easier :)
Fair enough. If you still have the statement in you vim history, it's
worth quoting in the commit message. It's another piece of information
that helps reviewing.
> (Essentially all of the git-svn tests were broken, and it was a little
> annoying to fix them all by hand... though of course I verified the
> results)
-- Hannes
next prev parent reply other threads:[~2008-04-10 6:50 UTC|newest]
Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-04-09 1:29 [PATCH 0/8] Fix git's test suite to pass when the path contains spaces Bryan Donlan
2008-04-09 1:29 ` [PATCH 1/8] git-rebase.sh: Fix --merge --abort failures when path contains whitespace Bryan Donlan
2008-04-09 1:29 ` [PATCH 2/8] config.c: Escape backslashes in section names properly Bryan Donlan
2008-04-09 1:29 ` [PATCH 3/8] git-send-email.perl: Handle shell metacharacters in $EDITOR properly Bryan Donlan
2008-04-09 1:30 ` [PATCH 4/8] test-lib.sh: Fix some missing path quoting Bryan Donlan
2008-04-09 1:30 ` [PATCH 5/8] test-lib.sh: Add a test_set_editor function to safely set $VISUAL Bryan Donlan
2008-04-09 1:30 ` [PATCH 6/8] lib-git-svn.sh: Fix quoting issues with paths containing shell metacharacters Bryan Donlan
2008-04-09 1:30 ` [PATCH 7/8] Use test_set_editor in t9001-send-email.sh Bryan Donlan
2008-04-09 1:30 ` [PATCH 8/8] Fix tests breaking when checkout path contains shell metacharacters Bryan Donlan
[not found] ` <47FC69B8.40809@viscovery.net>
[not found] ` <20080410063028.GA12562@shion.is.fushizen.net>
2008-04-10 6:49 ` Johannes Sixt [this message]
2008-04-10 7:02 ` Bryan Donlan
2008-04-10 7:24 ` Junio C Hamano
2008-04-09 7:01 ` [PATCH 7/8] Use test_set_editor in t9001-send-email.sh Johannes Sixt
2008-04-09 14:16 ` Bryan Donlan
2008-04-09 6:50 ` [PATCH 6/8] lib-git-svn.sh: Fix quoting issues with paths containing shell metacharacters Junio C Hamano
2008-04-09 6:36 ` [PATCH 5/8] test-lib.sh: Add a test_set_editor function to safely set $VISUAL Johannes Sixt
2008-04-09 6:31 ` [PATCH 3/8] git-send-email.perl: Handle shell metacharacters in $EDITOR properly Johannes Sixt
2008-04-09 14:28 ` Bryan Donlan
2008-04-10 3:39 ` Junio C Hamano
2008-04-09 6:31 ` [PATCH 2/8] config.c: Escape backslashes in section names properly Johannes Sixt
2008-04-09 14:13 ` Bryan Donlan
2008-04-09 14:25 ` Johannes Sixt
2008-04-09 6:50 ` [PATCH 1/8] git-rebase.sh: Fix --merge --abort failures when path contains whitespace Junio C Hamano
2008-04-09 6:55 ` Johannes Sixt
2008-04-09 14:37 ` Bryan Donlan
2008-04-09 14:51 ` Johannes Sixt
2008-04-09 15:02 ` Bryan Donlan
2008-04-10 6:10 ` Johannes Sixt
2008-04-10 6:50 ` [PATCH v2 00/10] Fix git's test suite to pass when the path contains spaces Bryan Donlan
2008-04-10 6:50 ` [PATCH v2 01/10] git-rebase.sh: Fix --merge --abort failures when path contains whitespace Bryan Donlan
2008-04-10 6:50 ` [PATCH v2 02/10] config.c: Escape backslashes in section names properly Bryan Donlan
2008-04-10 6:50 ` [PATCH v2 03/10] git-send-email.perl: Handle shell metacharacters in $EDITOR properly Bryan Donlan
2008-04-10 6:50 ` [PATCH v2 04/10] test-lib.sh: Add a test_set_editor function to safely set $VISUAL Bryan Donlan
2008-04-10 6:50 ` [PATCH v2 05/10] Use test_set_editor in t9001-send-email.sh Bryan Donlan
2008-04-10 6:50 ` [PATCH v2 06/10] test-lib.sh: Fix some missing path quoting Bryan Donlan
2008-04-10 6:50 ` [PATCH v2 07/10] lib-git-svn.sh: Fix quoting issues with paths containing shell metacharacters Bryan Donlan
2008-04-10 6:50 ` [PATCH v2 08/10] Don't use the export NAME=value form in the test scripts Bryan Donlan
2008-04-10 6:50 ` [PATCH v2 09/10] Fix tests breaking when checkout path contains shell metacharacters Bryan Donlan
2008-04-10 6:50 ` [PATCH v2 10/10] Rename the test trash directory to contain " Bryan Donlan
2008-04-10 7:45 ` [PATCH v2 01/10] git-rebase.sh: Fix --merge --abort failures when path contains whitespace Junio C Hamano
2008-04-10 8:48 ` Bryan Donlan
2008-04-11 22:37 ` Junio C Hamano
2008-05-04 5:37 ` [PATCH v3 00/10] Fix git's test suite to pass when the path contains spaces Bryan Donlan
2008-05-04 5:37 ` [PATCH v3 01/10] git-rebase.sh: Fix --merge --abort failures when path contains whitespace Bryan Donlan
2008-05-04 5:37 ` [PATCH v3 02/10] config.c: Escape backslashes in section names properly Bryan Donlan
2008-05-04 5:37 ` [PATCH v3 03/10] git-send-email.perl: Handle shell metacharacters in $EDITOR properly Bryan Donlan
2008-05-04 5:37 ` [PATCH v3 04/10] test-lib.sh: Add a test_set_editor function to safely set $VISUAL Bryan Donlan
2008-05-04 5:37 ` [PATCH v3 05/10] Use test_set_editor in t9001-send-email.sh Bryan Donlan
2008-05-04 5:37 ` [PATCH v3 06/10] test-lib.sh: Fix some missing path quoting Bryan Donlan
2008-05-04 5:37 ` [PATCH v3 07/10] lib-git-svn.sh: Fix quoting issues with paths containing shell metacharacters Bryan Donlan
2008-05-04 5:37 ` [PATCH v3 08/10] Don't use the export NAME=value form in the test scripts Bryan Donlan
2008-05-04 5:37 ` [PATCH v3 09/10] Fix tests breaking when checkout path contains shell metacharacters Bryan Donlan
2008-05-04 5:38 ` [PATCH v3 10/10] Rename the test trash directory to contain spaces Bryan Donlan
2008-05-05 8:25 ` Johannes Sixt
2008-05-05 7:04 ` [PATCH v3 09/10] Fix tests breaking when checkout path contains shell metacharacters Johannes Sixt
2008-05-05 7:57 ` Bryan Donlan
2008-05-05 8:11 ` Johannes Sixt
2008-05-05 7:03 ` [PATCH v3 00/10] Fix git's test suite to pass when the path contains spaces Johannes Sixt
2008-05-05 7:59 ` Bryan Donlan
2008-05-05 8:19 ` Johannes Sixt
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=47FDB85F.9070503@viscovery.net \
--to=j.sixt@viscovery.net \
--cc=aroben@apple.com \
--cc=bdonlan@fushizen.net \
--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.
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).