git-svn: allow dcommit to take an alternate head

Previously dcommit would unconditionally commit all patches
up-to and including the current HEAD.  Now if an optional
command-line argument is specified, it will only commit
up to the specified revision.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt
index a45067e16483c2eab509b0f01ed08a82522e384b..c589a9863064ef3e5f12876d40174fb991cf3b59 100644 (file)
--- a/Documentation/git-svn.txt
+++ b/Documentation/git-svn.txt
@@ -57,11 +57,13 @@ See '<<fetch-args,Additional Fetch Arguments>>' if you are interested in
 manually joining branches on commit.
 
 'dcommit'::
 manually joining branches on commit.
 
 'dcommit'::

-       Commit all diffs from the current HEAD directly to the SVN
+       Commit all diffs 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

-       not there is a diff between SVN and HEAD).  It is recommended
+       not there is a diff between SVN and head).  It is recommended

        that you run git-svn fetch and rebase (not pull) your commits
        against the latest changes in the SVN repository.
        that you run git-svn fetch and rebase (not pull) your commits
        against the latest changes in the SVN repository.

+       An optional command-line argument may be specified as an
+       alternative to HEAD.

        This is advantageous over 'commit' (below) because it produces
        cleaner, more linear history.
 
        This is advantageous over 'commit' (below) because it produces
        cleaner, more linear history.
 

diff --git a/git-svn.perl b/git-svn.perl
index 06e89ffecfd998c680da9e91282cbb2dfa4fb9c5..819584baf568aaa77a02df5c529719d692d43caa 100755 (executable)
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -604,8 +604,9 @@ sub commit_lib {
 }
 
 sub dcommit {
 }
 
 sub dcommit {

+       my $head = shift || 'HEAD';

        my $gs = "refs/remotes/$GIT_SVN";
        my $gs = "refs/remotes/$GIT_SVN";

-       chomp(my @refs = safe_qx(qw/git-rev-list --no-merges/, "$gs..HEAD"));
+       chomp(my @refs = safe_qx(qw/git-rev-list --no-merges/, "$gs..$head"));

        my $last_rev;
        foreach my $d (reverse @refs) {
                if (quiet_run('git-rev-parse','--verify',"$d~1") != 0) {
        my $last_rev;
        foreach my $d (reverse @refs) {
                if (quiet_run('git-rev-parse','--verify',"$d~1") != 0) {


@@ -632,16 +633,16 @@ sub dcommit {
        }
        return if $_dry_run;
        fetch();
        }
        return if $_dry_run;
        fetch();

-       my @diff = safe_qx(qw/git-diff-tree HEAD/, $gs);
+       my @diff = safe_qx('git-diff-tree', $head, $gs);

        my @finish;
        if (@diff) {
                @finish = qw/rebase/;
                push @finish, qw/--merge/ if $_merge;
                push @finish, "--strategy=$_strategy" if $_strategy;
        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 {
        } else {

-               print "No changes between current HEAD and $gs\n",
-                     "Hard resetting to the latest $gs\n";
+               print "No changes between current $head and $gs\n",
+                     "Resetting to the latest $gs\n";

                @finish = qw/reset --mixed/;
        }
        sys('git', @finish, $gs);
                @finish = qw/reset --mixed/;
        }
        sys('git', @finish, $gs);