Paul Tan <pyokagan@xxxxxxxxx> writes: > At this point, the HEAD of super/submodule/ is a direct descendent of > submodule/ and thus a fast-forward merge can occur. There is no need to > rebase. > > Call "git pull" instead of "git pull --rebase" in order to reduce > dependence on git-pull's functionality, and thus prevent the whole test suite > from failing when git-pull is rewritten to C. Almost the same comment as 07/12 applies here. "when the pull would result in fast-forward, 'pull' and 'pull --rebase' results in exactly the same history" is something we would want to have in the test suite for 'git pull', and it is perfectly fine to lose the invocation of 'pull --rebase' from here. Having said all that. If 'git pull' gets broken, it will break this test _anyway_. Unless the operating assumption is "it is OK to break 'git pull --rebase', as long as we do not break 'git pull', while rewriting it", I am not sure the value of the change in this patch. We'd need to keep both form working, no? > > Signed-off-by: Paul Tan <pyokagan@xxxxxxxxx> > --- > > Notes: > * This is a new patch in the patch series. > > t/t7406-submodule-update.sh | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh > index dda3929..e38d830 100755 > --- a/t/t7406-submodule-update.sh > +++ b/t/t7406-submodule-update.sh > @@ -44,7 +44,7 @@ test_expect_success 'setup a submodule tree' ' > ) && > (cd super && > (cd submodule && > - git pull --rebase origin > + git pull origin > ) && > git add submodule && > git commit -m "submodule update" -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html