From: Bert Wesarg <bert.wesarg@googlemail.com>
Date: Thu, 7 Oct 2010 19:54:22 +0000 (+0200)
Subject: branch_empty: use pretty_tree and therefore respect -i/-w
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topgit.git;a=commitdiff_plain;h=719000ce93601cb2608b761df4cf172fad4c68c7;hp=879c061083e3f9f82d247bf290c251ff33fd8c01

branch_empty: use pretty_tree and therefore respect -i/-w

Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
---

diff --git a/tg.sh b/tg.sh
index c778986..caf7d28 100644
--- a/tg.sh
+++ b/tg.sh
@@ -284,10 +284,10 @@ needs_update()
 	recurse_deps branch_needs_update "$@"
 }
 
-# branch_empty NAME
+# branch_empty NAME [-i | -w]
 branch_empty()
 {
-	[ -z "$(git diff-tree "refs/top-bases/$1" "$1" -- | fgrep -v "	.top")" ]
+	[ "$(pretty_tree "$1" -b)" = "$(pretty_tree "$1" ${2-})" ]
 }
 
 # list_deps