mirror of
https://github.com/git/git.git
synced 2024-11-05 16:52:59 +01:00
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>
56 lines
1.5 KiB
Bash
Executable file
56 lines
1.5 KiB
Bash
Executable file
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2007 Eric Wong
|
|
#
|
|
|
|
test_description='git svn funky branch names'
|
|
. ./lib-git-svn.sh
|
|
|
|
# Abo-Uebernahme (Bug #994)
|
|
scary_uri='Abo-Uebernahme%20%28Bug%20%23994%29'
|
|
scary_ref='Abo-Uebernahme%20(Bug%20#994)'
|
|
|
|
test_expect_success 'setup svnrepo' '
|
|
mkdir project project/trunk project/branches project/tags &&
|
|
echo foo > project/trunk/foo &&
|
|
svn_cmd import -m "$test_description" project "$svnrepo/pr ject" &&
|
|
rm -rf project &&
|
|
svn_cmd cp -m "fun" "$svnrepo/pr ject/trunk" \
|
|
"$svnrepo/pr ject/branches/fun plugin" &&
|
|
svn_cmd cp -m "more fun!" "$svnrepo/pr ject/branches/fun plugin" \
|
|
"$svnrepo/pr ject/branches/more fun plugin!" &&
|
|
svn_cmd cp -m "scary" "$svnrepo/pr ject/branches/fun plugin" \
|
|
"$svnrepo/pr ject/branches/$scary_uri" &&
|
|
start_httpd
|
|
'
|
|
|
|
test_expect_success 'test clone with funky branch names' '
|
|
git svn clone -s "$svnrepo/pr ject" project &&
|
|
cd project &&
|
|
git rev-parse "refs/remotes/fun%20plugin" &&
|
|
git rev-parse "refs/remotes/more%20fun%20plugin!" &&
|
|
git rev-parse "refs/remotes/$scary_ref" &&
|
|
cd ..
|
|
'
|
|
|
|
test_expect_success 'test dcommit to funky branch' "
|
|
cd project &&
|
|
git reset --hard 'refs/remotes/more%20fun%20plugin!' &&
|
|
echo hello >> foo &&
|
|
git commit -m 'hello' -- foo &&
|
|
git svn dcommit &&
|
|
cd ..
|
|
"
|
|
|
|
test_expect_success 'test dcommit to scary branch' '
|
|
cd project &&
|
|
git reset --hard "refs/remotes/$scary_ref" &&
|
|
echo urls are scary >> foo &&
|
|
git commit -m "eep" -- foo &&
|
|
git svn dcommit &&
|
|
cd ..
|
|
'
|
|
|
|
stop_httpd
|
|
|
|
test_done
|