X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topgit.git;a=blobdiff_plain;f=tg-update.sh;h=5162c52b9d335f383a0bdb54ceb0c5929463b20f;hp=912c968dbdce2b3ce35f08f2adfcbf82164fbff0;hb=608626e5896f71da51467fedb6f461342df3f850;hpb=8c74e001a0cfdc7d0644c08834ec844a40fc45df

diff --git a/tg-update.sh b/tg-update.sh
index 912c968..5162c52 100644
--- a/tg-update.sh
+++ b/tg-update.sh
@@ -8,20 +8,26 @@ name=
 
 ## Parse options
 
-if [ -n "$1" ]; then
-	echo "Usage: tg update" >&2
-	exit 1
-fi
-
-
-name="$(git symbolic-ref HEAD | sed 's#^refs/\(heads\|top-bases\)/##')"
+while [ -n "$1" ]; do
+	arg="$1"; shift
+	case "$arg" in
+	-*)
+		echo "Usage: tg [...] update [NAME]" >&2
+		exit 1;;
+	*)
+		[ -z "$name" ] || die "name already specified ($name)"
+		name="$arg";;
+	esac
+done
+
+[ -n "$name" ] || name="$(git symbolic-ref HEAD | sed 's#^refs/\(heads\|top-bases\)/##')"
 base_rev="$(git rev-parse --short --verify "refs/top-bases/$name" 2>/dev/null)" ||
 	die "not a TopGit-controlled branch"
 
 
 ## First, take care of our base
 
-depcheck="$(mktemp -t tg-depcheck.XXXXXX)"
+depcheck="$(get_temp tg-depcheck)"
 missing_deps=
 needs_update "$name" >"$depcheck" || :
 [ -z "$missing_deps" ] || die "some dependencies are missing: $missing_deps"
@@ -54,12 +60,12 @@ if [ -s "$depcheck" ]; then
 				(
 				export TG_RECURSIVE="[$dep] $TG_RECURSIVE"
 				export PS1="[$dep] $PS1"
-				while ! tg update; do
+				while ! $tg update; do
 					# 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 aborated the merge. Now, you just need to"
+						info "Ok, you aborted the merge. Now, you just need to"
 						info "switch back to some sane branch using \`git checkout\`."
 						exit 3
 					fi
@@ -75,7 +81,7 @@ if [ -s "$depcheck" ]; then
 			info "Updating base with $dep changes..."
 			if ! git merge "$dep"; then
 				if [ -z "$TG_RECURSIVE" ]; then
-					resume='`tg update` again'
+					resume="\`git checkout $name && $tg update\` again"
 				else # subshell
 					resume='exit'
 				fi
@@ -87,21 +93,22 @@ if [ -s "$depcheck" ]; then
 				exit 2
 			fi
 		done
-
-	# Home, sweet home...
-	git checkout -q "$name"
 else
 	info "The base is up-to-date."
 fi
-rm "$depcheck"
+
+# Home, sweet home...
+# (We want to always switch back, in case we were on the base from failed
+# previous merge.)
+git checkout -q "$name"
 
 merge_with="refs/top-bases/$name"
 
 
 ## Second, update our head with the remote branch
 
-rname="refs/remotes/$base_remote/$name"
-if [ -n "$base_remote" ] && ref_exists "$rname"; then
+if has_remote "$name"; then
+	rname="refs/remotes/$base_remote/$name"
 	if branch_contains "$name" "$rname"; then
 		info "The $name head is up-to-date wrt. its remote branch."
 	else
@@ -133,10 +140,12 @@ if ! git merge "$merge_with"; then
 	if [ -z "$TG_RECURSIVE" ]; then
 		info "Please commit merge resolution. No need to do anything else"
 		info "You can abort this operation using \`git reset --hard\` now"
-		info "and retry this merge later using \`tg update\`."
+		info "and retry this merge later using \`$tg update\`."
 	else # subshell
 		info "Please commit merge resolution and call exit."
 		info "You can abort this operation using \`git reset --hard\`."
 	fi
 	exit 3
 fi
+
+# vim:noet