delta/git.git/git-svn.perl, branch nd/unify-ref-parse

Git 2.0: git svn: Set default --prefix='origin/' if --prefix is not given

2014-04-19T11:30:13+00:00

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 
Signed-off-by: Johan Herland 
Signed-off-by: Eric Wong

git-svn: Warn about changing default for --prefix in Git v2.0

2013-10-12T22:30:53+00:00

In Git v2.0, we will change the default --prefix for init/clone from
none/empty to "origin/" (which causes SVN-tracking branches to be
placed at refs/remotes/origin/* instead of refs/remotes/*).

This patch warns users about the upcoming change, both in the git-svn
manual page, and on stderr when running init/clone in the "multi-mode"
without providing a --prefix.

Cc: Eric Wong 
Signed-off-by: Johan Herland 
Signed-off-by: Eric Wong

git-svn: fix signed commit parsing

2013-10-10T06:48:10+00:00

When parsing a commit object, git-svn wrongly think that a line
containing spaces means the end of headers and the start of the commit
message. In case of signed commit, the gpgsig entry contains a line with
one space, so "git svn dcommit" will include part of the signature in
the commit message.

An example of such problem :
http://svnweb.mageia.org/treasurer?view=revision&revision=86

This commit changes the regex to only match an empty line as separator
between the headers and the commit message.

Signed-off-by: Nicolas Vigier 
Reviewed-by: Jonathan Nieder 
Signed-off-by: Eric Wong

Merge branch 'vl/typofix'

2013-06-26T22:07:52+00:00

* vl/typofix:
  random typofixes (committed missing a 't', successful missing an 's')

random typofixes (committed missing a 't', successful missing an 's')

2013-06-19T18:31:33+00:00

Signed-off-by: Veres Lajos 
Signed-off-by: Junio C Hamano

Fix `git svn` `rebase` & `dcommit` if top-level HEAD directory exist

2013-06-12T20:38:48+00:00

When a file (or a directory) called HEAD exists in the working tree,
internal calls git svn makes trigger "did you mean a revision or a
path?" ambiguity check.

    $ git svn rebase
    fatal: ambiguous argument 'HEAD': both revision and filename
    Use '--' to separate paths from revisions, like this:
    'git  [...] -- [...]'
    rev-list --first-parent --pretty=medium HEAD: command returned error: 128

Explicitly disambiguate by adding "--" after the revision.

Signed-off-by: Slava Kardakov 
Reviewed-by: Jeff King 
Acked-by: Eric Wong 
Signed-off-by: Junio C Hamano

git-svn: introduce --parents parameter for commands branch and tag

2013-05-20T22:05:54+00:00

This parameter is equivalent to the parameter --parents on svn cp commands
and is useful for non-standard repository layouts.

Signed-off-by: Tobias Schulte 
Signed-off-by: Eric Wong

git-svn: added an --include-path flag

2013-05-09T01:13:36+00:00

The SVN::Fetcher module is now able to filter for inclusion as well
as exclusion (as used by --ignore-path). Also added tests, documentation
changes and git completion script.

If you have an SVN repository with many top level directories and you
only want a git-svn clone of some of them then using --ignore-path is
difficult as it requires a very long regexp. In this case it's much
easier to filter for inclusion.

[ew: remove trailing whitespace]

Signed-off-by: Paul Walmsley 
Signed-off-by: Eric Wong

git-svn: avoid self-referencing mergeinfo

2013-05-09T01:07:39+00:00

When svn.pushmergeinfo is set, the target branch is included in the
mergeinfo if it was previously merged into one of the source branches.
SVN does not do this.

Remove merge target branch path from resulting mergeinfo when
svn.pushmergeinfo is set to better match the behavior of SVN. Update the
svn-mergeinfo-push test.

[ew: 80 columns]

Signed-off-by: Michael Contreras 
Reported-by: Avishay Lavie 
Acked-by: Eric Wong

git-svn: use a lowercase "usage:" string

2013-02-25T05:30:03+00:00

Make the usage string consistent with Git.

Signed-off-by: David Aguilar 
Signed-off-by: Junio C Hamano