From: Jens Lehmann <Jens.Lehmann@web.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: What's cooking in git.git (May 2013, #09; Wed, 29)
Date: Mon, 03 Jun 2013 23:27:01 +0200 [thread overview]
Message-ID: <51AD0A25.5080101@web.de> (raw)
In-Reply-To: <7v61xwpct5.fsf@alter.siamese.dyndns.org>
Am 02.06.2013 20:50, schrieb Junio C Hamano:
> Jens Lehmann <Jens.Lehmann@web.de> writes:
>
>> Am 30.05.2013 01:58, schrieb Junio C Hamano:
>>> * jl/submodule-mv (2013-04-23) 5 commits
>>> (merged to 'next' on 2013-04-23 at c04f574)
>>> + submodule.c: duplicate real_path's return value
>>> (merged to 'next' on 2013-04-19 at 45ae3c9)
>>> + rm: delete .gitmodules entry of submodules removed from the work tree
>>> + Teach mv to update the path entry in .gitmodules for moved submodules
>>> + Teach mv to move submodules using a gitfile
>>> + Teach mv to move submodules together with their work trees
>>>
>>> "git mv A B" when moving a submodule A does "the right thing",
>>> inclusing relocating its working tree and adjusting the paths in
>>> the .gitmodules file.
<detailed discussion snipped>
> So my gut feeling of the "fix" at this point in the evolution of the
> program may be to error out with a message like "You have local
> changes to .gitmodules; please stash it before moving or removing".
Yeah, me too thinks that this is a sane short term solution (even
though a "git submodule add" currently happily stages any unstaged
modifications to the .gitmodules file too, that should not stop us
from doing better for rm and mv ;-).
And I also agree that in the long run the the git-config aware merge
driver together with the 3-way merge of a modified .gitmodules file
you described is the best solution. But I'd really like to complete
the recursive update before tackling that, so for now I just added
these two to the to-do list on my GitHub wiki page.
I'll resubmit this series with the strlen() fix and the erroring out
in case of unstaged modifications of the .gitmodules file as soon as
I find some time.
next prev parent reply other threads:[~2013-06-03 21:27 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-29 23:58 What's cooking in git.git (May 2013, #09; Wed, 29) Junio C Hamano
2013-05-30 9:47 ` Thomas Rast
2013-05-30 9:56 ` Ramkumar Ramachandra
2013-06-02 23:44 ` Junio C Hamano
2013-05-30 19:18 ` Jens Lehmann
2013-06-02 18:50 ` Junio C Hamano
2013-06-03 21:27 ` Jens Lehmann [this message]
2013-07-01 22:05 ` Junio C Hamano
2013-05-30 19:23 ` Jens Lehmann
2013-05-31 19:40 ` John Keeping
2013-06-03 14:54 ` John Keeping
2013-06-03 15:30 ` Junio C Hamano
2013-06-03 21:47 ` Jens Lehmann
2013-06-03 22:23 ` John Keeping
2013-06-04 5:29 ` Heiko Voigt
2013-06-04 8:10 ` John Keeping
2013-06-04 11:17 ` Heiko Voigt
2013-06-04 12:48 ` John Keeping
2013-06-04 21:39 ` Jens Lehmann
2013-06-04 22:04 ` John Keeping
2013-06-04 22:57 ` Re: " Phil Hord
2013-06-05 8:19 ` John Keeping
2013-05-31 6:16 ` Øystein Walle
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=51AD0A25.5080101@web.de \
--to=jens.lehmann@web.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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).