mirror of
https://github.com/git/git.git
synced 2024-10-30 22:07:53 +01:00
a6080a0a44
This uses "git-apply --whitespace=strip" to fix whitespace errors that have crept in to our source files over time. There are a few files that need to have trailing whitespaces (most notably, test vectors). The results still passes the test, and build result in Documentation/ area is unchanged. Signed-off-by: Junio C Hamano <gitster@pobox.com>
56 lines
1,001 B
Bash
Executable file
56 lines
1,001 B
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='pulling into void'
|
|
|
|
. ./test-lib.sh
|
|
|
|
D=`pwd`
|
|
|
|
test_expect_success setup '
|
|
|
|
echo file >file &&
|
|
git add file &&
|
|
git commit -a -m original
|
|
|
|
'
|
|
|
|
test_expect_success 'pulling into void' '
|
|
mkdir cloned &&
|
|
cd cloned &&
|
|
git init &&
|
|
git pull ..
|
|
'
|
|
|
|
cd "$D"
|
|
|
|
test_expect_success 'checking the results' '
|
|
test -f file &&
|
|
test -f cloned/file &&
|
|
diff file cloned/file
|
|
'
|
|
|
|
test_expect_success 'test . as a remote' '
|
|
|
|
git branch copy master &&
|
|
git config branch.copy.remote . &&
|
|
git config branch.copy.merge refs/heads/master &&
|
|
echo updated >file &&
|
|
git commit -a -m updated &&
|
|
git checkout copy &&
|
|
test `cat file` = file &&
|
|
git pull &&
|
|
test `cat file` = updated
|
|
'
|
|
|
|
test_expect_success 'the default remote . should not break explicit pull' '
|
|
git checkout -b second master^ &&
|
|
echo modified >file &&
|
|
git commit -a -m modified &&
|
|
git checkout copy &&
|
|
git reset --hard HEAD^ &&
|
|
test `cat file` = file &&
|
|
git pull . second &&
|
|
test `cat file` = modified
|
|
'
|
|
|
|
test_done
|