committed by
Junio C Hamano
parent
0f39087589
commit
3dff5379bf
@ -87,7 +87,7 @@ test_expect_success 'three-way not complaining on an untracked path in both' '
|
||||
git-read-tree -m -u branch-point master side
|
||||
'
|
||||
|
||||
test_expect_success 'three-way not cloberring a working tree file' '
|
||||
test_expect_success 'three-way not clobbering a working tree file' '
|
||||
|
||||
git reset --hard &&
|
||||
rm -f file2 subdir/file2 file3 subdir/file3 &&
|
||||
|
||||
@ -106,21 +106,21 @@ test_expect_success 'read-tree' '
|
||||
cmp ../one ../original.one
|
||||
'
|
||||
|
||||
test_expect_success 'no file/rev ambuguity check inside .git' '
|
||||
test_expect_success 'no file/rev ambiguity check inside .git' '
|
||||
cd $HERE &&
|
||||
git commit -a -m 1 &&
|
||||
cd $HERE/.git &&
|
||||
git show -s HEAD
|
||||
'
|
||||
|
||||
test_expect_success 'no file/rev ambuguity check inside a bare repo' '
|
||||
test_expect_success 'no file/rev ambiguity check inside a bare repo' '
|
||||
cd $HERE &&
|
||||
git clone -s --bare .git foo.git &&
|
||||
cd foo.git && GIT_DIR=. git show -s HEAD
|
||||
'
|
||||
|
||||
# This still does not work as it should...
|
||||
: test_expect_success 'no file/rev ambuguity check inside a bare repo' '
|
||||
: test_expect_success 'no file/rev ambiguity check inside a bare repo' '
|
||||
cd $HERE &&
|
||||
git clone -s --bare .git foo.git &&
|
||||
cd foo.git && git show -s HEAD
|
||||
|
||||
@ -172,7 +172,7 @@ EOF
|
||||
check_verify_failure 'verify tag-name check'
|
||||
|
||||
############################################################
|
||||
# 11. tagger line lable check #1
|
||||
# 11. tagger line label check #1
|
||||
|
||||
cat >tag.sig <<EOF
|
||||
object $head
|
||||
@ -187,7 +187,7 @@ EOF
|
||||
check_verify_failure '"tagger" line label check #1'
|
||||
|
||||
############################################################
|
||||
# 12. tagger line lable check #2
|
||||
# 12. tagger line label check #2
|
||||
|
||||
cat >tag.sig <<EOF
|
||||
object $head
|
||||
|
||||
@ -10,7 +10,7 @@ commit id embedding:
|
||||
|
||||
The contents of the repository is compared to the extracted tar
|
||||
archive. The repository contains simple text files, symlinks and a
|
||||
binary file (/bin/sh). Only pathes shorter than 99 characters are
|
||||
binary file (/bin/sh). Only paths shorter than 99 characters are
|
||||
used.
|
||||
|
||||
git-tar-tree applies the commit date to every file in the archive it
|
||||
|
||||
@ -36,7 +36,7 @@ test_expect_success \
|
||||
'git-clone foo bar'
|
||||
|
||||
test_expect_success \
|
||||
'successfull clone must leave the directory' \
|
||||
'successful clone must leave the directory' \
|
||||
'cd bar'
|
||||
|
||||
test_done
|
||||
|
||||
@ -70,7 +70,7 @@ name='test svn:keywords ignoring'
|
||||
test_expect_success "$name" \
|
||||
'git checkout -b mybranch remotes/git-svn &&
|
||||
echo Hi again >> kw.c &&
|
||||
git commit -a -m "test keywoards ignoring" &&
|
||||
git commit -a -m "test keywords ignoring" &&
|
||||
git-svn set-tree remotes/git-svn..mybranch &&
|
||||
git pull . remotes/git-svn'
|
||||
|
||||
|
||||
Reference in New Issue
Block a user