If we start a sub-shell to let the user fix a rebase, output a

message and change the prompt.
This commit is contained in:
Wayne Davison
2007-11-12 00:13:52 -08:00
parent 805d8ac43d
commit 8d3211447d

View File

@@ -67,7 +67,11 @@ foreach my $patch (@patches) {
close IN;
print OUT "\n";
system "git-rebase -m $parent || $ENV{SHELL}";
if (system("git-rebase -m $parent") != 0) {
print qq|"git-rebase -m $parent" incomplete -- please fix.\n|;
$ENV{PS1} = "[$parent] patch/$patch: ";
system $ENV{SHELL};
}
open(PIPE, '-|', 'git-diff', 'master') or die $!;
while (<PIPE>) {