git stash doesn't handle submodules with modifications

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Stash in combination with a submodule does not work as
expected. A submodule with modifications is not handled
correctly if it has modifications.

I started with some changes in the working tree and with
a submodule having changes, too. I do 'git stash', which
stashes away all my changes to the working tree, but it
does not store changes to the submodule. Thus,
'git status' still shows a modified submodule.

'git apply' refuses to work with a modified submodule with:
'Cannot restore on top of a dirty state'.

So, I have stashed my changes, but can't get them back
easily. This happend to me in the msysgit repo, which
includes git as a submodule.

What would be the right way to solve this?
I'd expect that stash somehow would ignore the submodule.
But it may be more correct to include the submodule into
the stash?

	Steffen
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux