Check that branch was not deleted by external means; prevents
errors from further git commands due to non-existing refs.
Signed-off-by: Andrey Borzenkov <arvidjaar@xxxxxxxxx>
---
tg.sh | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/tg.sh b/tg.sh
index 9082d88..e8447cb 100644
--- a/tg.sh
+++ b/tg.sh
@@ -175,9 +175,9 @@ branch_annihilated()
_name="$1";
# use the merge base in case the base is ahead.
- mb="$(git merge-base "refs/top-bases/$_name" "$_name")";
+ mb="$(git merge-base "refs/top-bases/$_name" "$_name" 2> /dev/null)";
- test "$(git rev-parse "$mb^{tree}")" = "$(git rev-parse "$_name^{tree}")";
+ test -z "$mb" || test "$(git rev-parse "$mb^{tree}")" = "$(git rev-parse "$_name^{tree}")";
}
# is_sha1 REF
--
tg: (d279e29..) u/removed-branch (depends on: origin/master)
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html