branch_empty: use pretty_tree and therefore respect -i/-w
authorBert Wesarg <bert.wesarg@googlemail.com>
Thu, 7 Oct 2010 19:54:22 +0000 (7 21:54 +0200)
committerBert Wesarg <bert.wesarg@googlemail.com>
Mon, 8 Nov 2010 07:27:29 +0000 (8 08:27 +0100)
Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
tg.sh

diff --git a/tg.sh b/tg.sh
index c778986..caf7d28 100644 (file)
--- 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