commit 396134188f21b3f8bdfe35171f14c6b70446ea3e Author: teor teor@torproject.org Date: Tue Jun 11 14:34:44 2019 +1000
Stop hard-coding env vars in the git scripts
Set the env vars: * TOR_MASTER_NAME to override the tor master branch name, and * TOR_WKT_NAME to override the worktree path
Fixes bug 30841; bugfix on 0.4.0.1-alpha. --- changes/bug30841 | 3 +++ scripts/git/git-merge-forward.sh | 4 ++-- scripts/git/git-pull-all.sh | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/changes/bug30841 b/changes/bug30841 new file mode 100644 index 000000000..c6d1c5146 --- /dev/null +++ b/changes/bug30841 @@ -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. diff --git a/scripts/git/git-merge-forward.sh b/scripts/git/git-merge-forward.sh index c9ec55ac6..ba2998328 100755 --- a/scripts/git/git-merge-forward.sh +++ b/scripts/git/git-merge-forward.sh @@ -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. # diff --git a/scripts/git/git-pull-all.sh b/scripts/git/git-pull-all.sh index e5ba96a05..8eb42c7c1 100755 --- a/scripts/git/git-pull-all.sh +++ b/scripts/git/git-pull-all.sh @@ -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. #