summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorteor <teor@torproject.org>2019-09-10 12:14:00 +1000
committerteor <teor@torproject.org>2019-09-10 12:14:00 +1000
commit785391a9342a84a926d672c602189f9ef87f8ec0 (patch)
treef9fd0efa7412aa94277dfc103fdeecf42063964e /scripts
parent97da440f9efeac6c70983ba5de01a9104048d612 (diff)
downloadtor-785391a9342a84a926d672c602189f9ef87f8ec0.tar.gz
tor-785391a9342a84a926d672c602189f9ef87f8ec0.zip
scripts: reformat the comments in git-pull-all.sh for consistency
Preparation for 31677.
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/git/git-pull-all.sh18
1 files changed, 11 insertions, 7 deletions
diff --git a/scripts/git/git-pull-all.sh b/scripts/git/git-pull-all.sh
index 8eb42c7c18..26e26e8b5a 100755
--- a/scripts/git/git-pull-all.sh
+++ b/scripts/git/git-pull-all.sh
@@ -21,11 +21,11 @@ TOR_MASTER_NAME=${TOR_MASTER_NAME:-"tor"}
# The worktrees location (directory).
TOR_WKT_NAME=${TOR_WKT_NAME:-"tor-wkt"}
-#########################
-# End of configuration. #
-#########################
+##########################
+# Git branches to manage #
+##########################
-# Configuration of the branches that needs merging. The values are in order:
+# Configuration of the branches that need pulling. The values are in order:
# (1) Branch name to pull (update).
# (2) Full path of the git worktree.
#
@@ -65,9 +65,9 @@ ${RELEASE_040[0]}
${RELEASE_041[0]}
EOF
-##########################
-# Git Worktree to manage #
-##########################
+###########################
+# Git worktrees to manage #
+###########################
# List of all worktrees to work on. All defined above. Ordering is important.
# Always the maint-* branch first then the release-*.
@@ -92,6 +92,10 @@ COUNT=${#WORKTREE[@]}
# that would have been executed for each worktree.
DRY_RUN=0
+#############
+# Constants #
+#############
+
# Control characters
CNRM=$'\x1b[0;0m' # Clear color