From: Andrey Borzenkov <arvidjaar@gmail.com>
Date: Sat, 19 Mar 2011 16:53:10 +0000 (+0300)
Subject: tg-update: allow skipping branch if recursion fails
X-Git-Tag: topgit-0.9~5^2~2
X-Git-Url: https://repo.or.cz/w/topgit.git/commitdiff_plain/f7de676087cff50b3a45fc5eaf0a8a3f57ee0ccb

tg-update: allow skipping branch if recursion fails

This allows user to skip failed recursive update and continue
with current state. It makes it possible to continue after
missing depenndency (which was the silent default before).

Signed-off-by: Andrey Borzenkov <arvidjaar@gmail.com>
---

diff --git a/tg-update.sh b/tg-update.sh
index 7f956ba..8d5ffc1 100644
--- a/tg-update.sh
+++ b/tg-update.sh
@@ -79,10 +79,20 @@ update_branch() {
 						# 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 </dev/tty; then
-							info "Ok, you aborted the merge. Now, you just need to"
-							info "switch back to some sane branch using \`git checkout\`."
-							exit 3
+						info "Use \`exit 2\` to skip updating this branch and continue."
+						if sh -i </dev/tty; then
+							# assume user fixed it
+							continue
+						else
+							ret=$?
+							if [ $ret -eq 2 ]; then
+								info "Ok, I will try to continue without updating this branch."
+								break
+							else
+								info "Ok, you aborted the merge. Now, you just need to"
+								info "switch back to some sane branch using \`git checkout\`."
+								exit 3
+							fi
 						fi
 					done
 					)