diff options
| author |  Stefan Beller <sbeller@google.com> | 2018-01-05 12:03:01 -0800 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-01-05 12:35:04 -0800 |
| commit | 6419a12397c8ea2017a2540e23c8ea3cc67ce60f (patch) | |
| tree | b20774bdeeb28785ea6ca525082bd2ab083c92ce /t | |
| parent | Git 2.16-rc0 (diff) | |
| download | tgif-6419a12397c8ea2017a2540e23c8ea3cc67ce60f.tar.xz | |
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 <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -rwxr-xr-x | t/lib-submodule-update.sh | 4 |
1 files 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 && |