From: Peter Collingbourne <peter@pcc.me.uk>
To: git@vger.kernel.org
Subject: [PATCH 00/12] Improve handling of moving and removing submodules
Date: Fri, 26 Mar 2010 15:25:28 +0000 [thread overview]
Message-ID: <1269617140-7827-1-git-send-email-peter@pcc.me.uk> (raw)
This patch series deals with a number of issues associated with moving
and removing submodules. Specifically it improves submodule support
in the following subcommands: apply merge mv rm
This series was inspired by an earlier unmerged series [1] by Petr
Baudis.
[1] http://kerneltrap.org/mailarchive/git/2008/7/16/2533024
Documentation/git-mv.txt | 8 ++-
Documentation/git-rm.txt | 5 ++-
Documentation/git-submodule.txt | 8 +++-
builtin/apply.c | 8 +--
builtin/mv.c | 33 +++++++++++--
builtin/rm.c | 45 ++++++++++++++---
dir.c | 4 +-
dir.h | 2 +-
git-compat-util.h | 9 +++
git-submodule.sh | 95 +++++++++++++++++++++++++++++++++--
merge-recursive.c | 27 ++++++----
t/t4134-apply-submodule.sh | 38 ++++++++++++++
t/t7403-submodule-sync.sh | 2 +-
t/t7405-submodule-merge.sh | 13 +++++
t/t7406-submodule-update.sh | 6 +-
t/t7407-submodule-foreach.sh | 14 +++---
t/t7409-submodule-mv-rm.sh | 105 +++++++++++++++++++++++++++++++++++++++
unpack-trees.c | 12 +----
wrapper.c | 22 ++++++--
19 files changed, 390 insertions(+), 65 deletions(-)
next reply other threads:[~2010-03-26 15:27 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-26 15:25 Peter Collingbourne [this message]
2010-03-26 15:25 ` [PATCH 01/12] Generate unique ID for submodules created using "git submodule add" Peter Collingbourne
2010-03-27 9:44 ` Jonathan Nieder
2010-04-03 20:04 ` Peter Collingbourne
2010-04-03 20:04 ` [PATCH 1/2] Prefix submodule names with the path basename Peter Collingbourne
2010-04-03 20:04 ` [PATCH 2/2] Truncate the SHA1 part of the submodule name to 7 characters Peter Collingbourne
2010-03-26 15:25 ` [PATCH 02/12] Implement "git mv" for submodules Peter Collingbourne
2010-03-26 15:25 ` [PATCH 03/12] git rm: display a warning for every unremovable file Peter Collingbourne
2010-03-27 11:01 ` Jonathan Nieder
2010-03-26 15:25 ` [PATCH 04/12] Generalise the unlink_or_warn function Peter Collingbourne
2010-03-26 15:25 ` [PATCH 05/12] Implement the rmdir_or_warn function Peter Collingbourne
2010-03-26 15:25 ` [PATCH 06/12] Introduce remove_or_warn function Peter Collingbourne
2010-03-26 15:25 ` [PATCH 07/12] Remove a redundant errno test in a usage of remove_path Peter Collingbourne
2010-03-26 15:25 ` [PATCH 08/12] git rm: collect file modes Peter Collingbourne
2010-03-26 15:25 ` [PATCH 09/12] Add a mode parameter to the remove_path function Peter Collingbourne
2010-03-26 15:25 ` [PATCH 10/12] git rm: do not abort due to an initialised submodule Peter Collingbourne
2010-03-26 15:25 ` [PATCH 11/12] git submodule: infrastructure for reading .gitmodules files in arbitrary locations Peter Collingbourne
2010-03-26 15:25 ` [PATCH 12/12] git rm: remove submodule entries from .gitmodules Peter Collingbourne
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=1269617140-7827-1-git-send-email-peter@pcc.me.uk \
--to=peter@pcc.me.uk \
--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.
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).