From: Michael J Gruber <git@drmicha•warpmail.net>
To: Johannes Sixt <j.sixt@viscovery•net>
Cc: git@vger•kernel.org, Andrei Thorp <garoth@gmail•com>,
Junio C Hamano <gitster@pobox•com>
Subject: Re: [PATCHv2 4/4] git submodule: Fix handling of // and /.. in paths for added submodules
Date: Wed, 25 Feb 2009 15:33:57 +0100 [thread overview]
Message-ID: <49A556D5.7020806@drmicha.warpmail.net> (raw)
In-Reply-To: <49A55056.8020504@viscovery.net>
Johannes Sixt venit, vidit, dixit 25.02.2009 15:06:
> Michael J Gruber schrieb:
>> @@ -167,6 +167,12 @@ cmd_add()
>> ;;
>> esac
>>
>> + # simplify multiple /
>> + path=$(echo "$path" | sed -e 's|/\+|/|g')
>
> I think we have so far avoided \+ in sed expressions for portability reasons.
Hmmpf. Is it that new, or gnu specific? I'm always afraid of portability
issues with bash but wasn't aware of sed being an issue as well.
In any case, would 's|\\*|/|g' be better (more portable) then?
>> +
>> + # resolve /.. (add trailing / for matching /..$)
>> + path=$(echo "$path/" | sed -e 's|\([^/]*\)/../||g')
>
> This does not work if there are more than two ../ in a row:
>
> $ echo a/b/c/../../d | sed -e 's|\([^/]*\)/\.\./||g'
> a/b/../d
Now you got me ;)
It seems I misunderstood the meaning of 'g'. It's really multiple
matches in one step, not recursively matching multiple times.
> (and make this /\.\./ instead of /../).
Oh yes, you're right, my oversight. Thanks!
I guess this is why test writing and coding should not be done by the
same person...
>> +
>> # strip superfluous ./ from path
>> path=$(echo "$path" | sed -e 's|^\(\./\)*||' -e's|/\./|/|g')
>
> The latter two transformations should be swapped; otherwise you would
> transform foo/./../bar into foo/bar.
Yes! I just checked, and git ls-files get's this right, so g-sm-add
should as well.
> Perhaps it's now time to write this as:
>
> # normalize path
> path=$(printf '%s\n' "$path" |
> sed -e '
> # simplify multiple /
> s|//*|/|g
> # strip superfluous ./
> s|^\(\./\)*||
> s|/\./|/|g
> # resolve /..
> s|\([^/]*\)/\.\./||g
> # strip trailing slashes
> s|/*$||
> ')
>
> But unless you know how to solve the ../../ case with a sed program, I
> suggest that you keep things simple and take care only of the common cases.
>
> -- Hannes
Well, how is
echo a/b/c/../../d | sed -e ':start;s|\([^/]*\)/\.\./||g;tstart'
a/d
I meant: how portable is...
Cheers,
Michael
next prev parent reply other threads:[~2009-02-25 14:35 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <80055d7c0902241541o5c8fad50ra4eace5919bcf6df@mail.gmail.com>
2009-02-24 23:56 ` Fwd: Git Submodule Misbehaviour With ./ Andrei Thorp
2009-02-25 11:03 ` [PATCH 0/2] Fix git submodule add for paths with ./ Michael J Gruber
2009-02-25 11:03 ` [PATCH 1/2] git submodule: Add test cases for git submodule add Michael J Gruber
2009-02-25 11:03 ` [PATCH 2/2] git submodule: Fix adding of submodules at paths with ./ Michael J Gruber
2009-02-25 11:21 ` Johannes Sixt
2009-02-25 12:35 ` Michael J Gruber
2009-02-25 13:04 ` Johannes Sixt
2009-02-25 13:26 ` [PATCHv2 0/4] Fix git submodule add for funky paths Michael J Gruber
2009-02-25 13:26 ` [PATCHv2 1/4] git submodule: Add test cases for git submodule add Michael J Gruber
2009-02-25 13:26 ` [PATCHv2 2/4] git submodule: Fix adding of submodules at paths with ./ Michael J Gruber
2009-02-25 13:26 ` [PATCHv2 3/4] git submodule: Add more tests for add with funky paths Michael J Gruber
2009-02-25 13:26 ` [PATCHv2 4/4] git submodule: Fix handling of // and /.. in paths for added submodules Michael J Gruber
2009-02-25 14:06 ` Johannes Sixt
2009-02-25 14:33 ` Michael J Gruber [this message]
2009-02-25 15:03 ` Johannes Sixt
2009-02-25 21:25 ` Junio C Hamano
2009-02-26 9:05 ` Michael J Gruber
2009-02-26 17:04 ` Junio C Hamano
2009-03-03 12:39 ` [PATCHv3 0/2] git submodule: normalize paths before adding Michael J Gruber
2009-03-03 12:39 ` [PATCHv3 1/2] git submodule: Add test cases for git submodule add Michael J Gruber
2009-03-03 12:39 ` [PATCHv3 2/2] git submodule: Fix adding of submodules at paths with ./, .. and // Michael J Gruber
2009-03-03 13:08 ` Johannes Sixt
2009-03-03 14:09 ` Michael J Gruber
2009-03-03 15:08 ` [PATCHv4 0/2] git submodule: normalize paths before adding Michael J Gruber
2009-03-03 15:08 ` [PATCHv4 1/2] git submodule: Add test cases for git submodule add Michael J Gruber
2009-03-03 15:08 ` [PATCHv4 2/2] git submodule: Fix adding of submodules at paths with ./, .. and // Michael J Gruber
2009-03-03 15:28 ` Johannes Sixt
2009-03-03 15:39 ` Michael J Gruber
2009-03-03 16:32 ` [PATCHv4 0/2] git submodule: normalize paths before adding Junio C Hamano
2009-03-03 15:36 ` [PATCHv3 2/2] git submodule: Fix adding of submodules at paths with ./, .. and // Junio C Hamano
2009-03-03 15:48 ` Michael J Gruber
2009-03-03 14:29 ` Johannes Schindelin
2009-03-03 14:58 ` Michael J Gruber
2009-02-25 21:25 ` [PATCH 2/2] git submodule: Fix adding of submodules at paths with ./ Junio C Hamano
2009-02-25 21:24 ` [PATCH 1/2] git submodule: Add test cases for git submodule add Junio C Hamano
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=49A556D5.7020806@drmicha.warpmail.net \
--to=git@drmicha$(echo .)warpmail.net \
--cc=garoth@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
--cc=j.sixt@viscovery$(echo .)net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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