Tests consisting of one line each can be consolidated to have fewer tests
to run as well as fewer lines of code.
When having just a few git commands, do not create a new shell but
use the -C flag in Git to execute in the correct directory.
Signed-off-by: Stefan Beller <sbel...@google.com>
---
t/t7408-submodule-reference.sh | 50 +++++++++++++++---------------------------
1 file changed, 18 insertions(+), 32 deletions(-)
diff --git a/t/t7408-submodule-reference.sh b/t/t7408-submodule-reference.sh
index afcc629..1416cbd 100755
--- a/t/t7408-submodule-reference.sh
+++ b/t/t7408-submodule-reference.sh
@@ -10,6 +10,16 @@ base_dir=$(pwd)
U=$base_dir/UPLOAD_LOG
+test_alternate_usage()
+{
+ alternates_file=$1
+ working_dir=$2
+ test_line_count = 1 $alternates_file &&
+ echo "0 objects, 0 kilobytes" >expect &&
+ git -C $working_dir count-objects >current &&
+ diff expect current
+}
+
test_expect_success 'preparing first repository' '
test_create_repo A &&
(
@@ -42,44 +52,20 @@ test_expect_success 'preparing superproject' '
)
'
-test_expect_success 'submodule add --reference' '
+test_expect_success 'submodule add --reference uses alternates' '
(
cd super &&
git submodule add --reference ../B "file://$base_dir/A" sub &&
git commit -m B-super-added
- )
-'
-
-test_expect_success 'after add: existence of info/alternates' '
- test_line_count = 1 super/.git/modules/sub/objects/info/alternates
-'
-
-test_expect_success 'that reference gets used with add' '
- (
- cd super/sub &&
- echo "0 objects, 0 kilobytes" > expected &&
- git count-objects > current &&
- diff expected current
- )
-'
-
-test_expect_success 'cloning superproject' '
- git clone super super-clone
-'
-
-test_expect_success 'update with reference' '
- cd super-clone && git submodule update --init --reference ../B
-'
-
-test_expect_success 'after update: existence of info/alternates' '
- test_line_count = 1 super-clone/.git/modules/sub/objects/info/alternates
+ ) &&
+ test_alternate_usage super/.git/modules/sub/objects/info/alternates
super/sub
'
-test_expect_success 'that reference gets used with update' '
- cd super-clone/sub &&
- echo "0 objects, 0 kilobytes" > expected &&
- git count-objects > current &&
- diff expected current
+test_expect_success 'updating superproject keeps alternates' '
+ test_when_finished "rm -rf super-clone" &&
+ git clone super super-clone &&
+ git -C super-clone submodule update --init --reference ../B &&
+ test_alternate_usage
super-clone/.git/modules/sub/objects/info/alternates super-clone/sub
'
test_done
--
2.9.2.572.g9d9644e.dirty
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
