mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse Source 
* maint:
  add -p: warn if only binary changes present
  git-archive: work in bare repos
  git-svn: change dashed git-config to git config
This commit is contained in:
Junio C Hamano
2008-10-26 16:21:08 -07:00
parent b8492539f9 9fe7a643fc
commit 304d058370
5 changed files with 31 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
t/t5000-tar-tree.sh
View File

@ -57,6 +57,11 @@ test_expect_success \
git update-ref HEAD $(TZ=GMT GIT_COMMITTER_DATE="2005-05-27 22:00:00" \
git commit-tree $treeid </dev/null)'
test_expect_success \
'create bare clone' \
'git clone --bare . bare.git &&
cp .gitattributes bare.git/info/attributes'
test_expect_success \
'remove ignored file' \
'rm a/ignored'
@ -73,6 +78,14 @@ test_expect_success \
'git archive vs. git tar-tree' \
'diff b.tar b2.tar'
test_expect_success \
'git archive in a bare repo' \
'(cd bare.git && git archive HEAD) >b3.tar'
test_expect_success \
'git archive vs. the same in a bare repo' \
'test_cmp b.tar b3.tar'
test_expect_success \
'validate file modification time' \
'mkdir extract &&
@ -151,6 +164,14 @@ test_expect_success \
'git archive --format=zip' \
'git archive --format=zip HEAD >d.zip'
test_expect_success \
'git archive --format=zip in a bare repo' \
'(cd bare.git && git archive --format=zip HEAD) >d1.zip'
test_expect_success \
'git archive --format=zip vs. the same in a bare repo' \
'test_cmp d.zip d1.zip'
$UNZIP -v >/dev/null 2>&1
if [ $? -eq 127 ]; then
echo "Skipping ZIP tests, because unzip was not found"