mirror of
https://github.com/RsyncProject/rsync.git
synced 2026-04-29 02:25:45 -04:00
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:
@@ -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>) {
|
||||
|
||||
Reference in New Issue
Block a user