t / t9118-git-svn-funky-branch-names.shon commit merge-one-file: fix broken merges with alternate work trees (6aaeca9)
   1#!/bin/sh
   2#
   3# Copyright (c) 2007 Eric Wong
   4#
   5
   6test_description='git svn funky branch names'
   7. ./lib-git-svn.sh
   8
   9# Abo-Uebernahme (Bug #994)
  10scary_uri='Abo-Uebernahme%20%28Bug%20%23994%29'
  11scary_ref='Abo-Uebernahme%20(Bug%20#994)'
  12
  13test_expect_success 'setup svnrepo' '
  14        mkdir project project/trunk project/branches project/tags &&
  15        echo foo > project/trunk/foo &&
  16        svn_cmd import -m "$test_description" project "$svnrepo/pr ject" &&
  17        rm -rf project &&
  18        svn_cmd cp -m "fun" "$svnrepo/pr ject/trunk" \
  19                        "$svnrepo/pr ject/branches/fun plugin" &&
  20        svn_cmd cp -m "more fun!" "$svnrepo/pr ject/branches/fun plugin" \
  21                              "$svnrepo/pr ject/branches/more fun plugin!" &&
  22        svn_cmd cp -m "scary" "$svnrepo/pr ject/branches/fun plugin" \
  23                      "$svnrepo/pr ject/branches/$scary_uri" &&
  24        start_httpd
  25        '
  26
  27test_expect_success 'test clone with funky branch names' '
  28        git svn clone -s "$svnrepo/pr ject" project &&
  29        cd project &&
  30                git rev-parse "refs/remotes/fun%20plugin" &&
  31                git rev-parse "refs/remotes/more%20fun%20plugin!" &&
  32                git rev-parse "refs/remotes/$scary_ref" &&
  33        cd ..
  34        '
  35
  36test_expect_success 'test dcommit to funky branch' "
  37        cd project &&
  38        git reset --hard 'refs/remotes/more%20fun%20plugin!' &&
  39        echo hello >> foo &&
  40        git commit -m 'hello' -- foo &&
  41        git svn dcommit &&
  42        cd ..
  43        "
  44
  45test_expect_success 'test dcommit to scary branch' '
  46        cd project &&
  47        git reset --hard "refs/remotes/$scary_ref" &&
  48        echo urls are scary >> foo &&
  49        git commit -m "eep" -- foo &&
  50        git svn dcommit &&
  51        cd ..
  52        '
  53
  54stop_httpd
  55
  56test_done