diff options
| author |  Johan Herland <johan@herland.net> | 2013-10-11 14:57:06 +0200 |
|---|---|---|
| committer |  Eric Wong <normalperson@yhbt.net> | 2013-10-12 22:30:53 +0000 |
| commit | f849bb6b3b4ccc7cc1a68f49d6ff1e9c508fdf17 (patch) | |
| tree | b5af07d8adadce2c455446ce1bd4e8a3a10e1b73 /Documentation | |
| parent | Documentation/git-svn: Promote the use of --prefix in docs + examples (diff) | |
| download | tgif-f849bb6b3b4ccc7cc1a68f49d6ff1e9c508fdf17.tar.xz | |
git-svn: Warn about changing default for --prefix in Git v2.0
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 <normalperson@yhbt.net>
Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-svn.txt | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt index f1417deb99..2a3847649d 100644 --- a/Documentation/git-svn.txt +++ b/Documentation/git-svn.txt @@ -86,6 +86,14 @@ COMMANDS (refs/remotes/$remote/*). Setting a prefix is also useful if you wish to track multiple projects that share a common repository. ++ +NOTE: In Git v2.0, the default prefix will CHANGE from "" (no prefix) +to "origin/". This is done to put SVN-tracking refs at +"refs/remotes/origin/*" instead of "refs/remotes/*", and make them +more compatible with how Git's own remote-tracking refs are organized +(i.e. refs/remotes/$remote/*). You can enjoy the same benefits today, +by using the --prefix option. + --ignore-paths=<regex>;; When passed to 'init' or 'clone' this regular expression will be preserved as a config key. See 'fetch' for a description @@ -993,7 +1001,8 @@ placed at refs/remotes/origin/* rather than the default refs/remotes/*. The former is more compatible with the layout of Git's "regular" remote-tracking refs (refs/remotes/$remote/*), and may potentially prevent similarly named SVN branches and Git remotes from clobbering -each other. +each other. In Git v2.0 the default prefix used (i.e. when no --prefix +is given) will change from "" (no prefix) to "origin/". When using multiple --branches or --tags, 'git svn' does not automatically handle name collisions (for example, if two branches from different paths have |