From: Stefan Beller Date: Fri, 5 Jan 2018 20:03:01 +0000 (-0800) Subject: t/lib-submodule-update.sh: clarify test X-Git-Tag: v2.16.3~35^2~3 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/6419a12397c8ea2017a2540e23c8ea3cc67ce60f?hp=1eaabe34fc6f486367a176207420378f587d3b48 t/lib-submodule-update.sh: clarify test Keep the local branch name as the upstream branch name to avoid confusion. Signed-off-by: Stefan Beller Signed-off-by: Junio C Hamano --- 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 &&