{"thread":{"id":"26708","subject":"[PATCH TopGit] tg.sh: check for removed branch in branch_annihilated","startedAt":"2011-03-11T07:28:06Z","lastAt":"2011-03-11T07:28:06Z","messageCount":1,"participants":["Andrey Borzenkov"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"163207","messageId":"1299828486-13167-1-git-send-email-arvidjaar@gmail.com","threadId":"26708","inReplyTo":null,"subject":"[PATCH TopGit] tg.sh: check for removed branch in branch_annihilated","fromName":"Andrey Borzenkov","fromEmail":"arvidjaar@gmail.com","sentAt":"2011-03-11T07:28:06Z","receivedAt":"2011-03-11T07:28:06Z","isPatch":true,"sender":{"key":"arvidjaar@gmail.com","avatar":null},"body":"Check that branch was not deleted by external means; prevents\nerrors from further git commands due to non-existing refs.\n\nSigned-off-by: Andrey Borzenkov <arvidjaar@gmail.com>\n\n---\n tg.sh |    4 ++--\n 1 files changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/tg.sh b/tg.sh\nindex 9082d88..e8447cb 100644\n--- a/tg.sh\n+++ b/tg.sh\n@@ -175,9 +175,9 @@ branch_annihilated()\n \t_name=\"$1\";\n \n \t# use the merge base in case the base is ahead.\n-\tmb=\"$(git merge-base \"refs/top-bases/$_name\" \"$_name\")\";\n+\tmb=\"$(git merge-base \"refs/top-bases/$_name\" \"$_name\" 2> /dev/null)\";\n \n-\ttest \"$(git rev-parse \"$mb^{tree}\")\" = \"$(git rev-parse \"$_name^{tree}\")\";\n+\ttest -z \"$mb\" || test \"$(git rev-parse \"$mb^{tree}\")\" = \"$(git rev-parse \"$_name^{tree}\")\";\n }\n \n # is_sha1 REF\n-- \ntg: (d279e29..) u/removed-branch (depends on: origin/master)\n"}]}