Skip to content

Commit 7d82b4a

Browse files
jrnEric Wong
authored andcommitted
git-svn: clarify explanation of --destination argument
The existing documentation for "-d" does not make it obvious whether its argument is supposed to be a full svn path, a partial svn path, the glob from the config file, or what. Clarify the text and add an example to get the reader started. Reported-by: Nathan Gray <[email protected]> Signed-off-by: Jonathan Nieder <[email protected]> Signed-off-by: Eric Wong <[email protected]>
1 parent eff714b commit 7d82b4a

File tree

1 file changed

+14
-5
lines changed

1 file changed

+14
-5
lines changed

Documentation/git-svn.txt

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -271,13 +271,15 @@ first have already been pushed into SVN.
271271
Create a tag by using the tags_subdir instead of the branches_subdir
272272
specified during git svn init.
273273

274-
-d;;
275-
--destination;;
274+
-d<path>;;
275+
--destination=<path>;;
276+
276277
If more than one --branches (or --tags) option was given to the 'init'
277278
or 'clone' command, you must provide the location of the branch (or
278-
tag) you wish to create in the SVN repository. The value of this
279-
option must match one of the paths specified by a --branches (or
280-
--tags) option. You can see these paths with the commands
279+
tag) you wish to create in the SVN repository. <path> specifies which
280+
path to use to create the branch or tag and should match the pattern
281+
on the left-hand side of one of the configured branches or tags
282+
refspecs. You can see these refspecs with the commands
281283
+
282284
git config --get-all svn-remote.<name>.branches
283285
git config --get-all svn-remote.<name>.tags
@@ -1044,6 +1046,13 @@ Multiple fetch, branches, and tags keys are supported:
10441046
tags = tags/server/*:refs/remotes/project-a/tags/*
10451047
------------------------------------------------------------------------
10461048

1049+
Creating a branch in such a configuration requires disambiguating which
1050+
location to use using the -d or --destination flag:
1051+
1052+
------------------------------------------------------------------------
1053+
$ git svn branch -d branches/server release-2-3-0
1054+
------------------------------------------------------------------------
1055+
10471056
Note that git-svn keeps track of the highest revision in which a branch
10481057
or tag has appeared. If the subset of branches or tags is changed after
10491058
fetching, then .git/svn/.metadata must be manually edited to remove (or

0 commit comments

Comments
 (0)