Revision 53b3c47d64b4294ae586d1daa04f9140dadd9ae6 authored by Michael J Gruber on 15 April 2010, 09:34:07 UTC, committed by Junio C Hamano on 17 April 2010, 17:30:00 UTC
The last two tests here were always supposed to fail in the sense that, according to code and documentation, mktree should read non-recursive ls-tree output, but not recursive one, and therefore explicitely refuses to deal with slashes. Adjust the test (must_fail) so that it succeeds when mktree dies on slashes. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 2179870
t7408-submodule-reference.sh
#!/bin/sh
#
# Copyright (c) 2009, Red Hat Inc, Author: Michael S. Tsirkin (mst@redhat.com)
#
test_description='test clone --reference'
. ./test-lib.sh
base_dir=`pwd`
U=$base_dir/UPLOAD_LOG
test_expect_success 'preparing first repository' \
'test_create_repo A && cd A &&
echo first > file1 &&
git add file1 &&
git commit -m A-initial'
cd "$base_dir"
test_expect_success 'preparing second repository' \
'git clone A B && cd B &&
echo second > file2 &&
git add file2 &&
git commit -m B-addition &&
git repack -a -d &&
git prune'
cd "$base_dir"
test_expect_success 'preparing supermodule' \
'test_create_repo super && cd super &&
echo file > file &&
git add file &&
git commit -m B-super-initial'
cd "$base_dir"
test_expect_success 'submodule add --reference' \
'cd super && git submodule add --reference ../B "file://$base_dir/A" sub &&
git commit -m B-super-added'
cd "$base_dir"
test_expect_success 'after add: existence of info/alternates' \
'test `wc -l <super/sub/.git/objects/info/alternates` = 1'
cd "$base_dir"
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'
cd "$base_dir"
test_expect_success 'cloning supermodule' \
'git clone super super-clone'
cd "$base_dir"
test_expect_success 'update with reference' \
'cd super-clone && git submodule update --init --reference ../B'
cd "$base_dir"
test_expect_success 'after update: existence of info/alternates' \
'test `wc -l <super-clone/sub/.git/objects/info/alternates` = 1'
cd "$base_dir"
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'
cd "$base_dir"
test_done
![swh spinner](/static/img/swh-spinner.gif)
Computing file changes ...