Re: git push failing when push.recurseSubmodules on-demand and git commit --amend was used in submodule.

2017-01-31 Thread Carlo Wood
hed out). That would work, but would be a horrible workaround for an existing bug :p > 2. If the amend is good and ready to go, "git add" to update the > superproject to make that amended result the one that is needed > in the submodule. This was already done, also in the script that I provided. Yet, the push in the superproject is still rejected. -- Carlo Wood <ca...@alinoe.com>

Re: git push failing when push.recurseSubmodules on-demand and git commit --amend was used in submodule.

2017-01-31 Thread Carlo Wood
ushd parent git add subm git commit -m 'Updated subm.' popd The commit from before the amend was added to the super project (but never pushed) but has now been completely replaced. I still think this is a flaw in git. It shouldn't not complain and simply push. -- Carlo Wood <ca...@alinoe.com>

git push failing when push.recurseSubmodules on-demand and git commit --amend was used in submodule.

2017-01-29 Thread Carlo Wood
submodule that is clean and pushed. # # Create an empty directory, put this script in it # and run the script. # # Carlo Wood, 2017/01/29 # Clean a possible previous run: rm -rf parent remote.parent remote.subm REMOTE_BASE="$(pwd)" # Create a 'remote' for the submodule 'subm'. mkdir remote.su