diff options
| author |  Eric Wong <normalperson@yhbt.net> | 2008-01-02 10:09:49 -0800 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2008-01-02 10:43:54 -0800 |
| commit | 7dfa16b9dc89c14c8e351cb70d775a21e87d5c23 (patch) | |
| tree | 621fade754f4156e945fcfa41af02135484bc0e4 | |
| parent | receive-pack: check object type of sha1 before using them as commits (diff) | |
| download | tgif-7dfa16b9dc89c14c8e351cb70d775a21e87d5c23.tar.xz | |
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>
| -rwxr-xr-x | git-svn.perl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-svn.perl b/git-svn.perl index c51f1e7391..9b1113a336 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}; |