From: "Lars Hjemli" <hjemli@gmail.com>
To: "Josef Weidendorfer" <Josef.Weidendorfer@gmx.de>
Cc: "Junio C Hamano" <junkio@cox.net>, git@vger.kernel.org
Subject: Re: [PATCH] Let .git/config specify the url for submodules
Date: Fri, 1 Jun 2007 11:17:01 +0200 [thread overview]
Message-ID: <8c5c35580706010217q3eb9384fx2f6d5edd6e92a6e@mail.gmail.com> (raw)
In-Reply-To: <200706011008.38063.Josef.Weidendorfer@gmx.de>
On 6/1/07, Josef Weidendorfer <Josef.Weidendorfer@gmx.de> wrote:
> > On 5/28/07, Lars Hjemli <hjemli@gmail.com> wrote:
> > 3) 'git-submodule push' runs something like 'cd $path && git push
> > origin $branch', where $branch is found in .gitmodules
> > (path.$path.branch).
>
> So if you need superproject related corrections in the submodule,
> you always have to do it on branch "path.$path.branch" in the
> submodule to get it saved?
>
> I would assume that pushing the current branch should be enough.
> If you want to play with multiple different "corrections" on
> different branches in the submodule, you do not want to force
> the branch name to a unique one given in .gitmodules.
>
The current (and planned) implementation of git-submodule detaches
HEAD in the submodules, so there will not be a current branch unless
the user has done 'cd $path && git-checkout somebranch'.
We might take advantage of that fact:
* try to exec 'git-symbolic-ref HEAD'
* if it fails, push to path.$path.branch
* otherwise, push to the ref pointed to by HEAD
But this will still loose any changes on _other_ branches (that has
not been pushed to origin manually). I'm not sure if/how we can avoid
this, except by making $path be a symlink to .git/submodules/$name.git
(which has other issues...)
--
larsh
next prev parent reply other threads:[~2007-06-01 9:17 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-05-28 20:51 [PATCH] Let .git/config specify the url for submodules Lars Hjemli
2007-05-31 0:17 ` Lars Hjemli
2007-05-31 23:43 ` Junio C Hamano
2007-06-01 8:08 ` Josef Weidendorfer
2007-06-01 9:17 ` Lars Hjemli [this message]
2007-06-01 8:57 ` Sven Verdoolaege
2007-06-01 9:25 ` Lars Hjemli
2007-06-01 9:35 ` Sven Verdoolaege
2007-06-01 14:45 ` Lars Hjemli
2007-06-01 14:51 ` Sven Verdoolaege
2007-06-01 15:56 ` Lars Hjemli
2007-06-01 16:29 ` Linus Torvalds
2007-06-01 19:55 ` Junio C Hamano
2007-06-02 7:13 ` Lars Hjemli
2007-06-02 7:44 ` Sven Verdoolaege
2007-06-02 8:39 ` Lars Hjemli
2007-06-02 9:15 ` Junio C Hamano
2007-06-02 9:53 ` Lars Hjemli
2007-06-02 10:12 ` Junio C Hamano
2007-06-02 10:38 ` Lars Hjemli
2007-07-20 17:23 ` [PATCH] git-submodule fixes for call to git config --get-regexp Chris Larson
2007-07-20 18:07 ` Junio C Hamano
2007-07-20 18:36 ` Johannes Schindelin
2007-07-25 0:09 ` submodule init problem Ricky Nite
2007-07-25 0:30 ` Ricky Nite
2007-07-25 1:49 ` Junio C Hamano
2007-07-25 8:15 ` Sven Verdoolaege
2007-07-25 20:25 ` Lars Hjemli
2007-07-25 20:31 ` Johannes Schindelin
2007-07-25 20:40 ` Lars Hjemli
2007-07-25 20:50 ` Johannes Schindelin
2007-07-25 22:20 ` Junio C Hamano
2007-07-25 23:43 ` Ricky Nite
2007-07-25 23:49 ` Junio C Hamano
2007-06-02 7:49 ` [PATCH] Let .git/config specify the url for submodules Sven Verdoolaege
2007-06-02 16:34 ` Linus Torvalds
2007-06-02 17:35 ` Sven Verdoolaege
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=8c5c35580706010217q3eb9384fx2f6d5edd6e92a6e@mail.gmail.com \
--to=hjemli@gmail.com \
--cc=Josef.Weidendorfer@gmx.de \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
/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).