git/list[1] front-page[2] threads[3] people[4] search[5] about
 

bug?: git reset --mixed ignores deinitialized submodules

From
David Turner <novalis@novalis.org>
Date
Mar 10, 2017, 21:06 UTC
Message-ID
<1489180018.10192.45.camel@novalis.org>

Git reset --mixed ignores submodules which are not initialized. I've attached a demo script.  

On one hand, this matches the documentation ("Resets the index but not the working tree"). But on the other hand, it kind of doesn't: "(i.e., the changed files are preserved but not marked for commit)".

It's hard to figure out what a mixed reset should do. It would be weird for it to initialize the submodule. Maybe it should just refuse to run? Maybe there should be an option for it to initialize the submodule for you? Maybe it should drop a special-purpose file that git understands to be a submodule change? For instance (and this is insane, but, like, maybe worth considering) it could use extended filesystem attributes, where available.

#!/bin/bash mkdir demo cd demo

git init main
(
	git init sub1 &&
	cd sub1 &&
	dd if=/dev/urandom of=f bs=40 count=1 &&
	git add f &&
	git commit -m f
) &&
(
	cd main &&
	git submodule add ../sub1 sub1 &&
	git commit -m 'add submodule' &&
	git tag start
) &&
# add a commit on sub1
(
	cd main/sub1 &&
	echo morx > f &&
	git add f &&
	git commit -m 'a commit'
) &&
# commit that change on main,  deinit the submodule and do a mixed
reset
(
	cd main &&
	git add sub1 &&
	git commit -m 'update sub1' &&
	git submodule deinit sub1 &&
	git reset --mixed HEAD^ &&
	git status # change to sub1 is lost
)
Next: Stefan Beller
Message 1 of 5 in “bug?: git reset --mixed ignores deinitialized submodules”
  1. David TurnerMar 10, 2017
  2. Stefan BellerMar 13, 2017
  3. David TurnerMar 13, 2017
  4. Stefan BellerMar 13, 2017
  5. David TurnerMar 13, 2017

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.