From: Junio C Hamano <gitster@pobox.com>
To: "brian m. carlson" <sandals@crustytoothpaste.net>
Cc: Rose Kunkel <rose@rosekunkel.me>,
git@vger.kernel.org, Jonathan Tan <jonathantanmy@google.com>,
Emily Shaffer <emilyshaffer@google.com>
Subject: Re: [BUG] `git reset --hard` fails with `update = none` submodules
Date: Wed, 16 Jun 2021 12:10:27 +0900 [thread overview]
Message-ID: <xmqqeed2sdwc.fsf@gitster.g> (raw)
In-Reply-To: <YMlS+1F9IND7vxNI@camp.crustytoothpaste.net> (brian m. carlson's message of "Wed, 16 Jun 2021 01:25:15 +0000")
"brian m. carlson" <sandals@crustytoothpaste.net> writes:
> On 2021-06-16 at 01:03:40, Rose Kunkel wrote:
>> Potentially relevant: `git config --global --list` shows
>> ```
>> status.showstash=true
>> status.submodulesummary=true
>> submodule.recurse=true
>
> Thanks for this additional information. This line is the critical
> piece. Now I get this:
>
> $ git reset --hard
> fatal: not a git repository: ../../.git/modules/repos/agda
> fatal: could not reset submodule index
>
> Predictably, "git -c submodules.recurse=true reset --hard" also results
> in the same thing.
>
> The --recurse-submodules option for git reset says this (emphasis mine):
>
> When the working tree is updated, using --recurse-submodules will also
> recursively reset the working tree of all *active* submodules
> according to the commit recorded in the superproject, also setting the
> submodules' HEAD to be detached at that commit.
>
> On my system, .git/config has this:
>
> [submodule]
> active = .
>
> So these submodules are active, but they probably should not be, since
> we haven't checked anything out (or, for that matter, cloned any data)
> and it wouldn't make sense to try to operate on them automatically with
> submodules.recurse or --recurse-submodules.
>
> My gut tells me that we should probably mark submodules with update=none
> set on a clone as inactive. Of course, this is a tricky area that I'm
> not super familiar with, so opinions or thoughts are welcome.
>
> If folks think this is a good way forward, I'll look into writing a
> patch, probably tomorrow evening since it's starting to get late here.
Cc'ing some folks who recently mumbled the word "submodule" in their
recent topics for input.
Thanks.
next prev parent reply other threads:[~2021-06-16 3:10 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-16 0:16 [BUG] `git reset --hard` fails with `update = none` submodules Rose Kunkel
2021-06-16 0:51 ` brian m. carlson
2021-06-16 0:57 ` Rose Kunkel
2021-06-16 1:03 ` Rose Kunkel
2021-06-16 1:15 ` Rose Kunkel
2021-06-16 1:25 ` brian m. carlson
2021-06-16 1:39 ` Rose Kunkel
2021-06-16 1:46 ` Rose Kunkel
2021-06-16 3:10 ` Junio C Hamano [this message]
2021-06-16 13:20 ` Philippe Blain
2021-06-17 23:52 ` brian m. carlson
2021-06-19 21:44 ` [PATCH] submodule: mark submodules with update=none as inactive brian m. carlson
2021-06-22 3:45 ` Philippe Blain
2021-06-25 23:02 ` brian m. carlson
2021-06-26 15:12 ` Philippe Blain
2021-07-01 22:51 ` [PATCH v2] " brian m. carlson
2021-07-09 20:26 ` Philippe Blain
2021-07-11 16:59 ` brian m. carlson
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=xmqqeed2sdwc.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=emilyshaffer@google.com \
--cc=git@vger.kernel.org \
--cc=jonathantanmy@google.com \
--cc=rose@rosekunkel.me \
--cc=sandals@crustytoothpaste.net \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.