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>
Eric Wong committed
Jan 2, 2008 at 10:09 UTC
7dfa16b9dc89c14c8e351cb70d775a21e87d5c23
1 file changed
+2
-2
git-svn.perl
+2
-2
@@ -418,7 +418,7 @@ sub cmd_dcommit {
418
warn "Attempting to commit more than one change while ",
419
"--no-rebase is enabled.\n",
420
"If these changes depend on each other, re-running ",
421
- "without --no-rebase will be required."
421
+ "without --no-rebase may be required."
422
}
423
while (1) {
424
my $d = shift @$linear_refs or last;
@@ -453,6 +453,7 @@ sub cmd_dcommit {
453
$parents->{$d};
454
}
455
$_fetch_all ? $gs->fetch_all : $gs->fetch;
456
+ $last_rev = $cmt_rev;
457
next if $_no_rebase;
458
459
# we always want to rebase against the current HEAD,
@@ -512,7 +513,6 @@ sub cmd_dcommit {
513
$parents = \%p;
514
$linear_refs = \@l;
515
}
515
- $last_rev = $cmt_rev;
516
}
517
}
518
unlink $gs->{index};