Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
tag: v1.7.10.1
Fetching contributors…

Cannot retrieve contributors at this time

executable file 66 lines (58 sloc) 1.507 kb
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66
#!/bin/sh
#
# Copyright (c) 2009 Ben Jackson
#

test_description='git svn reset'
. ./lib-git-svn.sh

test_expect_success 'setup test repository' '
svn_cmd co "$svnrepo" s &&
(
cd s &&
mkdir vis &&
echo always visible > vis/vis.txt &&
svn_cmd add vis &&
svn_cmd commit -m "create visible files" &&
mkdir hid &&
echo initially hidden > hid/hid.txt &&
svn_cmd add hid &&
svn_cmd commit -m "create initially hidden files" &&
svn_cmd up &&
echo mod >> vis/vis.txt &&
svn_cmd commit -m "modify vis" &&
svn_cmd up
)
'

test_expect_success 'clone SVN repository with hidden directory' '
git svn init "$svnrepo" g &&
( cd g && git svn fetch --ignore-paths="^hid" )
'

test_expect_success 'modify hidden file in SVN repo' '
( cd s &&
echo mod hidden >> hid/hid.txt &&
svn_cmd commit -m "modify hid" &&
svn_cmd up
)
'

test_expect_success 'fetch fails on modified hidden file' '
( cd g &&
git svn find-rev refs/remotes/git-svn > ../expect &&
test_must_fail git svn fetch 2> ../errors &&
git svn find-rev refs/remotes/git-svn > ../expect2 ) &&
fgrep "not found in commit" errors &&
test_cmp expect expect2
'

test_expect_success 'reset unwinds back to r1' '
( cd g &&
git svn reset -r1 &&
git svn find-rev refs/remotes/git-svn > ../expect2 ) &&
echo 1 >expect &&
test_cmp expect expect2
'

test_expect_success 'refetch succeeds not ignoring any files' '
( cd g &&
git svn fetch &&
git svn rebase &&
fgrep "mod hidden" hid/hid.txt
)
'

test_done
Something went wrong with that request. Please try again.