diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-01-23 10:42:47 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-23 10:42:47 -0800 |
| commit | 2bd6dbbe0b0f64ae801be2769a1818fc3ce43fa4 (patch) | |
| tree | bc49e200fafefa6af7d7530558b2c34aadb4e13c /t/t9153-git-svn-rewrite-uuid.sh | |
| parent | a88183f168660bb784baad536e44239a1f3dffb8 (diff) | |
| parent | 075762085c6668f11c4ea165ecec17f69245ef09 (diff) | |
| download | git-2bd6dbbe0b0f64ae801be2769a1818fc3ce43fa4.tar.gz | |
Merge git://git.bogomips.org/git-svn
* git://git.bogomips.org/git-svn:
git-svn: allow subset of branches/tags to be specified in glob spec
git-svn: allow UUID to be manually remapped via rewriteUUID
git-svn: update svn mergeinfo test suite
git-svn: document --username/commit-url for branch/tag
git-svn: add --username/commit-url options for branch/tag
git-svn: respect commiturl option for branch/tag
git-svn: fix mismatched src/dst errors for branch/tag
git-svn: handle merge-base failures
git-svn: ignore changeless commits when checking for a cherry-pick
Diffstat (limited to 't/t9153-git-svn-rewrite-uuid.sh')
| -rwxr-xr-x | t/t9153-git-svn-rewrite-uuid.sh | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/t/t9153-git-svn-rewrite-uuid.sh b/t/t9153-git-svn-rewrite-uuid.sh new file mode 100755 index 0000000000..88a2cfa233 --- /dev/null +++ b/t/t9153-git-svn-rewrite-uuid.sh @@ -0,0 +1,25 @@ +#!/bin/sh +# +# Copyright (c) 2010 Jay Soffian +# + +test_description='git svn --rewrite-uuid test' + +. ./lib-git-svn.sh + +uuid=6cc8ada4-5932-4b4a-8242-3534ed8a3232 + +test_expect_success 'load svn repo' " + svnadmin load -q '$rawsvnrepo' < '$TEST_DIRECTORY/t9153/svn.dump' && + git svn init --minimize-url --rewrite-uuid='$uuid' '$svnrepo' && + git svn fetch + " + +test_expect_success 'verify uuid' " + git cat-file commit refs/remotes/git-svn~0 | \ + grep '^${git_svn_id}: .*@2 $uuid$' && + git cat-file commit refs/remotes/git-svn~1 | \ + grep '^${git_svn_id}: .*@1 $uuid$' + " + +test_done |