mirror of
https://github.com/git/git
synced 2024-07-17 11:07:55 +00:00
74b1e12357
Suppose someone fetches git-svn-ified commits from another repo and then attempts to use 'git-svn init --rewrite-root=foo bar'. Using git svn rebase after that will fail badly: * For each commit tried by working_head_info, rebuild is called indirectly. * rebuild will iterate over all commits and skip all of them because the URL does not match. Because of that no rev_map file is generated at all. * Thus, rebuild will run once for every commit. This takes ages. * In the end there still isn't any rev_map file and thus working_head_info fails. Addressing this behaviour fixes an apparently not too uncommon problem with providing git-svn mirrors of Subversion repositories. Some repositories are accessed using different URLs depending on whether the user has push privileges or not. In the latter case, an anonymous URL is often used that differs from the push URL. Providing a mirror that is usable in both cases becomes a lot more possible with this change. Signed-off-by: Jan Krüger <jk@jk.gs> Acked-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
33 lines
590 B
Bash
Executable file
33 lines
590 B
Bash
Executable file
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2008 Jan Krüger
|
|
#
|
|
|
|
test_description='git-svn respects rewriteRoot during rebuild'
|
|
|
|
. ./lib-git-svn.sh
|
|
|
|
mkdir import
|
|
cd import
|
|
touch foo
|
|
svn import -m 'import for git-svn' . "$svnrepo" >/dev/null
|
|
cd ..
|
|
rm -rf import
|
|
|
|
test_expect_success 'init, fetch and checkout repository' '
|
|
git svn init --rewrite-root=http://invalid.invalid/ "$svnrepo" &&
|
|
git svn fetch
|
|
git checkout -b mybranch remotes/git-svn
|
|
'
|
|
|
|
test_expect_success 'remove rev_map' '
|
|
rm "$GIT_SVN_DIR"/.rev_map.*
|
|
'
|
|
|
|
test_expect_success 'rebuild rev_map' '
|
|
git svn rebase >/dev/null
|
|
'
|
|
|
|
test_done
|
|
|