summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2007-01-22 23:47:41 (GMT)
committerEric Wong <normalperson@yhbt.net>2007-02-23 08:57:09 (GMT)
commit07a1c95045a8c4983d3868f6070d9fa9ba5ff596 (patch)
tree7bf9170c6ec79a7cda6a123ce7b2896b6de2d565
parenta2003abc23a5961534e8a0cc70b881eb78d54328 (diff)
downloadgit-07a1c95045a8c4983d3868f6070d9fa9ba5ff596.zip
git-07a1c95045a8c4983d3868f6070d9fa9ba5ff596.tar.gz
git-07a1c95045a8c4983d3868f6070d9fa9ba5ff596.tar.bz2
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>
-rw-r--r--Documentation/git-svn.txt24
-rwxr-xr-xgit-svn.perl7
2 files changed, 6 insertions, 25 deletions
diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt
index 6ce6a39..6daba24 100644
--- 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.
-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
@@ -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.
-[[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
diff --git a/git-svn.perl b/git-svn.perl
index 88c0227..2e3d355 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -277,8 +277,13 @@ sub cmd_init {
}
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;
- $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});