diff options
author | Eric Wong <normalperson@yhbt.net> | 2006-07-06 00:14:16 -0700 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-07-06 17:02:47 -0700 |
commit | 60d02ccc18408e54ace8692532fcc73d4035b3c2 (patch) | |
tree | 9a1b0168d492f19c35aa6aaa6d6c3ddd23d907eb /t/t9105-git-svn-commit-diff.sh | |
parent | c31cfb3db3decf36874273a97f54f3d597e98efe (diff) | |
download | git-60d02ccc18408e54ace8692532fcc73d4035b3c2.tar.gz |
git-svn: migrate out of contrib
Allow NO_SVN_TESTS to be defined to skip git-svn tests. These
tests are time-consuming due to SVN being slow, and even more so
if SVN Perl libraries are not available.
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 't/t9105-git-svn-commit-diff.sh')
-rwxr-xr-x | t/t9105-git-svn-commit-diff.sh | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/t/t9105-git-svn-commit-diff.sh b/t/t9105-git-svn-commit-diff.sh new file mode 100755 index 0000000000..f994b72f80 --- /dev/null +++ b/t/t9105-git-svn-commit-diff.sh @@ -0,0 +1,41 @@ +#!/bin/sh +# +# Copyright (c) 2006 Eric Wong +test_description='git-svn commit-diff' +. ./lib-git-svn.sh + +if test -n "$GIT_SVN_NO_LIB" && test "$GIT_SVN_NO_LIB" -ne 0 +then + echo 'Skipping: commit-diff needs SVN libraries' + test_done + exit 0 +fi + +test_expect_success 'initialize repo' " + mkdir import && + cd import && + echo hello > readme && + svn import -m 'initial' . $svnrepo && + cd .. && + echo hello > readme && + git update-index --add readme && + git commit -a -m 'initial' && + echo world >> readme && + git commit -a -m 'another' + " + +head=`git rev-parse --verify HEAD^0` +prev=`git rev-parse --verify HEAD^1` + +# the internals of the commit-diff command are the same as the regular +# commit, so only a basic test of functionality is needed since we've +# already tested commit extensively elsewhere + +test_expect_success 'test the commit-diff command' " + test -n '$prev' && test -n '$head' && + git-svn commit-diff '$prev' '$head' '$svnrepo' && + svn co $svnrepo wc && + cmp readme wc/readme + " + +test_done |