Thread (5 messages) read the whole thread 5 messages, 3 authors, 2017-02-04

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

From: Carlo Wood <hidden>
Date: 2017-02-01 01:48:32

On Tue, 31 Jan 2017 14:08:41 -0800
Stefan Beller [off-list ref] wrote:
On Sun, Jan 29, 2017 at 5:00 PM, Junio C Hamano [off-list ref]
wrote:
quoted
 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.  
yup.
But that is what I am doing. The amended commit IS already
added to the superproject (and pushed to the remote).

Please have a look at my script, this happens here:

# Correct that in the parent too:
pushd 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 [off-list ref]
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help