From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 9 Mar 2020 13:03:51 +0000 (-0400)
Subject: Revert "scripts: Remove typo in git-list-tor-branches.sh"
X-Git-Tag: tor-0.4.5.0-alpha-dev~153
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8096f3b2549971e120fa3869ea9e458fdad313d5;p=thirdparty%2Ftor.git

Revert "scripts: Remove typo in git-list-tor-branches.sh"

This reverts commit a63b4148229ae8ce46494fd6a0f99149c231605c.

The "typo" wasn't actually a typo.  The "r" in the suffixes for the
release branches is meant to make them distinct from the maint
branches.

Now, _right now_, nothing uses release branch suffixes, but it's
important to keep them distinct if we decide to use them in the
future.
---

diff --git a/scripts/git/git-list-tor-branches.sh b/scripts/git/git-list-tor-branches.sh
index d2c71a41ed..d6b30f064f 100755
--- a/scripts/git/git-list-tor-branches.sh
+++ b/scripts/git/git-list-tor-branches.sh
@@ -81,7 +81,7 @@ branch() {
         location="\$GIT_PATH/\$TOR_WKT_NAME/$brname"
         is_maint="yes"
     elif [[ "$brname" =~ ^release- ]]; then
-        suffix="_${brname_nodots#release-}"
+        suffix="_r${brname_nodots#release-}"
         location="\$GIT_PATH/\$TOR_WKT_NAME/$brname"
 
         if [[ "$skip_release_branches" = "yes" ]]; then