git-svn: allow dcommit --no-rebase to commit multiple, dependent changes

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/git-svn.perl b/git-svn.perl
index c51f1e7391348b1d063a505ce41e5988888bae2d..9b1113a33660c3a6565db2f81cb854e8640db6c5 100755 (executable)
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -418,7 +418,7 @@ sub cmd_dcommit {
                warn "Attempting to commit more than one change while ",
                     "--no-rebase is enabled.\n",
                     "If these changes depend on each other, re-running ",
                warn "Attempting to commit more than one change while ",
                     "--no-rebase is enabled.\n",
                     "If these changes depend on each other, re-running ",

-                    "without --no-rebase will be required."
+                    "without --no-rebase may be required."

        }
        while (1) {
                my $d = shift @$linear_refs or last;
        }
        while (1) {
                my $d = shift @$linear_refs or last;


@@ -453,6 +453,7 @@ sub cmd_dcommit {
                                                               $parents->{$d};
                        }
                        $_fetch_all ? $gs->fetch_all : $gs->fetch;
                                                               $parents->{$d};
                        }
                        $_fetch_all ? $gs->fetch_all : $gs->fetch;

+                       $last_rev = $cmt_rev;

                        next if $_no_rebase;
 
                        # we always want to rebase against the current HEAD,
                        next if $_no_rebase;
 
                        # we always want to rebase against the current HEAD,


@@ -512,7 +513,6 @@ sub cmd_dcommit {
                                $parents = \%p;
                                $linear_refs = \@l;
                        }
                                $parents = \%p;
                                $linear_refs = \@l;
                        }

-                       $last_rev = $cmt_rev;

                }
        }
        unlink $gs->{index};
                }
        }
        unlink $gs->{index};