From: Fredrik Gustafsson <iveqy@iveqy.com>
To: gitster@pobox.com
Cc: git@vger.kernel.org, iveqy@iveqy.com, jens.lehmann@web.de
Subject: [[PATCH v3] 2/2] [submodule] Replace perl-code with sh
Date: Fri, 14 Jun 2013 17:56:05 +0200 [thread overview]
Message-ID: <1371225365-4219-3-git-send-email-iveqy@iveqy.com> (raw)
In-Reply-To: <1371225365-4219-1-git-send-email-iveqy@iveqy.com>
This will prevent a fork and makes the code similair to the rest of the
file.
In the long term 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 I don't think that keeping that small
perl-part will ease any rewrite.
Signed-off-by: Fredrik Gustafsson <iveqy@iveqy.com>
---
git-submodule.sh | 51 ++++++++++++++++++++++-----------------------------
1 file changed, 22 insertions(+), 29 deletions(-)
diff --git a/git-submodule.sh b/git-submodule.sh
index bad051e..be96934 100755
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -112,38 +112,31 @@ resolve_relative_url ()
#
module_list()
{
+ null_sha1=0000000000000000000000000000000000000000
+ unmerged=
(
git -c core.quotepath=false ls-files --error-unmatch --stage -- "$@" ||
- echo "unmatched pathspec exists"
+ echo "#unmatched"
) |
- 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"
+ elif 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.1.381.g2ab719e.dirty
prev parent reply other threads:[~2013-06-14 15:53 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-14 15:56 [[PATCH v3] 0/2] module_list enhancements Fredrik Gustafsson
2013-06-14 15:56 ` [[PATCH v3] 1/2] [submodule] handle multibyte characters in name Fredrik Gustafsson
2013-06-14 17:23 ` Junio C Hamano
2013-06-14 18:27 ` Fredrik Gustafsson
2013-06-14 18:33 ` Junio C Hamano
2013-06-14 15:56 ` Fredrik Gustafsson [this message]
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=1371225365-4219-3-git-send-email-iveqy@iveqy.com \
--to=iveqy@iveqy.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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.
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).