[tor-commits] [tor/master] Revert "scripts: Remove typo in git-list-tor-branches.sh"

[nickm@xxxxxxxxxxxxxx]

commit 8096f3b2549971e120fa3869ea9e458fdad313d5
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Mon Mar 9 09:03:51 2020 -0400

    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.
---
 scripts/git/git-list-tor-branches.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/git/git-list-tor-branches.sh b/scripts/git/git-list-tor-branches.sh
index d2c71a41e..d6b30f064 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

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits