Re: git push failing when push.recurseSubmodules on-demand and git commit --amend was used in submodule.
- From
Carlo Wood <carlo@alinoe.com>
- Date
- Feb 1, 2017, 01:10 UTC
- Message-ID
- <20170201021040.4f6cc827@hikaru>
- In-Reply-To
- <CAGZ79kbCfKVDq+9Pr5LmOtT=+uB+u+EMQg1=FUNS2umCvtvHhg@mail.gmail.com>
On Tue, 31 Jan 2017 14:08:41 -0800 Stefan Beller <sbeller@google.com> wrote:
Show 7 quoted lines
> On Sun, Jan 29, 2017 at 5:00 PM, Junio C Hamano <gitster@pobox.com> > 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 > > 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 <carlo@alinoe.com>