undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-svn: get rid of additional fetch-arguments

Browse Source 
It's not really useful anymore now that we have a better
--follow-parent for the valid cases.  Any other use
of it is not valid.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
This commit is contained in:
Eric Wong 2007-01-22 15:47:41 -08:00
parent a2003abc23
commit 07a1c95045
2 changed files with 6 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Documentation/git-svn.txt
View File

@ -49,9 +49,6 @@ remotes/git-svn and work on that branch. Use the 'dcommit'
command (see below) to write git commits back to command (see below) to write git commits back to
remotes/git-svn. remotes/git-svn.
See '<<fetch-args,Additional Fetch Arguments>>' if you are interested in
manually joining branches on commit.
'dcommit':: 'dcommit'::
Commit each diff from a specified head directly to the SVN Commit each diff from a specified head directly to the SVN
repository, and then rebase or reset (depending on whether or repository, and then rebase or reset (depending on whether or
@ -443,27 +440,6 @@ be remotes/$GIT_SVN_ID, instead of remotes/git-svn. Any
remotes/$GIT_SVN_ID branch should never be modified by the user outside remotes/$GIT_SVN_ID branch should never be modified by the user outside
of git-svn commands. of git-svn commands.
[[fetch-args]]
ADDITIONAL FETCH ARGUMENTS
--------------------------
This is for advanced users, most users should ignore this section.
Unfetched SVN revisions may be imported as children of existing commits
by specifying additional arguments to 'fetch'. Additional parents may
optionally be specified in the form of sha1 hex sums at the
command-line. Unfetched SVN revisions may also be tied to particular
git commits with the following syntax:
------------------------------------------------
svn_revision_number=git_commit_sha1
------------------------------------------------
This allows you to tie unfetched SVN revision 375 to your current HEAD:
------------------------------------------------
git-svn fetch 375=$(git-rev-parse HEAD)
------------------------------------------------
If you're tracking a directory that has moved, or otherwise been If you're tracking a directory that has moved, or otherwise been
branched or tagged off of another directory in the repository and you branched or tagged off of another directory in the repository and you
care about the full history of the project, then you can use care about the full history of the project, then you can use

7
git-svn.perl
View File

@ -277,8 +277,13 @@ sub cmd_init {
} }
sub cmd_fetch { sub cmd_fetch {
if (@_) {
die "Additional fetch arguments are no longer supported.\n",
"Use --follow-parent if you have moved/copied directories
instead.\n";
}
my $gs = Git::SVN->new; my $gs = Git::SVN->new;
$gs->fetch(@_); $gs->fetch;
if ($gs->{last_commit} && !verify_ref('refs/heads/master^0')) { if ($gs->{last_commit} && !verify_ref('refs/heads/master^0')) {
command_noisy(qw(update-ref refs/heads/master), command_noisy(qw(update-ref refs/heads/master),
$gs->{last_commit}); $gs->{last_commit});