From: Petr Baudis <pasky@suse.cz>
Date: Sun, 3 Aug 2008 01:01:37 +0000 (+0200)
Subject: tg-update.sh: Fix recursive update shell call
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=ed26ca87473f2279f17ef3b262db87622dd9b9b9;p=topgit.git

tg-update.sh: Fix recursive update shell call

The sh -i would not have correct stdin, but tg update did not exit
with an error status on base-head merge conflicts in the first place.
---

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