From: Paul Tan Date: Thu, 07 May 2015 08:44:05 GMT Subject: [PATCH v2 09/12] t7406: use "git pull" instead of "git pull --rebase" Message-ID: <1430988248-18285-10-git-send-email-pyokagan@gmail.com> In-Reply-To: <1430988248-18285-1-git-send-email-pyokagan@gmail.com> 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. Signed-off-by: Paul Tan --- 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" -- 2.1.4