undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add test for the default merges in fetch.

Browse Source 
[jc: with minor fix-ups]

Signed-off-by: Santi Béjar <sbejar@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Santi Béjar 2006-09-23 22:55:35 +02:00 committed by Junio C Hamano
parent 5372806a84
commit 6cc7c36d5e
1 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
t/t5510-fetch.sh
View File

@ -27,6 +27,16 @@ test_expect_success "clone and setup child repos" '
echo "URL: ../one/.git/" echo "URL: ../one/.git/"
echo "Pull: refs/heads/master:refs/heads/one" echo "Pull: refs/heads/master:refs/heads/one"
} >.git/remotes/one } >.git/remotes/one
cd .. &&
git clone . three &&
cd three &&
git repo-config branch.master.remote two &&
git repo-config branch.master.merge refs/heads/one &&
{
echo "URL: ../two/.git/"
echo "Pull: refs/heads/master:refs/heads/two"
echo "Pull: refs/heads/one:refs/heads/one"
} >.git/remotes/two
' '
test_expect_success "fetch test" ' test_expect_success "fetch test" '
@ -41,4 +51,19 @@ test_expect_success "fetch test" '
test "z$mine" = "z$his" test "z$mine" = "z$his"
' '
test_expect_success "fetch test for-merge" '
cd "$D" &&
cd three &&
git fetch &&
test -f .git/refs/heads/two &&
test -f .git/refs/heads/one &&
master_in_two=`cd ../two && git rev-parse master` &&
one_in_two=`cd ../two && git rev-parse one` &&
{
echo "$master_in_two not-for-merge"
echo "$one_in_two "
} >expected &&
cut -f -2 .git/FETCH_HEAD >actual &&
diff expected actual'
test_done test_done