[PATCH 1/5] t/lib-submodule-update.sh: clarify test
From: Stefan Beller <hidden>
Date: 2017-12-19 22:26:56
Subsystem:
the rest · Maintainer:
Linus Torvalds
Keep the local branch name as the upstream branch name to avoid confusion. Signed-off-by: Stefan Beller <redacted> --- t/lib-submodule-update.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/t/lib-submodule-update.sh b/t/lib-submodule-update.sh
index 38dadd2c29..d7699046f6 100755
--- a/t/lib-submodule-update.sh
+++ b/t/lib-submodule-update.sh@@ -664,8 +664,8 @@ test_submodule_recursing_with_args_common() { cd submodule_update && git -C sub1 checkout -b keep_branch && git -C sub1 rev-parse HEAD >expect && - git branch -t check-keep origin/modify_sub1 && - $command check-keep && + git branch -t modify_sub1 origin/modify_sub1 && + $command modify_sub1 && test_superproject_content origin/modify_sub1 && test_submodule_content sub1 origin/modify_sub1 && git -C sub1 rev-parse keep_branch >actual &&
--
2.15.1.620.gb9897f4670-goog