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>

diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt
index 6ce6a3944de5c1b815cd922b26f5eca2be08ed84..6daba241e9767dd03289712a676272e3c14d5681 100644 (file)
--- a/Documentation/git-svn.txt
+++ b/Documentation/git-svn.txt
@@ -49,9 +49,6 @@ remotes/git-svn and work on that branch.  Use the 'dcommit'
 command (see below) to write git commits back to
 remotes/git-svn.
 
 command (see below) to write git commits back to
 remotes/git-svn.
 

-See '<<fetch-args,Additional Fetch Arguments>>' if you are interested in
-manually joining branches on commit.
-

 'dcommit'::
        Commit each diff from a specified head directly to the SVN
        repository, and then rebase or reset (depending on whether or
 'dcommit'::
        Commit each diff from a specified head directly to the SVN
        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
 of git-svn commands.
 
 remotes/$GIT_SVN_ID branch should never be modified by the user outside
 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
 branched or tagged off of another directory in the repository and you
 care about the full history of the project, then you can use
 If you're tracking a directory that has moved, or otherwise been
 branched or tagged off of another directory in the repository and you
 care about the full history of the project, then you can use

diff --git a/git-svn.perl b/git-svn.perl
index 88c022701de2d14af64271caf3a9b9ee88970f82..2e3d35527e836bea2bb7a30fb6b39387ed3621a3 100755 (executable)
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -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')) {
                command_noisy(qw(update-ref refs/heads/master),
                              $gs->{last_commit});
        if ($gs->{last_commit} && !verify_ref('refs/heads/master^0')) {
                command_noisy(qw(update-ref refs/heads/master),
                              $gs->{last_commit});