Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
t/lib-submodule-update.sh: clarify test
author
Stefan Beller
<sbeller@google.com>
Fri, 5 Jan 2018 20:03:01 +0000
(12:03 -0800)
committer
Junio C Hamano
<gitster@pobox.com>
Fri, 5 Jan 2018 20:35:04 +0000
(12:35 -0800)
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>
t/lib-submodule-update.sh
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
1eaabe3
)
diff --git
a/t/lib-submodule-update.sh
b/t/lib-submodule-update.sh
index 38dadd2c2902f3621d54168d32a54d7863497968..d7699046f6545be28d5c39c058d4ca9db9e93793 100755
(executable)
--- 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 &&