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

[topgit.git] / tg.sh

diff --git a/tg.sh b/tg.sh
index c77898678cdd275783746b0567a6de7edb905192..caf7d2836cc1db2e0269415aa224b3377c01d38c 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