clone: keep --reference even with -l -s
Both -l -s and --reference update objects/info/alternates and used to write over each other. Signed-off-by: Martin Waitz <tali@admingilde.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
parent
6fe31e2e4c
commit
cf9dc65368
@ -265,7 +265,7 @@ yes,yes)
|
||||
test -f "$repo/objects/info/alternates" &&
|
||||
cat "$repo/objects/info/alternates";
|
||||
echo "$repo/objects"
|
||||
} >"$GIT_DIR/objects/info/alternates"
|
||||
} >>"$GIT_DIR/objects/info/alternates"
|
||||
;;
|
||||
esac
|
||||
git-ls-remote "$repo" >"$GIT_DIR/CLONE_HEAD"
|
||||
|
78
t/t5700-clone-reference.sh
Executable file
78
t/t5700-clone-reference.sh
Executable file
@ -0,0 +1,78 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
# Copyright (C) 2006 Martin Waitz <tali@admingilde.org>
|
||||
#
|
||||
|
||||
test_description='test clone --reference'
|
||||
. ./test-lib.sh
|
||||
|
||||
base_dir=`pwd`
|
||||
|
||||
test_expect_success 'preparing first repository' \
|
||||
'test_create_repo A && cd A &&
|
||||
echo first > file1 &&
|
||||
git add file1 &&
|
||||
git commit -m 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 addition &&
|
||||
git repack -a -d &&
|
||||
git prune'
|
||||
|
||||
cd "$base_dir"
|
||||
|
||||
test_expect_success 'cloning with reference' \
|
||||
'git clone -l -s --reference B A C'
|
||||
|
||||
cd "$base_dir"
|
||||
|
||||
test_expect_success 'existance of info/alternates' \
|
||||
'test `wc -l <C/.git/objects/info/alternates` = 2'
|
||||
|
||||
cd "$base_dir"
|
||||
|
||||
test_expect_success 'pulling from reference' \
|
||||
'cd C &&
|
||||
git pull ../B'
|
||||
|
||||
cd "$base_dir"
|
||||
|
||||
test_expect_success 'that reference gets used' \
|
||||
'cd C &&
|
||||
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 &&
|
||||
git add file3 &&
|
||||
git commit -m update &&
|
||||
git repack -a -d &&
|
||||
git prune'
|
||||
|
||||
cd "$base_dir"
|
||||
|
||||
test_expect_success 'pulling changes from origin' \
|
||||
'cd C &&
|
||||
git pull origin'
|
||||
|
||||
cd "$base_dir"
|
||||
|
||||
# the 2 local objects are commit and tree from the merge
|
||||
test_expect_success 'that alternate to origin gets used' \
|
||||
'cd C &&
|
||||
echo "2 objects" > expected &&
|
||||
git count-objects | cut -d, -f1 > current &&
|
||||
diff expected current'
|
||||
|
||||
cd "$base_dir"
|
||||
|
||||
test_done
|
Loading…
Reference in New Issue
Block a user