]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Revert "scripts: Remove typo in git-list-tor-branches.sh"
authorNick Mathewson <nickm@torproject.org>
Mon, 9 Mar 2020 13:03:51 +0000 (09:03 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 9 Mar 2020 13:03:51 +0000 (09:03 -0400)
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

index d2c71a41ed6ffbc02e62c756e50f1f5a378d65a9..d6b30f064f539616b4876c5794df8e0d971a4b8f 100755 (executable)
@@ -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