git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Elijah Newren <newren@gmail.com>
To: ydirson@free.fr
Cc: git <git@vger.kernel.org>
Subject: Re: [BUG] submodule move badly handled by git-rebase
Date: Wed, 8 Apr 2020 09:33:50 -0700	[thread overview]
Message-ID: <CABPp-BHtwTmTT0R7Mu3=YQ=sPDcuvkXqutBjTTBECW4MXQoYWg@mail.gmail.com> (raw)
In-Reply-To: <907083995.810443848.1586362984955.JavaMail.root@zimbra39-e7>

On Wed, Apr 8, 2020 at 9:23 AM <ydirson@free.fr> wrote:
>
> This may be related to another funky behaviour I just noticed, linked
> to moving submodules around:
>
> - when initially created, the $TOP/orig-name submodule's git-dir gets created in
>   $TOP/.git/modules/orig-name, with $TOP/.git/modules/orig-name/config
>   containing a core.worktree value pointing to $TOP/orig-name
> - when moving the submodule, only the submodule worktree is moved, the git-dir
>   being the same $TOP/.git/modules/orig-name, where the core.worktree still
>   points to the old location
>
> Other unwanted behaviour include "git clean" reporting (and possibly cleaning)
> files from the wrong work tree - it took me head-scratching to understand why
> "git clean -fdx" was ignoring all the cruft I had in this worktree...
>
> Why is it that we need a core.worktree setting at all in there ?  Removing it
> allows "git clean" to do what's expected of it.  OTOH it does not make the
> original problem go away...

Not knowing much about submodules, I'm going to leave submodule issues
that don't touch on the merge-machinery or rebase code to someone else
to handle. (I'd probably do the same with the merge-machinery and
rebase side if I wasn't worried about 2.26.0 regressions in rebase and
if I hadn't find a clever way to re-use checkout code to avoid lots of
submodule issues while also deleting code in the "ort" merge
strategy).

Hopefully someone else on the list who knows more about submodules can
chime in on the worktree related bits.

      reply	other threads:[~2020-04-08 16:34 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <702823257.805273759.1586276452976.JavaMail.root@zimbra39-e7>
2020-04-07 16:34 ` [BUG] submodule move badly handled by git-rebase ydirson
2020-04-07 20:49   ` Elijah Newren
2020-04-08  7:52     ` ydirson
2020-04-08 16:21       ` Elijah Newren
2020-04-08 16:23       ` ydirson
2020-04-08 16:33         ` Elijah Newren [this message]

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='CABPp-BHtwTmTT0R7Mu3=YQ=sPDcuvkXqutBjTTBECW4MXQoYWg@mail.gmail.com' \
    --to=newren@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=ydirson@free.fr \
    /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).