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>
145 lines
4.7 KiB
Bash
Executable file
145 lines
4.7 KiB
Bash
Executable file
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2007 Eric Wong
|
|
#
|
|
|
|
test_description='git svn log tests'
|
|
. ./lib-git-svn.sh
|
|
|
|
test_expect_success 'setup repository and import' '
|
|
mkdir import &&
|
|
(
|
|
cd import &&
|
|
for i in trunk branches/a branches/b tags/0.1 tags/0.2 tags/0.3
|
|
do
|
|
mkdir -p $i &&
|
|
echo hello >>$i/README ||
|
|
exit 1
|
|
done &&
|
|
svn_cmd import -m test . "$svnrepo"
|
|
) &&
|
|
git svn init "$svnrepo" -T trunk -b branches -t tags &&
|
|
git svn fetch &&
|
|
git reset --hard origin/trunk &&
|
|
echo bye >> README &&
|
|
git commit -a -m bye &&
|
|
git svn dcommit &&
|
|
git reset --hard origin/a &&
|
|
echo why >> FEEDME &&
|
|
git update-index --add FEEDME &&
|
|
git commit -m feedme &&
|
|
git svn dcommit &&
|
|
git reset --hard origin/trunk &&
|
|
echo aye >> README &&
|
|
git commit -a -m aye &&
|
|
git svn dcommit &&
|
|
git reset --hard origin/b &&
|
|
echo spy >> README &&
|
|
git commit -a -m spy &&
|
|
echo try >> README &&
|
|
git commit -a -m try &&
|
|
git svn dcommit
|
|
'
|
|
|
|
test_expect_success 'run log' "
|
|
git reset --hard origin/a &&
|
|
git svn log -r2 origin/trunk | grep ^r2 &&
|
|
git svn log -r4 origin/trunk | grep ^r4 &&
|
|
git svn log -r3 | grep ^r3
|
|
"
|
|
|
|
test_expect_success 'run log against a from trunk' "
|
|
git reset --hard origin/trunk &&
|
|
git svn log -r3 origin/a | grep ^r3
|
|
"
|
|
|
|
printf 'r1 \nr2 \nr4 \n' > expected-range-r1-r2-r4
|
|
|
|
test_expect_success 'test ascending revision range' "
|
|
git reset --hard origin/trunk &&
|
|
git svn log -r 1:4 | grep '^r[0-9]' | cut -d'|' -f1 | test_cmp expected-range-r1-r2-r4 -
|
|
"
|
|
|
|
test_expect_success 'test ascending revision range with --show-commit' "
|
|
git reset --hard origin/trunk &&
|
|
git svn log --show-commit -r 1:4 | grep '^r[0-9]' | cut -d'|' -f1 | test_cmp expected-range-r1-r2-r4 -
|
|
"
|
|
|
|
test_expect_success 'test ascending revision range with --show-commit (sha1)' "
|
|
git svn find-rev r1 >expected-range-r1-r2-r4-sha1 &&
|
|
git svn find-rev r2 >>expected-range-r1-r2-r4-sha1 &&
|
|
git svn find-rev r4 >>expected-range-r1-r2-r4-sha1 &&
|
|
git reset --hard origin/trunk &&
|
|
git svn log --show-commit -r 1:4 | grep '^r[0-9]' | cut -d'|' -f2 >out &&
|
|
git rev-parse \$(cat out) >actual &&
|
|
test_cmp expected-range-r1-r2-r4-sha1 actual
|
|
"
|
|
|
|
printf 'r4 \nr2 \nr1 \n' > expected-range-r4-r2-r1
|
|
|
|
test_expect_success 'test descending revision range' "
|
|
git reset --hard origin/trunk &&
|
|
git svn log -r 4:1 | grep '^r[0-9]' | cut -d'|' -f1 | test_cmp expected-range-r4-r2-r1 -
|
|
"
|
|
|
|
printf 'r1 \nr2 \n' > expected-range-r1-r2
|
|
|
|
test_expect_success 'test ascending revision range with unreachable revision' "
|
|
git reset --hard origin/trunk &&
|
|
git svn log -r 1:3 | grep '^r[0-9]' | cut -d'|' -f1 | test_cmp expected-range-r1-r2 -
|
|
"
|
|
|
|
printf 'r2 \nr1 \n' > expected-range-r2-r1
|
|
|
|
test_expect_success 'test descending revision range with unreachable revision' "
|
|
git reset --hard origin/trunk &&
|
|
git svn log -r 3:1 | grep '^r[0-9]' | cut -d'|' -f1 | test_cmp expected-range-r2-r1 -
|
|
"
|
|
|
|
printf 'r2 \n' > expected-range-r2
|
|
|
|
test_expect_success 'test ascending revision range with unreachable upper boundary revision and 1 commit' "
|
|
git reset --hard origin/trunk &&
|
|
git svn log -r 2:3 | grep '^r[0-9]' | cut -d'|' -f1 | test_cmp expected-range-r2 -
|
|
"
|
|
|
|
test_expect_success 'test descending revision range with unreachable upper boundary revision and 1 commit' "
|
|
git reset --hard origin/trunk &&
|
|
git svn log -r 3:2 | grep '^r[0-9]' | cut -d'|' -f1 | test_cmp expected-range-r2 -
|
|
"
|
|
|
|
printf 'r4 \n' > expected-range-r4
|
|
|
|
test_expect_success 'test ascending revision range with unreachable lower boundary revision and 1 commit' "
|
|
git reset --hard origin/trunk &&
|
|
git svn log -r 3:4 | grep '^r[0-9]' | cut -d'|' -f1 | test_cmp expected-range-r4 -
|
|
"
|
|
|
|
test_expect_success 'test descending revision range with unreachable lower boundary revision and 1 commit' "
|
|
git reset --hard origin/trunk &&
|
|
git svn log -r 4:3 | grep '^r[0-9]' | cut -d'|' -f1 | test_cmp expected-range-r4 -
|
|
"
|
|
|
|
printf -- '------------------------------------------------------------------------\n' > expected-separator
|
|
|
|
test_expect_success 'test ascending revision range with unreachable boundary revisions and no commits' "
|
|
git reset --hard origin/trunk &&
|
|
git svn log -r 5:6 | test_cmp expected-separator -
|
|
"
|
|
|
|
test_expect_success 'test descending revision range with unreachable boundary revisions and no commits' "
|
|
git reset --hard origin/trunk &&
|
|
git svn log -r 6:5 | test_cmp expected-separator -
|
|
"
|
|
|
|
test_expect_success 'test ascending revision range with unreachable boundary revisions and 1 commit' "
|
|
git reset --hard origin/trunk &&
|
|
git svn log -r 3:5 | grep '^r[0-9]' | cut -d'|' -f1 | test_cmp expected-range-r4 -
|
|
"
|
|
|
|
test_expect_success 'test descending revision range with unreachable boundary revisions and 1 commit' "
|
|
git reset --hard origin/trunk &&
|
|
git svn log -r 5:3 | grep '^r[0-9]' | cut -d'|' -f1 | test_cmp expected-range-r4 -
|
|
"
|
|
|
|
test_done
|