torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'tor-github/pr/1099'

Browse Source
This commit is contained in:
George Kadianakis
2019-06-12 13:02:49 +03:00
parent 96fade0a7d 396134188f
commit 438b7eec85
7 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
changes/bug30840
+4
View File
@@ -0,0 +1,4 @@
o Minor bugfixes (git scripts):
- Stop hard-coding the bash path in the git scripts. Some OSes don't
have bash in /usr/bin, others have an ancient bash at this path.
Fixes bug 30840; bugfix on 0.4.0.1-alpha.
changes/bug30841
+3
View File
@@ -0,0 +1,3 @@
o Minor bugfixes (git scripts):
- Stop hard-coding the tor master branch name and worktree path in the
git scripts. Fixes bug 30841; bugfix on 0.4.0.1-alpha.
scripts/git/git-merge-forward.sh
+3 -3
View File
@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash
##############################
# Configuration (change me!) #
@@ -17,9 +17,9 @@
GIT_PATH=${TOR_FULL_GIT_PATH:-"FULL_PATH_TO_GIT_REPOSITORY_DIRECTORY"}
# The tor master git repository directory from which all the worktree have
# been created.
TOR_MASTER_NAME="tor"
TOR_MASTER_NAME=${TOR_MASTER_NAME:-"tor"}
# The worktrees location (directory).
TOR_WKT_NAME="tor-wkt"
TOR_WKT_NAME=${TOR_WKT_NAME:-"tor-wkt"}
#########################
# End of configuration. #
scripts/git/git-pull-all.sh
+3 -3
View File
@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash
##################################
# User configuration (change me) #
@@ -17,9 +17,9 @@
GIT_PATH=${TOR_FULL_GIT_PATH:-"FULL_PATH_TO_GIT_REPOSITORY_DIRECTORY"}
# The tor master git repository directory from which all the worktree have
# been created.
TOR_MASTER_NAME="tor"
TOR_MASTER_NAME=${TOR_MASTER_NAME:-"tor"}
# The worktrees location (directory).
TOR_WKT_NAME="tor-wkt"
TOR_WKT_NAME=${TOR_WKT_NAME:-"tor-wkt"}
#########################
# End of configuration. #
scripts/git/git-push-all.sh
+1 -1
View File
@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash
# The remote upstream branch on which git.torproject.org/tor.git points to.
UPSTREAM_BRANCH=${TOR_UPSTREAM_REMOTE_NAME:-"upstream"}
scripts/git/pre-commit.git-hook
+1 -1
View File
@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash
#
# 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.
scripts/git/pre-push.git-hook
+1 -1
View File
@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash
# git pre-push hook script to:
# 1) prevent "fixup!" and "squash!" commit from ending up in master, release-*