Set NO_MMAP for Cygwin by default

[git.git] / git-svn.perl

diff --git a/git-svn.perl b/git-svn.perl
index 077e9200be632e5a84dbe10ac58744ad0a130ced..c2cdceb1d1c15eb5e4d2698ceca14bac3e9d3eeb 100755 (executable)
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -107,7 +107,12 @@ my %cmd = (
        init => [ \&init, "Initialize a repo for tracking" .
                          " (requires URL argument)",
                          \%init_opts ],
-       commit => [ \&commit, "Commit git revisions to SVN",
+       dcommit => [ \&dcommit, 'Commit several diffs to merge with upstream',
+                       { 'merge|m|M' => \$_merge,
+                         'strategy|s=s' => \$_strategy,
+                         'dry-run|n' => \$_dry_run,
+                       %cmt_opts, %fc_opts } ],
+       'set-tree' => [ \&commit, "Set an SVN repository to a git tree-ish",
                        {       'stdin|' => \$_stdin, %cmt_opts, %fc_opts, } ],
        'show-ignore' => [ \&show_ignore, "Show svn:ignore listings",
                        { 'revision|r=i' => \$_revision } ],
@@ -150,11 +155,6 @@ my %cmd = (
                          'file|F=s' => \$_file,
                          'revision|r=s' => \$_revision,
                        %cmt_opts } ],
-       dcommit => [ \&dcommit, 'Commit several diffs to merge with upstream',
-                       { 'merge|m|M' => \$_merge,
-                         'strategy|s=s' => \$_strategy,
-                         'dry-run|n' => \$_dry_run,
-                       %cmt_opts } ],
 );
 
 my $cmd;
@@ -512,15 +512,15 @@ sub dcommit {
        }
        return if $_dry_run;
        fetch();
-       my @diff = command('diff-tree', $head, $gs, '--');
+       my @diff = command('diff-tree', 'HEAD', $gs, '--');
        my @finish;
        if (@diff) {
                @finish = qw/rebase/;
                push @finish, qw/--merge/ if $_merge;
                push @finish, "--strategy=$_strategy" if $_strategy;
-               print STDERR "W: $head and $gs differ, using @finish:\n", @diff;
+               print STDERR "W: HEAD and $gs differ, using @finish:\n", @diff;
        } else {
-               print "No changes between current $head and $gs\n",
+               print "No changes between current HEAD and $gs\n",
                      "Resetting to the latest $gs\n";
                @finish = qw/reset --mixed/;
        }