From: Jens Lehmann <Jens.Lehmann@web.de>
To: Git Mailing List <git@vger.kernel.org>
Cc: Junio C Hamano <gitster@pobox.com>,
Heiko Voigt <hvoigt@hvoigt.net>,
Nguyen Thai Ngoc Duy <pclouds@gmail.com>
Subject: [PATCH v3 0/5] Teach mv to move submodules
Date: Tue, 30 Jul 2013 21:48:15 +0200 [thread overview]
Message-ID: <51F8187F.7040603@web.de> (raw)
Here is my third iteration of this series.
Changes to v2 are:
- I resolved the conflict with Duy's pathspec series by replacing the
use of common_prefix() with relative_path().
- I separated the functions checking for modified unstaged .gitmodules
and staging the changes to that file into another commit, as they
are used by both mv and rm.
- mv and rm now die with the message "Please, stage your changes to
.gitmodules or stash them to proceed" instead of changing and
staging a .gitmodules file containing other unstaged modifications.
- Man pages for mv and rm are updated to tell the user what they do
with the gitlink and the .gitmodules file in case of submodules.
- Minor changes according to the last review (typos and a bit more
efficient coding).
This series applies cleanly on current pu (and I also ran t3600 and
t7001 manually to make sure I don't hit the silent breakage my last
series showed when I ran the whole test suite).
Jens Lehmann (5):
Teach mv to move submodules together with their work trees
Teach mv to move submodules using a gitfile
submodule.c: add .gitmodules staging helper functions
Teach mv to update the path entry in .gitmodules for moved submodules
rm: delete .gitmodules entry of submodules removed from the work tree
Documentation/git-mv.txt | 10 ++-
Documentation/git-rm.txt | 8 ++-
builtin/mv.c | 126 ++++++++++++++++++++++----------------
builtin/rm.c | 19 +++++-
submodule.c | 147 +++++++++++++++++++++++++++++++++++++++++++++
submodule.h | 5 ++
t/t3600-rm.sh | 98 ++++++++++++++++++++++++++++--
t/t7001-mv.sh | 128 +++++++++++++++++++++++++++++++++++++++
t/t7400-submodule-basic.sh | 14 ++---
t/t7610-mergetool.sh | 6 +-
10 files changed, 484 insertions(+), 77 deletions(-)
--
1.8.4.rc0.199.g7079aac
next reply other threads:[~2013-07-30 19:48 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-30 19:48 Jens Lehmann [this message]
2013-07-30 19:49 ` [PATCH v3 1/5] Teach mv to move submodules together with their work trees Jens Lehmann
2013-07-30 19:50 ` [PATCH v3 2/5] Teach mv to move submodules using a gitfile Jens Lehmann
2013-07-31 9:43 ` Fredrik Gustafsson
2013-07-30 19:50 ` [PATCH v3 3/5] submodule.c: add .gitmodules staging helper functions Jens Lehmann
2013-07-30 21:37 ` Junio C Hamano
2013-07-30 23:13 ` Jens Lehmann
2013-07-30 19:51 ` [PATCH v3 4/5] Teach mv to update the path entry in .gitmodules for moved submodules Jens Lehmann
2013-08-06 19:15 ` [PATCH v4 " Jens Lehmann
2013-07-30 19:51 ` [PATCH v3 5/5] rm: delete .gitmodules entry of submodules removed from the work tree Jens Lehmann
2013-07-30 20:15 ` Fredrik Gustafsson
2013-07-30 23:06 ` Jens Lehmann
2013-08-06 19:15 ` [PATCH v4 " Jens Lehmann
2013-08-06 21:11 ` Junio C Hamano
2013-08-07 16:51 ` Jens Lehmann
2013-08-07 18:28 ` Fredrik Gustafsson
2013-08-08 17:11 ` Jens Lehmann
2013-08-08 18:55 ` Fredrik Gustafsson
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=51F8187F.7040603@web.de \
--to=jens.lehmann@web.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=hvoigt@hvoigt.net \
--cc=pclouds@gmail.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.
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).