Thread (2 messages) 2 messages, 2 authors, 2016-06-15

Re: [PATCH 2/2] push: Use "last one wins" convention for --recurse-submodules

flat view

From: Stefan Beller <hidden>
Date: 2016-06-15 23:07:25

On Thu, Dec 10, 2015 at 3:38 PM, Junio C Hamano [off-list ref] wrote:
Stefan Beller [off-list ref] writes:
quoted
quoted
+               git push --recurse-submodules=on-demand --no-recurse-submodules ../pub.git master &&
+               # Check that the submodule commit did not get there
Do we want to check here that the supermodule commit did get there,
instead of only checking the submodule?
Hmm, your point is that when the push succeeds, (1) the command
should return with 0 status, (2) the branch in the superproject
should update to the right commit, and (3) none of the submodule
should be affected, and the current test does not check the second
one?

I think that makes sense, in somewhat a paranoid way ;-).
I was just comparing to the case before,
where we had
quoted hunk ↗ jump to hunk
+               # Check that the supermodule commit did get there
+               git fetch ../pub.git &&
+               git diff --quiet FETCH_HEAD master &&
which I just skimmed over and mistakenly thought it would be the same check as
before (checking the superproject did *not* get there).

So looking at it, the superprojects history would need no update,
the commit stays the same, so no need check for it to stay the same.

So, sorry for the noise.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help