On Fri, Dec 7, 2018 at 8:21 PM Yaroslav Halchenko <yoh@xxxxxxxxxxxxxx> wrote: > > > On Fri, 07 Dec 2018, Yaroslav Halchenko wrote: > > > > On Fri, 07 Dec 2018, Stefan Beller wrote: > > > > the initial "git submodule update --reset-hard" is pretty much a > > > > crude workaround for some of those cases, so I would just go earlier in > > > > the history, and redo some things, whenever I could just drop or revert > > > > some selected set of commits. > > > > That makes sense. > > > Do you want to give the implementation a try for the --reset-hard switch? > > > ok, will do, thanks for the blessing ;-) > > The patch is attached (please advise if should be done > differently) and also submitted as PR > https://github.com/git/git/pull/563 Yes, usually we send patches inline (Random example: https://public-inbox.org/git/244bdf2a6fc300f2b535ac8edfc2fbdaf5260266.1544465177.git.gitgitgadget@xxxxxxxxx/T/#u compared to https://public-inbox.org/git/20181208042139.GA4827@xxxxxxxxxxxxxxxxxxxxxxxxx/ (which I am replying to)) See Documentation/SubmittingPatches. There are some tools that provide a GithubPR -> emailPatch workflow at https://github.com/gitgitgadget/git I think if you'd open your pull request there, then it would be automatically mailed to the list correctly. I left some comments on the PR. > > I guess it would need more tests. Writing tests is hard, as we don't know what we expect to break. ;-) > Took me some time to figure out > why I was getting > > fatal: bad value for update parameter > > after all my changes to the git-submodule.sh script after looking at an > example commit 42b491786260eb17d97ea9fb1c4b70075bca9523 which introduced > --merge to the update ;-) Yeah I saw you also updated the submodule related C code, was that fatal message related to that? Thanks, Stefan