From: Junio C Hamano <gitster@pobox.com>
To: Sylvain Joyeux <sylvain.joyeux@dfki.de>
Cc: Lars Hjemli <hjemli@gmail.com>, Ping Yin <pkufranky@gmail.com>,
Mark Levedahl <mlevedahl@gmail.com>,
git@vger.kernel.org
Subject: Re: [PATCH] fix "git-submodule add a/b/c/repository"
Date: Sat, 05 Jul 2008 23:27:14 -0700 [thread overview]
Message-ID: <7vd4lro7ct.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <20080701150025.GD5852@joyeux> (Sylvain Joyeux's message of "Tue, 1 Jul 2008 17:00:25 +0200")
Sylvain Joyeux <sylvain.joyeux@dfki.de> writes:
> The 'master' version of git-submodule.sh fails to see that
> a/b/c/repository is an already existing repository and messes up the
> whole thing. The following patch fixes that.
> --
> Sylvain
>
>>From 2bca2e17a01cd81ce30f81750583ab943ab57ff0 Mon Sep 17 00:00:00 2001
> From: Sylvain Joyeux <sylvain.joyeux@dfki.de>
> Date: Tue, 1 Jul 2008 16:45:04 +0200
> Subject: [PATCH] fix submodule add for non-toplevel in-project directories
>
> This patch fixes git-submodule add for submodules that
> already exist in the current package tree, in a folder
> which is not at toplevel, i.e.:
>
> git submodule add a/b/c/repository
Which one is the commit log message ;-)?
Perhaps Documentation/SubmittingPatches needs a review?
> +test_expect_success 'adding an already-existing repository deep in the directory hierarchy' '
> +
> + mkdir dir0 &&
> + mkdir dir0/dir1 &&
> + git clone init dir0/dir1/init &&
> + git-submodule add dir0/dir1/init &&
> + git-submodule status | grep "dir0/dir1/init"
> +'
I am not sure if this is fixing a sane use case. "submodule add" is
documented to take:
'git submodule' [--quiet] add [-b branch] [--] <repository> [<path>]
and you are adding at dir0/dir1/init a submodule that will interact with "init"
repository, so shouldn't that command line be something like:
git submodule add init dir0/dir1/init
???
Confused..
next prev parent reply other threads:[~2008-07-06 6:29 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-01 15:00 [PATCH] fix "git-submodule add a/b/c/repository" Sylvain Joyeux
2008-07-06 6:27 ` Junio C Hamano [this message]
2008-07-06 16:11 ` Sylvain Joyeux
2008-07-06 19:05 ` Mark Levedahl
2008-07-07 6:34 ` Sylvain Joyeux
2008-07-08 2:23 ` Mark Levedahl
2008-07-08 2:42 ` Junio C Hamano
2008-07-08 3:26 ` Mark Levedahl
2008-07-08 6:02 ` Junio C Hamano
2008-07-08 23:57 ` Mark Levedahl
2008-07-09 3:59 ` [PATCH] git-submodule - make "submodule add" more strict, and document it Mark Levedahl
2008-07-09 6:04 ` Junio C Hamano
2008-07-10 1:05 ` Mark Levedahl
2008-07-10 1:05 ` [PATCH] git-submodule - register submodule URL if adding in place Mark Levedahl
2008-07-08 8:08 ` [PATCH] fix "git-submodule add a/b/c/repository" Sylvain Joyeux
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=7vd4lro7ct.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=hjemli@gmail.com \
--cc=mlevedahl@gmail.com \
--cc=pkufranky@gmail.com \
--cc=sylvain.joyeux@dfki.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).