From: Wayne Davison Date: Mon, 12 Nov 2007 08:13:52 +0000 (-0800) Subject: If we start a sub-shell to let the user fix a rebase, output a X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/commitdiff_plain/8d3211447dc655ade96de0339ad122ece55efa9f If we start a sub-shell to let the user fix a rebase, output a message and change the prompt. --- diff --git a/support/patch-update b/support/patch-update index 9c37b42b..4ed8446d 100755 --- a/support/patch-update +++ b/support/patch-update @@ -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 () {