{"thread":{"id":"47771","subject":"An option to ignore submodules in stash push?","startedAt":"2018-02-06T15:56:22Z","lastAt":"2018-02-06T22:24:18Z","messageCount":2,"participants":["Robert Dailey","Stefan Beller"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"338518","messageId":"CAHd499A26paeZ=WgpdEkU233XbMrfVhgPGB3FHwaFObRKVqQDg@mail.gmail.com","threadId":"47771","inReplyTo":null,"subject":"An option to ignore submodules in stash push?","fromName":"Robert Dailey","fromEmail":"rcdailey.lists@gmail.com","sentAt":"2018-02-06T15:56:15Z","receivedAt":"2018-02-06T15:56:22Z","isPatch":false,"sender":{"key":"rcdailey.lists@gmail.com","avatar":null},"body":"I haven't seen such an option, but I think it would be nice to be able\nto ignore submodules when creating a stash. When I stash changes in a\ndirectory, almost always I intend to only stash real files, not\nmodified submodules. When I pop the stash later, it gets disrupted due\nto submodule conflicts. To avoid getting the conflicts in the first\nplace, it would be nice to somehow specify:\n\n$ git stash push --no-submodules -- MyDirectory/\n\nWould this make sense?\n"},{"id":"338539","messageId":"CAGZ79kZaYiOpp9pu2dY+W-Y2zq-d4HBp=hAbE3UrLKhn8-cXSA@mail.gmail.com","threadId":"47771","inReplyTo":"CAHd499A26paeZ=WgpdEkU233XbMrfVhgPGB3FHwaFObRKVqQDg@mail.gmail.com","subject":"Re: An option to ignore submodules in stash push?","fromName":"Stefan Beller","fromEmail":"sbeller@google.com","sentAt":"2018-02-06T22:24:09Z","receivedAt":"2018-02-06T22:24:18Z","isPatch":false,"sender":{"key":"stefanbeller@gmail.com","avatar":"https://avatars.githubusercontent.com/u/455868?v=4"},"body":"On Tue, Feb 6, 2018 at 7:56 AM, Robert Dailey <rcdailey.lists@gmail.com> wrote:\n> I haven't seen such an option, but I think it would be nice to be able\n> to ignore submodules when creating a stash. When I stash changes in a\n> directory, almost always I intend to only stash real files, not\n> modified submodules. When I pop the stash later, it gets disrupted due\n> to submodule conflicts. To avoid getting the conflicts in the first\n> place, it would be nice to somehow specify:\n>\n> $ git stash push --no-submodules -- MyDirectory/\n>\n> Would this make sense?\n\nWhat kind of submodule conflicts arise?\n\nI remember a recent bugfix with apparent submodules, which\nwere not touched.\n\nhttps://public-inbox.org/git/CABPp-BHDrw_dAESic3xK7kC3jMgKeNQuPQF69OpbVYhRkbhJsw@mail.gmail.com\n\nhttps://github.com/git/git/commit/c641ca67072946f95f87e7b21f13f3d4e73701e3\nwhich is included in 2.16.1\n\nBut this is me taking a wild guess, can you say more about your use case\nand what the actual problem is (and what the expected behavior is, favorably\nas a script) ?\n\nThanks,\nStefan\n"}]}