aboutsummaryrefslogtreecommitdiff
path: root/scripts/git
diff options
context:
space:
mode:
authorSamanta Navarro <ferivoz@riseup.net>2020-11-11 11:38:19 +0000
committerDavid Goulet <dgoulet@torproject.org>2020-11-12 11:44:09 -0500
commit4a0cd79588d2a472ab81e4f1d0e1e1bf6f2b390c (patch)
tree482e652a53ead4b26e8d97a4854671cdc0df0d61 /scripts/git
parente2d3c9c5f82a1369385dd99765c31ba479ba8f23 (diff)
downloadtor-4a0cd79588d2a472ab81e4f1d0e1e1bf6f2b390c.tar.gz
tor-4a0cd79588d2a472ab81e4f1d0e1e1bf6f2b390c.zip
Fix typos.
Typos found with codespell. Please keep in mind that this should have impact on actual code and must be carefully evaluated: src/core/or/lttng_circuit.inc - ctf_enum_value("CONTROLER", CIRCUIT_PURPOSE_CONTROLLER) + ctf_enum_value("CONTROLLER", CIRCUIT_PURPOSE_CONTROLLER)
Diffstat (limited to 'scripts/git')
-rwxr-xr-xscripts/git/git-setup-dirs.sh2
-rwxr-xr-xscripts/git/pre-commit.git-hook2
2 files changed, 2 insertions, 2 deletions
diff --git a/scripts/git/git-setup-dirs.sh b/scripts/git/git-setup-dirs.sh
index 3cc184dafb..5a9ae41cbd 100755
--- a/scripts/git/git-setup-dirs.sh
+++ b/scripts/git/git-setup-dirs.sh
@@ -494,7 +494,7 @@ set_tor_github_pr_fetch_config
fetch_remote "tor-github"
# GitLab remote
-printf "%s Seting up remote %s\\n" "$MARKER" "${BYEL}tor-gitlab${CNRM}"
+printf "%s Setting up remote %s\\n" "$MARKER" "${BYEL}tor-gitlab${CNRM}"
add_remote "tor-gitlab" "$GITLAB_PULL"
set_remote_push "tor-gitlab" "$GITLAB_PUSH"
# Add custom fetch for MRs
diff --git a/scripts/git/pre-commit.git-hook b/scripts/git/pre-commit.git-hook
index 5533ed0cdd..75e5133a73 100755
--- a/scripts/git/pre-commit.git-hook
+++ b/scripts/git/pre-commit.git-hook
@@ -3,7 +3,7 @@
# To install this script, copy it to .git/hooks/pre-commit in local copy of
# tor git repo and make sure it has permission to execute.
#
-# This is pre-commit git hook script that prevents commiting your changeset if
+# This is pre-commit git hook script that prevents committing your changeset if
# it fails our code formatting, changelog entry formatting, module include
# rules, etc...