Web lists-archives.com

Re: An option to ignore submodules in stash push?




On Tue, Feb 6, 2018 at 7:56 AM, Robert Dailey <rcdailey.lists@xxxxxxxxx> wrote:
> I haven't seen such an option, but I think it would be nice to be able
> to ignore submodules when creating a stash. When I stash changes in a
> directory, almost always I intend to only stash real files, not
> modified submodules. When I pop the stash later, it gets disrupted due
> to submodule conflicts. To avoid getting the conflicts in the first
> place, it would be nice to somehow specify:
>
> $ git stash push --no-submodules -- MyDirectory/
>
> Would this make sense?

What kind of submodule conflicts arise?

I remember a recent bugfix with apparent submodules, which
were not touched.

https://public-inbox.org/git/CABPp-BHDrw_dAESic3xK7kC3jMgKeNQuPQF69OpbVYhRkbhJsw@xxxxxxxxxxxxxx

https://github.com/git/git/commit/c641ca67072946f95f87e7b21f13f3d4e73701e3
which is included in 2.16.1

But this is me taking a wild guess, can you say more about your use case
and what the actual problem is (and what the expected behavior is, favorably
as a script) ?

Thanks,
Stefan