From: "W. Trevor King" <wking@tremily.us>
To: Git <git@vger.kernel.org>
Subject: Moving (renaming) submodules, recipe/script
Date: Sun, 06 Jan 2013 19:36:03 -0500 [thread overview]
Message-ID: <20130107003603.GA25698@odin.tremily.us> (raw)
[-- Attachment #1: Type: text/plain, Size: 2325 bytes --]
Today I had to move my first submodule, and I discovered that Git's
support for this is pretty limited. There have been a few patch
series attempting to address this [1,2], but none of them seems to
have pushed through into master (although I can't put my finger on a
reason for why). There are also some SO postings discussing this
[3,4]. It would be nice if `git mv` worked out of the box on
submodules. Failing that, there could be a `git submodule mv` command
that casts the appropriate spell. Failing that, there could be a
recipe in Documentation/git-submodule.txt. Here's the best I could
come up with for a `git-submodule-mv.sh`:
#!/bin/sh
# usage: git-submodule-mv.sh OLD NEW
OLD=$(realpath --relative-to . "$1")
NEW=$(realpath --relative-to . "$2")
SHA=$(git ls-files -s "$OLD" | sed 's|^[0-9]* \([0-9a-f]*\) .*|\1|')
NAME=$(git config -f .gitmodules --get-regexp 'submodule\..*\.path' "$OLD" |
sed -e 's|^submodule.||' -e "s|.path $OLD\$||")
GITDIR=$(realpath --relative-to "$NEW" .git/modules/"$NAME")
git config -f .gitmodules submodule."$NAME".path "$NEW"
git config -f .git/modules/"$NAME"/config core.worktree "../../../$NEW"
git rm --cached "$OLD"
mv "$OLD" "$NEW"
echo "gitdir: $GITDIR" > "$NEW/.git"
git update-index --add --cacheinfo 160000 "$SHA" "$NEW"
This only works from the repository root directory, and I'm sure makes
a number of poor assumptions (e.g. old-style submodules that don't use
`gitdir` links are not supported). It does work for some simple test
cases. The tricky parts (e.g. path -> name conversion) are already
worked out more robustly git-submodule.sh, so adding a new cmd_mv
shouldn't be very difficult.
Could something like this live somewhere in Git, or are we waiting for
a more integrated solution?
Cheers,
Trevor
[1]: http://thread.gmane.org/gmane.comp.version-control.git/88720
[2]: http://thread.gmane.org/gmane.comp.version-control.git/143250
[4]: http://stackoverflow.com/questions/4323558/moving-submodules-with-git
[3]: http://stackoverflow.com/questions/4604486/how-do-i-move-an-existing-git-submodule-within-a-git-repository
--
This email may be signed or encrypted with GnuPG (http://www.gnupg.org).
For more information, see http://en.wikipedia.org/wiki/Pretty_Good_Privacy
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2013-01-07 0:36 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-07 0:36 W. Trevor King [this message]
2013-01-07 1:39 ` Moving (renaming) submodules, recipe/script Jonathan Nieder
2013-01-07 6:59 ` Jens Lehmann
2013-01-07 7:44 ` Junio C Hamano
2013-01-07 8:18 ` Jens Lehmann
2013-01-07 16:08 ` Junio C Hamano
2013-01-07 12:08 ` W. Trevor King
2013-01-08 14:32 ` W. Trevor King
2013-01-08 17:12 ` Jens Lehmann
2013-01-08 17:48 ` W. Trevor King
2013-02-09 12:32 ` [BUG] can't switch branches with submodules W. Trevor King
2013-02-03 23:38 ` Moving (renaming) submodules, recipe/script W. Trevor King
-- strict thread matches above, loose matches on Subject: below --
2013-02-09 12:25 [BUG] can't switch branches with submodules Ramkumar Ramachandra
2013-02-03 22:36 [New Feature] git-submodule-move - Easily move submodules TJ
2013-02-04 20:14 ` Jens Lehmann
2012-10-22 12:37 Git submodule for a local branch? W. Trevor King
2012-10-23 13:21 ` W. Trevor King
2012-10-23 20:57 ` Jens Lehmann
2012-10-23 22:09 ` W. Trevor King
2013-01-08 15:59 ` Moving (renaming) submodules, recipe/script W. Trevor King
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=20130107003603.GA25698@odin.tremily.us \
--to=wking@tremily.us \
--cc=git@vger.kernel.org \
/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).