@matheusbsbs / matheus-bagliano / commits / 07a1c95045
Fork 0

git-svn: get rid of additional fetch-arguments

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>

Eric Wong committed Jan 22, 2007 at 15:47 UTC 07a1c95045a8c4983d3868f6070d9fa9ba5ff596
2 files changed +6 -25
Documentation/git-svn.txt
-24
@@ -49,9 +49,6 @@ remotes/git-svn and work on that branch. Use the 'dcommit'
49 command (see below) to write git commits back to
50 remotes/git-svn.
51
52 -See '<<fetch-args,Additional Fetch Arguments>>' if you are interested in
53 -manually joining branches on commit.
54 -
52 'dcommit'::
53 Commit each diff from a specified head directly to the SVN
54 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
440 remotes/$GIT_SVN_ID branch should never be modified by the user outside
441 of git-svn commands.
442
446 -[[fetch-args]]
447 -ADDITIONAL FETCH ARGUMENTS
448 ---------------------------
449 -This is for advanced users, most users should ignore this section.
450 -
451 -Unfetched SVN revisions may be imported as children of existing commits
452 -by specifying additional arguments to 'fetch'. Additional parents may
453 -optionally be specified in the form of sha1 hex sums at the
454 -command-line. Unfetched SVN revisions may also be tied to particular
455 -git commits with the following syntax:
456 -
457 -------------------------------------------------
458 - svn_revision_number=git_commit_sha1
459 -------------------------------------------------
460 -
461 -This allows you to tie unfetched SVN revision 375 to your current HEAD:
462 -
463 -------------------------------------------------
464 - git-svn fetch 375=$(git-rev-parse HEAD)
465 -------------------------------------------------
466 -
443 If you're tracking a directory that has moved, or otherwise been
444 branched or tagged off of another directory in the repository and you
445 care about the full history of the project, then you can use
git-svn.perl
+6 -1
@@ -277,8 +277,13 @@ sub cmd_init {
277 }
278
279 sub cmd_fetch {
280 + if (@_) {
281 + die "Additional fetch arguments are no longer supported.\n",
282 + "Use --follow-parent if you have moved/copied directories
283 + instead.\n";
284 + }
285 my $gs = Git::SVN->new;
281 - $gs->fetch(@_);
286 + $gs->fetch;
287 if ($gs->{last_commit} && !verify_ref('refs/heads/master^0')) {
288 command_noisy(qw(update-ref refs/heads/master),
289 $gs->{last_commit});