From: Michael J Gruber <git@drmicha.warpmail.net>
To: git@vger.kernel.org
Cc: Andrei Thorp <garoth@gmail.com>, Junio C Hamano <gitster@pobox.com>
Subject: [PATCH 2/2] git submodule: Fix adding of submodules at paths with ./
Date: Wed, 25 Feb 2009 12:03:40 +0100 [thread overview]
Message-ID: <1235559820-3096-3-git-send-email-git@drmicha.warpmail.net> (raw)
In-Reply-To: <1235559820-3096-2-git-send-email-git@drmicha.warpmail.net>
Make 'git submodule add' strip './' from the submodule path in the same
way as 'git ls-files' does, so that 'git submodule init' looks up the
information in .gitmodules with the same key under which 'git submodule
add' stores it.
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
---
git-submodule.sh | 3 +++
t/t7400-submodule-basic.sh | 2 +-
2 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/git-submodule.sh b/git-submodule.sh
index 204aab6..4f26be4 100755
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -167,6 +167,9 @@ cmd_add()
;;
esac
+ # strip superfluous ./ from path
+ path=$(echo "$path" | sed -e 's|^\(\./\)*||' -e's|/\./|/|g')
+
# strip trailing slashes from path
path=$(echo "$path" | sed -e 's|/*$||')
diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh
index b154050..1757732 100755
--- a/t/t7400-submodule-basic.sh
+++ b/t/t7400-submodule-basic.sh
@@ -59,7 +59,7 @@ test_expect_success 'submodule add' '
git submodule init
'
-test_expect_failure 'submodule add with ./ in path' '
+test_expect_success 'submodule add with ./ in path' '
git submodule add "$submodurl" ././dotsubmod/./frotz/./ &&
git submodule init
'
--
1.6.2.rc1.30.gd43c
next prev parent reply other threads:[~2009-02-25 11:06 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 ` Michael J Gruber [this message]
2009-02-25 11:21 ` [PATCH 2/2] git submodule: Fix adding of submodules at paths with ./ 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
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=1235559820-3096-3-git-send-email-git@drmicha.warpmail.net \
--to=git@drmicha.warpmail.net \
--cc=garoth@gmail.com \
--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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.