X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=tg.sh;h=e987561d3a2693159d2b88672839ec9cdb42bad3;hb=ab712f2ed92a6e451bf2d482b03d2559697bf100;hp=c334f70ee420797c3de7b00ea293da5fefedd061;hpb=30c34d664cbd6d27272728b3619425ea3ef8744d;p=topgit.git

diff --git a/tg.sh b/tg.sh
index c334f70..e987561 100644
--- a/tg.sh
+++ b/tg.sh
@@ -21,11 +21,10 @@ die()
 setup_hook()
 {
 	hook_call="\"\$(tg --hooks-path)\"/$1 \"\$@\""
-	if [ -x "$git_dir/hooks/$1" ]; then
-		if fgrep -q "$hook_call" "$git_dir/hooks/$1"; then
-			# Another job well done!
-			return
-		fi
+	if [ -f "$git_dir/hooks/$1" ] &&
+	   fgrep -q "$hook_call" "$git_dir/hooks/$1"; then
+		# Another job well done!
+		return
 	fi
 	# Prepare incanation
 	if [ -x "$git_dir/hooks/$1" ]; then
@@ -37,7 +36,7 @@ setup_hook()
 	{
 		echo "#!/bin/sh"
 		echo "$hook_call"
-		[ -x "$git_dir/hooks/$1" ] && cat "$git_dir/hooks/$1"
+		[ ! -s "$git_dir/hooks/$1" ] || cat "$git_dir/hooks/$1"
 	} >"$git_dir/hooks/$1+"
 	chmod a+x "$git_dir/hooks/$1+"
 	mv "$git_dir/hooks/$1+" "$git_dir/hooks/$1"
@@ -86,17 +85,28 @@ branch_contains()
 # to the branch (e.g. B_DIRTY B1 B2 NAME), one path per line,
 # inner paths first. Innermost name can be ':' if the head is
 # not in sync with the base.
+# It will also return non-zero status if NAME needs update.
+# If needs_update() hits missing dependencies, it will append
+# them to space-separated $missing_deps list and skip them.
 needs_update()
 {
-	{
-	git cat-file blob "$1:.topdeps" 2>/dev/null |
+	git cat-file blob "$1:.topdeps" 2>/dev/null | {
+		_ret=0
 		while read _dep; do
+			if !git rev-parse --verify "$_dep" >/dev/null 2>&1; then
+				# All hope is lost
+				missing_deps="$missing_deps $_dep"
+				continue
+			fi
+
 			_dep_is_tgish=1
 			git rev-parse --verify "refs/top-bases/$_dep" >/dev/null 2>&1 ||
 				_dep_is_tgish=
 
 			# Shoo shoo, keep our environment alone!
-			[ -z "$_dep_is_tgish" ] || (needs_update "$_dep" "$@")
+			[ -z "$_dep_is_tgish" ] ||
+				(needs_update "$_dep" "$@") ||
+				_ret=$?
 
 			_dep_base_uptodate=1
 			if [ -n "$_dep_is_tgish" ]; then
@@ -106,12 +116,15 @@ needs_update()
 			if [ -z "$_dep_base_uptodate" ]; then
 				# _dep needs to be synced with its base
 				echo ": $_dep $*"
+				_ret=1
 			elif ! branch_contains "refs/top-bases/$1" "$_dep"; then
 				# Some new commits in _dep
 				echo "$_dep $*"
+				_ret=1
 			fi
 		done
-	} || : # $1 is not tracked by TopGit anymore
+		exit $_ret
+	}
 }
 
 # branch_empty NAME