From: Eric Wong Date: Wed, 2 Jan 2008 18:09:49 +0000 (-0800) Subject: git-svn: allow dcommit --no-rebase to commit multiple, dependent changes X-Git-Tag: v1.5.4-rc3~61 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=7dfa16b9dc89c14c8e351cb70d775a21e87d5c23;p=git.git git-svn: allow dcommit --no-rebase to commit multiple, dependent changes Signed-off-by: Eric Wong Signed-off-by: Junio C Hamano --- diff --git a/git-svn.perl b/git-svn.perl index c51f1e739..9b1113a33 100755 --- 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 ", - "without --no-rebase will be required." + "without --no-rebase may be required." } 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; + $last_rev = $cmt_rev; 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; } - $last_rev = $cmt_rev; } } unlink $gs->{index};