da083d688e
I have tweaked configuration in my ~/.subversion directory, namely I am running auto-properties and automatically adding '$Id$' expansion to every file. This choke the last test named 'proplist' from t9101-git-svn-props.sh, because one more property, svn:keywords is automatically added. I had just wrapped svn invocation with the svn_cmd that specifies empty directory via --config-dir argument. Since the latter is the global option, it should be recognized by all svn subcommands, so no regressions will be introduced. Now svn_cmd is used everywhere, not just in the failed test module: this should guard us from the future clashes with user-defined configuration tweaks. Signed-off-by: Eygene Ryabinkin <rea-git@codelabs.ru> Acked-by: Eric Wong <normalperson@yhbt.net>
38 lines
1.1 KiB
Bash
Executable File
38 lines
1.1 KiB
Bash
Executable File
#!/bin/sh
|
|
# Copyright (c) 2008 Marcus Griep
|
|
|
|
test_description='git svn multi-glob branch names'
|
|
. ./lib-git-svn.sh
|
|
|
|
test_expect_success 'setup svnrepo' '
|
|
mkdir project project/trunk project/branches \
|
|
project/branches/v14.1 project/tags &&
|
|
echo foo > project/trunk/foo &&
|
|
svn_cmd import -m "$test_description" project "$svnrepo/project" &&
|
|
rm -rf project &&
|
|
svn_cmd cp -m "fun" "$svnrepo/project/trunk" \
|
|
"$svnrepo/project/branches/v14.1/beta" &&
|
|
svn_cmd cp -m "more fun!" "$svnrepo/project/branches/v14.1/beta" \
|
|
"$svnrepo/project/branches/v14.1/gold"
|
|
'
|
|
|
|
test_expect_success 'test clone with multi-glob in branch names' '
|
|
git svn clone -T trunk -b branches/*/* -t tags \
|
|
"$svnrepo/project" project &&
|
|
cd project &&
|
|
git rev-parse "refs/remotes/v14.1/beta" &&
|
|
git rev-parse "refs/remotes/v14.1/gold" &&
|
|
cd ..
|
|
'
|
|
|
|
test_expect_success 'test dcommit to multi-globbed branch' "
|
|
cd project &&
|
|
git reset --hard 'refs/remotes/v14.1/gold' &&
|
|
echo hello >> foo &&
|
|
git commit -m 'hello' -- foo &&
|
|
git svn dcommit &&
|
|
cd ..
|
|
"
|
|
|
|
test_done
|