Hi Robin,
Robin Rosenberg wrote:
> infinite loop that is somewhat tricky to stop. Abort the script
> if bash read fails.
>
> Signed-off-by: Robin Rosenberg <robin.rosenberg@xxxxxxxxxx>
That motivates half the change.
> --- a/git-mergetool--lib.sh
> +++ b/git-mergetool--lib.sh
> @@ -35,7 +35,7 @@ check_unchanged () {
> while true; do
> echo "$MERGED seems unchanged."
> printf "Was the merge successful? [y/n] "
> - read answer
> + read answer < /dev/tty || exit 1
Why not
read answer || exit 1
so tests can still run without blocking? Aside from that, this looks
like a good change; thanks.
What platform are you on? ^C kills the entire process group here.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html