Re: git push failing when push.recurseSubmodules on-demand and git commit --amend was used in submodule.
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 submodule; and then > - you did "push, while pushing out in the submodule as needed" from >the superproject. This is not what I'm doing. This is what I'm doing (see my script): - you made a commit in the submodule; - recorded the resulting commit in the superproject; - you amended the commit in the submodule; - you record the amended commit in the superproject; <=== ! - you push the submodule out (or not, the on-demand does that anyway) - you try to push the superproject, but that fails, as long as you use recurseSubmodules=on-demand. > > There are two commits in the submodule that are involved in the > above scenario, and the first one before amending is needed by the > other participants of the project in order for them to check out > what you are trying to push in the superproject, because that is > what the superproject's tree records. I never pushed anything of that, so the other participants don't know, nor have, the pre-amended commit. It is true that the superproject THINKS that the pre-amended commit is a normal commit though: the last recorded (amended) commit is internally listed as being on top of the amended commit (which is incorrect). This is why the superproject assumes that the current add commit of the submodule needs the pre-amended commit to be available too. This is not correct however, it is not needed to be available to others and does not need to be pushed to a remote. > I think you have two options. > > 1. If the amend was done to improve things in submodule but is not > quite ready, then get rid of that amended commit and restore the > branch in the submodule to the state before you amended, i.e. > the tip of the branch will become the same commit as the one > that is recorded in the superproject. Then push the submodule > and the superproject out. After that, move the submodule branch > to point at the amended commit (or record the amended commit as > a child of the commit you pushed 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
Re: git push failing when push.recurseSubmodules on-demand and git commit --amend was used in submodule.
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 > > 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
git push failing when push.recurseSubmodules on-demand and git commit --amend was used in submodule.
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 submodule is clean, pushed and reports 'Everything up-to-date' when trying to push it. I believe that the reason has to be that the parent repository thinks that the comment that was amended, but not pushed, must be on the remote too, while the whole point of amend is that this commit is not pushed. I wrote a little script that demonstrates the problem. Please run in an empty directory. START-OF-SCRIPT #! /bin/bash # This script demonstrates a bug in git where it reports # # The following submodule paths contain changes that can # not be found on any remote: # # for a 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.subm pushd remote.subm git init --bare popd # Create a 'remote' for the 'parent' repository. mkdir remote.parent pushd remote.parent git init --bare popd # Create initial parent/subm directory structore. mkdir -p parent/subm # Create an initial subm git repository. pushd parent/subm git init git remote add local "$REMOTE_BASE/remote.subm" touch s ; git add s git commit -m 'Initial commit.' git push --set-upstream local master popd # Create an initial parent git repository with subm as submodule # and push.recurseSubmodules = on-demand. pushd parent git init git config push.recurseSubmodules on-demand git remote add local "$REMOTE_BASE/remote.parent" touch p ; git add p git submodule add "$REMOTE_BASE/remote.subm" subm git add .gitmodules subm git commit -m 'Initial commit.' git push --set-upstream local master popd # Do some commit in subm, but do not push it to the remote. pushd parent/subm echo "My frist commit." > s git commit -a -m 'Change s' popd # Add the subm hash to the parent. pushd parent git add subm git commit -m 'Updated subm.' popd # Amend the commit in subm (and optionally push it). pushd parent/subm echo "My first commit." > s git commit -a --amend -m 'Change s' popd # Correct that in the parent too: pushd parent git add subm git commit -m 'Updated subm.' popd # At this point nothing was published yes, so the # amend shouldn't have caused a problem. But it did. pushd parent git push popd echo "THE ABOVE ERROR CAN NOW BE REPRODUCED INDEFINITELY," echo "FOR EXAMPLE, DO:" echo echo "cd parent/subm" echo "git push" echo "cd .." echo "git push" END-OF-SCRIPT Tested with current master 4e59582ff70d299f5a88449891e78d15b4b3fabe Regards, Carlo -- Carlo Wood
