t9200: use "git cvsexportcommit" without dash
Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
a15a435ad3
commit
5190d73d1e
@ -9,7 +9,7 @@ test_description='Test export of commits to CVS'
|
|||||||
cvs >/dev/null 2>&1
|
cvs >/dev/null 2>&1
|
||||||
if test $? -ne 1
|
if test $? -ne 1
|
||||||
then
|
then
|
||||||
test_expect_success 'skipping git-cvsexportcommit tests, cvs not found' :
|
test_expect_success 'skipping git cvsexportcommit tests, cvs not found' :
|
||||||
test_done
|
test_done
|
||||||
exit
|
exit
|
||||||
fi
|
fi
|
||||||
@ -91,7 +91,7 @@ test_expect_success \
|
|||||||
diff F/newfile6.png ../F/newfile6.png
|
diff F/newfile6.png ../F/newfile6.png
|
||||||
)'
|
)'
|
||||||
|
|
||||||
# Should fail (but only on the git-cvsexportcommit stage)
|
# Should fail (but only on the git cvsexportcommit stage)
|
||||||
test_expect_success \
|
test_expect_success \
|
||||||
'Fail to change binary more than one generation old' \
|
'Fail to change binary more than one generation old' \
|
||||||
'cat F/newfile6.png >>D/newfile4.png &&
|
'cat F/newfile6.png >>D/newfile4.png &&
|
||||||
@ -165,7 +165,7 @@ test_expect_success \
|
|||||||
git commit -a -m "With spaces" &&
|
git commit -a -m "With spaces" &&
|
||||||
id=$(git rev-list --max-count=1 HEAD) &&
|
id=$(git rev-list --max-count=1 HEAD) &&
|
||||||
(cd "$CVSWORK" &&
|
(cd "$CVSWORK" &&
|
||||||
git-cvsexportcommit -c $id &&
|
git cvsexportcommit -c $id &&
|
||||||
check_entries "G g" "with spaces.png/1.1/-kb|with spaces.txt/1.1/"
|
check_entries "G g" "with spaces.png/1.1/-kb|with spaces.txt/1.1/"
|
||||||
)'
|
)'
|
||||||
|
|
||||||
@ -177,7 +177,7 @@ test_expect_success \
|
|||||||
git commit -a -m "Update with spaces" &&
|
git commit -a -m "Update with spaces" &&
|
||||||
id=$(git rev-list --max-count=1 HEAD) &&
|
id=$(git rev-list --max-count=1 HEAD) &&
|
||||||
(cd "$CVSWORK" &&
|
(cd "$CVSWORK" &&
|
||||||
git-cvsexportcommit -c $id
|
git cvsexportcommit -c $id
|
||||||
check_entries "G g" "with spaces.png/1.2/-kb|with spaces.txt/1.2/"
|
check_entries "G g" "with spaces.png/1.2/-kb|with spaces.txt/1.2/"
|
||||||
)'
|
)'
|
||||||
|
|
||||||
@ -202,7 +202,7 @@ test_expect_success \
|
|||||||
git commit -a -m "Går det så går det" && \
|
git commit -a -m "Går det så går det" && \
|
||||||
id=$(git rev-list --max-count=1 HEAD) &&
|
id=$(git rev-list --max-count=1 HEAD) &&
|
||||||
(cd "$CVSWORK" &&
|
(cd "$CVSWORK" &&
|
||||||
git-cvsexportcommit -v -c $id &&
|
git cvsexportcommit -v -c $id &&
|
||||||
check_entries \
|
check_entries \
|
||||||
"Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö" \
|
"Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö" \
|
||||||
"gårdetsågårdet.png/1.1/-kb|gårdetsågårdet.txt/1.1/"
|
"gårdetsågårdet.png/1.1/-kb|gårdetsågårdet.txt/1.1/"
|
||||||
@ -222,7 +222,7 @@ test_expect_success \
|
|||||||
git commit -a -m "Update two" &&
|
git commit -a -m "Update two" &&
|
||||||
id=$(git rev-list --max-count=1 HEAD) &&
|
id=$(git rev-list --max-count=1 HEAD) &&
|
||||||
(cd "$CVSWORK" &&
|
(cd "$CVSWORK" &&
|
||||||
test_must_fail git-cvsexportcommit -c $id
|
test_must_fail git cvsexportcommit -c $id
|
||||||
)'
|
)'
|
||||||
|
|
||||||
case "$(git config --bool core.filemode)" in
|
case "$(git config --bool core.filemode)" in
|
||||||
@ -239,7 +239,7 @@ test_expect_success \
|
|||||||
git add G/off &&
|
git add G/off &&
|
||||||
git commit -a -m "Execute test" &&
|
git commit -a -m "Execute test" &&
|
||||||
(cd "$CVSWORK" &&
|
(cd "$CVSWORK" &&
|
||||||
git-cvsexportcommit -c HEAD
|
git cvsexportcommit -c HEAD
|
||||||
test -x G/on &&
|
test -x G/on &&
|
||||||
! test -x G/off
|
! test -x G/off
|
||||||
)'
|
)'
|
||||||
|
Loading…
Reference in New Issue
Block a user