|
|
@ -418,7 +418,7 @@ sub cmd_dcommit { |
|
|
|
warn "Attempting to commit more than one change while ", |
|
|
|
warn "Attempting to commit more than one change while ", |
|
|
|
"--no-rebase is enabled.\n", |
|
|
|
"--no-rebase is enabled.\n", |
|
|
|
"If these changes depend on each other, re-running ", |
|
|
|
"If these changes depend on each other, re-running ", |
|
|
|
"without --no-rebase will be required." |
|
|
|
"without --no-rebase may be required." |
|
|
|
} |
|
|
|
} |
|
|
|
while (1) { |
|
|
|
while (1) { |
|
|
|
my $d = shift @$linear_refs or last; |
|
|
|
my $d = shift @$linear_refs or last; |
|
|
@ -453,6 +453,7 @@ sub cmd_dcommit { |
|
|
|
$parents->{$d}; |
|
|
|
$parents->{$d}; |
|
|
|
} |
|
|
|
} |
|
|
|
$_fetch_all ? $gs->fetch_all : $gs->fetch; |
|
|
|
$_fetch_all ? $gs->fetch_all : $gs->fetch; |
|
|
|
|
|
|
|
$last_rev = $cmt_rev; |
|
|
|
next if $_no_rebase; |
|
|
|
next if $_no_rebase; |
|
|
|
|
|
|
|
|
|
|
|
# we always want to rebase against the current HEAD, |
|
|
|
# we always want to rebase against the current HEAD, |
|
|
@ -512,7 +513,6 @@ sub cmd_dcommit { |
|
|
|
$parents = \%p; |
|
|
|
$parents = \%p; |
|
|
|
$linear_refs = \@l; |
|
|
|
$linear_refs = \@l; |
|
|
|
} |
|
|
|
} |
|
|
|
$last_rev = $cmt_rev; |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
unlink $gs->{index}; |
|
|
|
unlink $gs->{index}; |
|
|
|