From 8096f3b2549971e120fa3869ea9e458fdad313d5 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Mon, 9 Mar 2020 09:03:51 -0400 Subject: [PATCH] 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 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