mirror of
https://github.com/git/git.git
synced 2024-11-08 10:13:18 +01:00
63c56022f8
find-rev and rebase error out on svm because git-svn doesn't trace the original svn revision numbers back to git commits. The updated test case, included in the patch, shows the issue and passes with the rest of the patch applied. This fixes Git::SVN::find_by_url to find branches based on the svm:source URL, where useSvmProps is set. Also makes sure cmd_find_rev and working_head_info use the information they have to correctly track the source repository. This is enough to get find-rev and rebase working. Signed-off-by: João Abecasis <joao@abecasis.name> Acked-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
61 lines
1.8 KiB
Bash
Executable file
61 lines
1.8 KiB
Bash
Executable file
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2007 Eric Wong
|
|
#
|
|
|
|
test_description='git-svn useSvmProps test'
|
|
|
|
. ./lib-git-svn.sh
|
|
|
|
test_expect_success 'load svm repo' '
|
|
svnadmin load -q "$rawsvnrepo" < ../t9110/svm.dump &&
|
|
git-svn init --minimize-url -R arr -i bar "$svnrepo"/mirror/arr &&
|
|
git-svn init --minimize-url -R argh -i dir "$svnrepo"/mirror/argh &&
|
|
git-svn init --minimize-url -R argh -i e \
|
|
"$svnrepo"/mirror/argh/a/b/c/d/e &&
|
|
git config svn.useSvmProps true &&
|
|
git-svn fetch --all
|
|
'
|
|
|
|
uuid=161ce429-a9dd-4828-af4a-52023f968c89
|
|
|
|
bar_url=http://mayonaise/svnrepo/bar
|
|
test_expect_success 'verify metadata for /bar' "
|
|
git cat-file commit refs/remotes/bar | \
|
|
grep '^git-svn-id: $bar_url@12 $uuid$' &&
|
|
git cat-file commit refs/remotes/bar~1 | \
|
|
grep '^git-svn-id: $bar_url@11 $uuid$' &&
|
|
git cat-file commit refs/remotes/bar~2 | \
|
|
grep '^git-svn-id: $bar_url@10 $uuid$' &&
|
|
git cat-file commit refs/remotes/bar~3 | \
|
|
grep '^git-svn-id: $bar_url@9 $uuid$' &&
|
|
git cat-file commit refs/remotes/bar~4 | \
|
|
grep '^git-svn-id: $bar_url@6 $uuid$' &&
|
|
git cat-file commit refs/remotes/bar~5 | \
|
|
grep '^git-svn-id: $bar_url@1 $uuid$'
|
|
"
|
|
|
|
e_url=http://mayonaise/svnrepo/dir/a/b/c/d/e
|
|
test_expect_success 'verify metadata for /dir/a/b/c/d/e' "
|
|
git cat-file commit refs/remotes/e | \
|
|
grep '^git-svn-id: $e_url@1 $uuid$'
|
|
"
|
|
|
|
dir_url=http://mayonaise/svnrepo/dir
|
|
test_expect_success 'verify metadata for /dir' "
|
|
git cat-file commit refs/remotes/dir | \
|
|
grep '^git-svn-id: $dir_url@2 $uuid$' &&
|
|
git cat-file commit refs/remotes/dir~1 | \
|
|
grep '^git-svn-id: $dir_url@1 $uuid$'
|
|
"
|
|
|
|
test_expect_success 'find commit based on SVN revision number' "
|
|
git-svn find-rev r12 |
|
|
grep `git rev-parse HEAD`
|
|
"
|
|
|
|
test_expect_success 'empty rebase' "
|
|
git-svn rebase
|
|
"
|
|
|
|
test_done
|