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

2017-02-04 Thread Stefan Beller
On Tue, Jan 31, 2017 at 5:10 PM, Carlo Wood wrote: > On Tue, 31 Jan 2017 14:08:41 -0800 > Stefan Beller wrote: > >> On Sun, Jan 29, 2017 at 5:00 PM, Junio C Hamano >> wrote: >> > 2. If the amend is good and ready to go, "git add" to

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

2017-01-31 Thread Carlo Wood
On Sun, 29 Jan 2017 17:00:22 -0800 Junio C Hamano wrote: > I suspect the submodule folks would say it is working as intended, > if \ > > - you made a commit in the submodule; > - recorded the resulting commit in the superproject; > - you amended the commit in the

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

2017-01-31 Thread Carlo Wood
On Tue, 31 Jan 2017 14:08:41 -0800 Stefan Beller wrote: > On Sun, Jan 29, 2017 at 5:00 PM, Junio C Hamano > wrote: > > 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

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

2017-01-31 Thread Stefan Beller
On Sun, Jan 29, 2017 at 5:00 PM, Junio C Hamano wrote: > Carlo Wood writes: > >> there seems to be a problem with using 'git commit --amend' in >> git submodules when using 'git push --recurse-submodules=on-demand' >> in the parent. >> >> The latter fails,

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

2017-01-29 Thread Junio C Hamano
Carlo Wood writes: > there seems to be a problem with using 'git commit --amend' in > git submodules when using 'git push --recurse-submodules=on-demand' > in the parent. > > The latter fails, saying "The following submodule paths contain changes > that can not be found on any

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

2017-01-29 Thread Carlo Wood
Hi, there seems to be a problem with using 'git commit --amend' in git submodules when using 'git push --recurse-submodules=on-demand' in the parent. The latter fails, saying "The following submodule paths contain changes that can not be found on any remote:" for such submodule, even though the