From: Fredrik Gustafsson <iveqy@iveqy.com>
To: iveqy@iveqy.com
Cc: gitster@pobox.com, git@vger.kernel.org, jens.lehmann@web.de,
hvoigt@hvoigt.net
Subject: [PATCH 2/2] [submodule] Replace perl-code with sh
Date: Wed, 12 Jun 2013 01:04:14 +0200 [thread overview]
Message-ID: <1370991854-1414-3-git-send-email-iveqy@iveqy.com> (raw)
In-Reply-To: <1370991854-1414-1-git-send-email-iveqy@iveqy.com>
This is a work built on
http://thread.gmane.org/gmane.comp.version-control.git/198873/focus=198930
Basically git-submodule.sh needs to use something else than sh to handle
newline in filenames (and therefore needs to use a language that accepts
\0 in strings).
However, since we're not there yet. I've thrown out the only
perl-dependency for git-submodule.sh. It decreases the number of
lines of code and uses the same solution as the rest of the script
already do.
This would lead to less forks and faster code. A simple testrun of
t7400-submodule-basic.sh before this patch resulted in:
real 0m8.359s
user 0m8.921s
sys 0m3.888s
real 0m9.062s
user 0m9.025s
sys 0m3.784s
real 0m8.490s
user 0m9.065s
sys 0m3.740s
After this patch was applied:
real 0m7.417s
user 0m8.717s
sys 0m3.804s
real 0m7.873s
user 0m8.821s
sys 0m3.692s
real 0m8.950s
user 0m8.765s
sys 0m3.760s
Signed-off-by: Fredrik Gustafsson <iveqy@iveqy.com>
---
git-submodule.sh | 52 +++++++++++++++++++++++-----------------------------
1 file changed, 23 insertions(+), 29 deletions(-)
diff --git a/git-submodule.sh b/git-submodule.sh
index 31524d3..1652781 100755
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -112,39 +112,33 @@ resolve_relative_url ()
#
module_list()
{
+ null_sha1=0000000000000000000000000000000000000000
+ unmerged=
(
git ls-files --error-unmatch --stage -z -- "$@" ||
- echo "unmatched pathspec exists"
+ echo "#unmatched"
) |
sed -e 's/\x00/\n/g' |
- perl -e '
- my %unmerged = ();
- my ($null_sha1) = ("0" x 40);
- my @out = ();
- my $unmatched = 0;
- while (<STDIN>) {
- if (/^unmatched pathspec/) {
- $unmatched = 1;
- next;
- }
- chomp;
- my ($mode, $sha1, $stage, $path) =
- /^([0-7]+) ([0-9a-f]{40}) ([0-3])\t(.*)$/;
- next unless $mode eq "160000";
- if ($stage ne "0") {
- if (!$unmerged{$path}++) {
- push @out, "$mode $null_sha1 U\t$path\n";
- }
- next;
- }
- push @out, "$_\n";
- }
- if ($unmatched) {
- print "#unmatched\n";
- } else {
- print for (@out);
- }
- '
+ while read mode sha1 stage path
+ do
+ if test $mode = "#unmatched"
+ then
+ echo "#unmatched"
+ fi
+ if test $mode = "160000"
+ then
+ if test $stage != "0"
+ then
+ if test "$unmerged" != "$path"
+ then
+ echo "$mode $null_sha1 U $path"
+ fi
+ unmerged="$path"
+ else
+ echo "$mode $sha1 $stage $path"
+ fi
+ fi
+ done
}
die_if_unmatched ()
--
1.8.3.253.g20b40b5.dirty
next prev parent reply other threads:[~2013-06-11 23:01 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-11 23:04 [PATCH 0/2] module_list enhancements Fredrik Gustafsson
2013-06-11 23:04 ` [PATCH 1/2] [submodule] handle multibyte characters in name Fredrik Gustafsson
2013-06-12 21:06 ` [PATCH 1/2] submodule: " Junio C Hamano
2013-06-12 21:38 ` Jens Lehmann
2013-06-12 22:57 ` Junio C Hamano
2013-06-12 23:10 ` Fredrik Gustafsson
2013-06-13 1:41 ` [PATCH 1/2] [submodule] " Phil Hord
2013-06-11 23:04 ` Fredrik Gustafsson [this message]
2013-06-12 21:08 ` [PATCH 2/2] [submodule] Replace perl-code with sh 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
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=1370991854-1414-3-git-send-email-iveqy@iveqy.com \
--to=iveqy@iveqy.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=hvoigt@hvoigt.net \
--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.
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).