summaryrefslogtreecommitdiff
path: root/t/t5700-clone-reference.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-02-04 11:25:12 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-02-04 11:28:15 (GMT)
commit1f7d1a53fed40608e76200f941e6689b53752747 (patch)
tree51e02160b52ef0f938a82a1eb9bbe776bab7c4f2 /t/t5700-clone-reference.sh
parentec8048913217d8ff6e54950a0cb8ab2e739a1d1f (diff)
downloadgit-1f7d1a53fed40608e76200f941e6689b53752747.zip
git-1f7d1a53fed40608e76200f941e6689b53752747.tar.gz
git-1f7d1a53fed40608e76200f941e6689b53752747.tar.bz2
git-clone --reference: saner handling of borrowed symrefs.
When using --reference to borrow objects from a neighbouring repository while cloning, we copy the entire set of refs under temporary "refs/reference-tmp/refs" space and set up the object alternates. However, a textual symref copied this way would not point at the right place, and causes later steps to emit error messages (which is harmless but still alarming). This is most visible when using a clone created with the separate-remote layout as a reference, because such a repository would have refs/remotes/origin/HEAD with 'ref: refs/remotes/origin/master' as its contents. Although we do not create symbolic-link based refs anymore, they have the same problem because they are always supposed to be relative to refs/ hierarchy (we dereference by hand, so it only is good for HEAD and nothing else). In either case, the solution is simply to remove them after copying under refs/reference-tmp; if a symref points at a true ref, that true ref itself is enough to ensure that objects reachable from it do not needlessly get fetched. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 't/t5700-clone-reference.sh')
-rwxr-xr-xt/t5700-clone-reference.sh40
1 files changed, 39 insertions, 1 deletions
diff --git a/t/t5700-clone-reference.sh b/t/t5700-clone-reference.sh
index dd9caad..6d43252 100755
--- a/t/t5700-clone-reference.sh
+++ b/t/t5700-clone-reference.sh
@@ -26,7 +26,7 @@ git prune'
cd "$base_dir"
-test_expect_success 'cloning with reference' \
+test_expect_success 'cloning with reference (-l -s)' \
'git clone -l -s --reference B A C'
cd "$base_dir"
@@ -50,6 +50,28 @@ diff expected current'
cd "$base_dir"
+test_expect_success 'cloning with reference (no -l -s)' \
+'git clone --reference B A D'
+
+cd "$base_dir"
+
+test_expect_success 'existence of info/alternates' \
+'test `wc -l <D/.git/objects/info/alternates` = 1'
+
+cd "$base_dir"
+
+test_expect_success 'pulling from reference' \
+'cd D && git pull ../B'
+
+cd "$base_dir"
+
+test_expect_success 'that reference gets used' \
+'cd D && echo "0 objects, 0 kilobytes" > expected &&
+git count-objects > current &&
+diff expected current'
+
+cd "$base_dir"
+
test_expect_success 'updating origin' \
'cd A &&
echo third > file3 &&
@@ -75,4 +97,20 @@ diff expected current'
cd "$base_dir"
+test_expect_success 'pulling changes from origin' \
+'cd D &&
+git pull origin'
+
+cd "$base_dir"
+
+# the 5 local objects are expected; file3 blob, commit in A to add it
+# and its tree, and 2 are our tree and the merge commit.
+test_expect_success 'check objects expected to exist locally' \
+'cd D &&
+echo "5 objects" > expected &&
+git count-objects | cut -d, -f1 > current &&
+diff expected current'
+
+cd "$base_dir"
+
test_done