git/t/t9124-git-svn-dcommit-auto-props.sh
Jonathan Nieder a48fcd8369 tests: add missing &&
Breaks in a test assertion's && chain can potentially hide
failures from earlier commands in the chain.

Commands intended to fail should be marked with !, test_must_fail, or
test_might_fail.  The examples in this patch do not require that.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-11-09 11:59:49 -08:00

102 lines
2.5 KiB
Bash
Executable File

#!/bin/sh
#
# Copyright (c) 2008 Brad King
test_description='git svn dcommit honors auto-props'
. ./lib-git-svn.sh
generate_auto_props() {
cat << EOF
[miscellany]
enable-auto-props=$1
[auto-props]
*.sh = svn:mime-type=application/x-shellscript; svn:eol-style=LF
*.txt = svn:mime-type=text/plain; svn:eol-style = native
EOF
}
test_expect_success 'initialize git svn' '
mkdir import &&
(
cd import &&
echo foo >foo &&
svn_cmd import -m "import for git svn" . "$svnrepo"
) &&
rm -rf import &&
git svn init "$svnrepo" &&
git svn fetch
'
test_expect_success 'enable auto-props config' '
mkdir user &&
generate_auto_props yes >user/config
'
test_expect_success 'add files matching auto-props' '
echo "#!$SHELL_PATH" >exec1.sh &&
chmod +x exec1.sh &&
echo "hello" >hello.txt &&
echo bar >bar &&
git add exec1.sh hello.txt bar &&
git commit -m "files for enabled auto-props" &&
git svn dcommit --config-dir=user
'
test_expect_success 'disable auto-props config' '
generate_auto_props no >user/config
'
test_expect_success 'add files matching disabled auto-props' '
echo "#$SHELL_PATH" >exec2.sh &&
chmod +x exec2.sh &&
echo "world" >world.txt &&
echo zot >zot &&
git add exec2.sh world.txt zot &&
git commit -m "files for disabled auto-props" &&
git svn dcommit --config-dir=user
'
test_expect_success 'check resulting svn repository' '
(
mkdir work &&
cd work &&
svn_cmd co "$svnrepo" &&
cd svnrepo &&
# Check properties from first commit.
test "x$(svn_cmd propget svn:executable exec1.sh)" = "x*" &&
test "x$(svn_cmd propget svn:mime-type exec1.sh)" = \
"xapplication/x-shellscript" &&
test "x$(svn_cmd propget svn:mime-type hello.txt)" = "xtext/plain" &&
test "x$(svn_cmd propget svn:eol-style hello.txt)" = "xnative" &&
test "x$(svn_cmd propget svn:mime-type bar)" = "x" &&
# Check properties from second commit.
test "x$(svn_cmd propget svn:executable exec2.sh)" = "x*" &&
test "x$(svn_cmd propget svn:mime-type exec2.sh)" = "x" &&
test "x$(svn_cmd propget svn:mime-type world.txt)" = "x" &&
test "x$(svn_cmd propget svn:eol-style world.txt)" = "x" &&
test "x$(svn_cmd propget svn:mime-type zot)" = "x"
)
'
test_expect_success 'check renamed file' '
test -d user &&
generate_auto_props yes > user/config &&
git mv foo foo.sh &&
git commit -m "foo => foo.sh" &&
git svn dcommit --config-dir=user &&
(
cd work/svnrepo &&
svn_cmd up &&
test ! -e foo &&
test -e foo.sh &&
test "x$(svn_cmd propget svn:mime-type foo.sh)" = \
"xapplication/x-shellscript" &&
test "x$(svn_cmd propget svn:eol-style foo.sh)" = "xLF"
)
'
test_done