X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topgit.git;a=blobdiff_plain;f=tg.sh;h=b2b9191c0ae847952be9217fa11d7061fca33f12;hp=0eec4d4dc3158bbc40645da742323c08beb62236;hb=e73f7e8baa9fad9a0632deaa3de65b7a761edb04;hpb=11c70d59e524a64a44f810ce0da437a9e18a004c

diff --git a/tg.sh b/tg.sh
index 0eec4d4..b2b9191 100644
--- a/tg.sh
+++ b/tg.sh
@@ -87,6 +87,13 @@ ref_exists()
 	git rev-parse --verify "$@" >/dev/null 2>&1
 }
 
+# has_remote BRANCH
+# Whether BRANCH has a remote equivalent (accepts top-bases/ too)
+has_remote()
+{
+	[ -n "$base_remote" ] && ref_exists "remotes/$base_remote/$1"
+}
+
 # recurse_deps CMD NAME [BRANCHPATH...]
 # Recursively eval CMD on all dependencies of NAME.
 # CMD can refer to $_name for queried branch name,
@@ -106,9 +113,8 @@ recurse_deps()
 	_depsfile="$(mktemp -t tg-depsfile.XXXXXX)"
 	# Check also our base against remote base. Checking our head
 	# against remote head has to be done in the helper.
-	_remotebase="refs/remotes/$base_remote/top-bases/$_name"
-	if [ -n "$base_remote" ] && ref_exists "$_remotebase"; then
-		echo "$_remotebase" >>"$_depsfile"
+	if has_remote "top-bases/$_name"; then
+		echo "refs/remotes/$base_remote/top-bases/$_name" >>"$_depsfile"
 	fi
 	git cat-file blob "$_name:.topdeps" >>"$_depsfile"
 
@@ -147,7 +153,7 @@ branch_needs_update()
 {
 	_dep_base_update=
 	if [ -n "$_dep_is_tgish" ]; then
-		if [ -n "$base_remote" ] && ref_exists "refs/remotes/$base_remote/$_dep"; then
+		if has_remote "$_dep"; then
 			branch_contains "$_dep" "refs/remotes/$base_remote/$_dep" || _dep_base_update=%
 		fi
 		# This can possibly override the remote check result;