From: Johannes Sixt <j.sixt@viscovery.net>
To: Fredrik Gustafsson <iveqy@iveqy.com>
Cc: git@vger.kernel.org, jens.lehmann@web.de, gitster@pobox.com
Subject: Re: [PATCH] Remove perl dependency from git-submodule.sh
Date: Thu, 31 May 2012 13:25:20 +0200 [thread overview]
Message-ID: <4FC75520.2090601@viscovery.net> (raw)
In-Reply-To: <20120531104036.GB30500@paksenarrion.iveqy.com>
Am 5/31/2012 12:40, schrieb Fredrik Gustafsson:
> On Thu, May 31, 2012 at 11:19:04AM +0200, Johannes Sixt wrote:
>> Be prepared for backslashes in the path name:
>>
>> while read -r mode sha1 stage path
>
> We are not using -r on any place in git-submodule.sh. Maybe we should? I
> can provide a patch if needed.
I can imagine that this would fix a bug or two with paths that contain
to-be-quoted characters.
>>> + do
>>> + if test $mode -eq 160000
>>
>> $mode is not a number, but a string: test "$mode" = 160000
>
> okay, fixed in next iteration.
>
>>
>>> + then
>>> + if test $stage -ne 0
>>
>> That $stage looks like a number is of no importance, either.
>
> Actually I don't know what stage does and if it's important here. This
> part is just to mimic the perl code. Should it be removed?
No; you should 'test "$stage" != 0'.
>>> + then
>>> + if test -z "$(echo $unmerged | grep "|$path|")"
>>> + then
>>> + echo "$mode $null_sha1 U\t$path"
>>> + fi
>>> + unmerged="$unmerged|$path|"
>>
>> IIUC, the purpose of $unmerged and this check is to avoid that an unmerged
>> path is dumped for each stage that is listed by ls-files. Therefore it
>> should be sufficient to just check that the current path is different from
>> the last path.
>
> That requires that submodules always is in the same order, right?
ls-files guarantees a suitable order: different stages of the same
submodule path appear on consecutive lines.
-- Hannes
next prev parent reply other threads:[~2012-05-31 12:03 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-31 8:48 [PATCH] Remove perl dependency from git-submodule.sh Fredrik Gustafsson
2012-05-31 9:07 ` Ævar Arnfjörð Bjarmason
2012-05-31 10:37 ` Fredrik Gustafsson
2012-05-31 9:19 ` Johannes Sixt
2012-05-31 10:40 ` Fredrik Gustafsson
2012-05-31 11:25 ` Johannes Sixt [this message]
2012-05-31 17:49 ` Junio C Hamano
2012-05-31 18:48 ` Fredrik Gustafsson
2012-05-31 19:26 ` 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=4FC75520.2090601@viscovery.net \
--to=j.sixt@viscovery.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=iveqy@iveqy.com \
--cc=jens.lehmann@web.de \
/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.
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 NNTP newsgroup(s).