mirror of
https://github.com/git/git.git
synced 2024-11-09 02:33:11 +01:00
fe191fcaa5
git-svn by default puts its Subversion-tracking refs directly in refs/remotes/*. This runs counter to Git's convention of using refs/remotes/$remote/* for storing remote-tracking branches. Furthermore, combining git-svn with regular git remotes run the risk of clobbering refs under refs/remotes (e.g. if you have a git remote called "tags" with a "v1" branch, it will overlap with the git-svn's tracking branch for the "v1" tag from Subversion. Even though the git-svn refs stored in refs/remotes/* are not "proper" remote-tracking branches (since they are not covered by a proper git remote's refspec), they clearly represent a similar concept, and would benefit from following the same convention. For example, if git-svn tracks Subversion branch "foo" at refs/remotes/foo, and you create a local branch refs/heads/foo to add some commits to be pushed back to Subversion (using "git svn dcommit), then it is clearly unhelpful of Git to throw warning: refname 'foo' is ambiguous. every time you checkout, rebase, or otherwise interact with the branch. The existing workaround for this is to supply the --prefix=quux/ to git svn init/clone, so that git-svn's tracking branches end up in refs/remotes/quux/* instead of refs/remotes/*. However, encouraging users to specify --prefix to work around a design flaw in git-svn is suboptimal, and not a long term solution to the problem. Instead, git-svn should default to use a non-empty prefix that saves unsuspecting users from the inconveniences described above. This patch will only affect newly created git-svn setups, as the --prefix option only applies to git svn init (and git svn clone). Existing git-svn setups will continue with their existing (lack of) prefix. Also, if anyone somehow prefers git-svn's old layout, they can recreate that by explicitly passing an empty prefix (--prefix "") on the git svn init/clone command line. The patch changes the default value for --prefix from "" to "origin/", updates the git-svn manual page, and fixes the fallout in the git-svn testcases. (Note that this patch might be easier to review using the --word-diff and --word-diff-regex=. diff options.) [ew: squashed description of <= 1.9 behavior into manpage] Suggested-by: Thomas Ferris Nicolaisen <tfnico@gmail.com> Signed-off-by: Johan Herland <johan@herland.net> Signed-off-by: Eric Wong <normalperson@yhbt.net>
86 lines
2.7 KiB
Bash
Executable file
86 lines
2.7 KiB
Bash
Executable file
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2007 Eric Wong
|
|
#
|
|
|
|
test_description='git svn funky branch names'
|
|
. ./lib-git-svn.sh
|
|
|
|
# Abo-Uebernahme (Bug #994)
|
|
scary_uri='Abo-Uebernahme%20%28Bug%20%23994%29'
|
|
scary_ref='Abo-Uebernahme%20(Bug%20#994)'
|
|
|
|
test_expect_success 'setup svnrepo' '
|
|
mkdir project project/trunk project/branches project/tags &&
|
|
echo foo > project/trunk/foo &&
|
|
svn_cmd import -m "$test_description" project "$svnrepo/pr ject" &&
|
|
rm -rf project &&
|
|
svn_cmd cp -m "fun" "$svnrepo/pr ject/trunk" \
|
|
"$svnrepo/pr ject/branches/fun plugin" &&
|
|
svn_cmd cp -m "more fun!" "$svnrepo/pr ject/branches/fun plugin" \
|
|
"$svnrepo/pr ject/branches/more fun plugin!" &&
|
|
svn_cmd cp -m "scary" "$svnrepo/pr ject/branches/fun plugin" \
|
|
"$svnrepo/pr ject/branches/$scary_uri" &&
|
|
svn_cmd cp -m "leading dot" "$svnrepo/pr ject/trunk" \
|
|
"$svnrepo/pr ject/branches/.leading_dot" &&
|
|
svn_cmd cp -m "trailing dot" "$svnrepo/pr ject/trunk" \
|
|
"$svnrepo/pr ject/branches/trailing_dot." &&
|
|
svn_cmd cp -m "trailing .lock" "$svnrepo/pr ject/trunk" \
|
|
"$svnrepo/pr ject/branches/trailing_dotlock.lock" &&
|
|
svn_cmd cp -m "reflog" "$svnrepo/pr ject/trunk" \
|
|
"$svnrepo/pr ject/branches/not-a@{0}reflog@" &&
|
|
start_httpd
|
|
'
|
|
|
|
# SVN 1.7 will truncate "not-a%40{0]" to just "not-a".
|
|
# Look at what SVN wound up naming the branch and use that.
|
|
# Be sure to escape the @ if it shows up.
|
|
non_reflog=`svn_cmd ls "$svnrepo/pr ject/branches" | grep not-a | sed 's/\///' | sed 's/@/%40/'`
|
|
|
|
test_expect_success 'test clone with funky branch names' '
|
|
git svn clone -s "$svnrepo/pr ject" project &&
|
|
(
|
|
cd project &&
|
|
git rev-parse "refs/remotes/origin/fun%20plugin" &&
|
|
git rev-parse "refs/remotes/origin/more%20fun%20plugin!" &&
|
|
git rev-parse "refs/remotes/origin/$scary_ref" &&
|
|
git rev-parse "refs/remotes/origin/%2Eleading_dot" &&
|
|
git rev-parse "refs/remotes/origin/trailing_dot%2E" &&
|
|
git rev-parse "refs/remotes/origin/trailing_dotlock%2Elock" &&
|
|
git rev-parse "refs/remotes/origin/$non_reflog"
|
|
)
|
|
'
|
|
|
|
test_expect_success 'test dcommit to funky branch' "
|
|
(
|
|
cd project &&
|
|
git reset --hard 'refs/remotes/origin/more%20fun%20plugin!' &&
|
|
echo hello >> foo &&
|
|
git commit -m 'hello' -- foo &&
|
|
git svn dcommit
|
|
)
|
|
"
|
|
|
|
test_expect_success 'test dcommit to scary branch' '
|
|
(
|
|
cd project &&
|
|
git reset --hard "refs/remotes/origin/$scary_ref" &&
|
|
echo urls are scary >> foo &&
|
|
git commit -m "eep" -- foo &&
|
|
git svn dcommit
|
|
)
|
|
'
|
|
|
|
test_expect_success 'test dcommit to trailing_dotlock branch' '
|
|
(
|
|
cd project &&
|
|
git reset --hard "refs/remotes/origin/trailing_dotlock%2Elock" &&
|
|
echo who names branches like this anyway? >> foo &&
|
|
git commit -m "bar" -- foo &&
|
|
git svn dcommit
|
|
)
|
|
'
|
|
|
|
stop_httpd
|
|
|
|
test_done
|