X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topgit.git;a=blobdiff_plain;f=tg-update.sh;h=ec14bf68049d1dcffcf8b68b3d5ec36226c847af;hp=03b8f3fc6b81bc1cc78263122cb0f412f2a0521e;hb=737a9fa9de0ca7610457c2b4ed514b650668beda;hpb=308892d0c071135031994606170c8be6653e7197

diff --git a/tg-update.sh b/tg-update.sh
index 03b8f3f..ec14bf6 100644
--- a/tg-update.sh
+++ b/tg-update.sh
@@ -55,7 +55,7 @@ if [ -s "$depcheck" ]; then
 					# The merge got stuck! Let the user fix it up.
 					info "You are in a subshell. If you abort the merge,"
 					info "use \`exit 1\` to abort the recursive update altogether."
-					if ! sh -i; then
+					if ! sh -i </dev/tty; then
 						info "Ok, you aborated the merge. Now, you just need to"
 						info "switch back to some sane branch using \`git checkout\`."
 						exit 3
@@ -105,4 +105,5 @@ if ! git merge "refs/top-bases/$name"; then
 		info "Please commit merge resolution and call exit."
 		info "You can abort this operation using \`git reset --hard\`."
 	fi
+	exit 3
 fi