commit 0635170cf14c3b622ee9fdf67ea81f4e564dd39d Author: Nick Mathewson nickm@torproject.org Date: Mon Jun 10 09:05:26 2019 -0400

Add an environment variable to set GIT_PATH in git scripts --- scripts/git/git-merge-forward.sh | 2 +- scripts/git/git-pull-all.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/git/git-merge-forward.sh b/scripts/git/git-merge-forward.sh index 98ad07c9c..15af6f3db 100755 --- a/scripts/git/git-merge-forward.sh +++ b/scripts/git/git-merge-forward.sh @@ -14,7 +14,7 @@ # ... which means that the tor worktrees are in /home/<user>/git/tor-wkt

# Where are all those git repositories? -GIT_PATH="FULL_PATH_TO_GIT_REPOSITORY_DIRECTORY" +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" diff --git a/scripts/git/git-pull-all.sh b/scripts/git/git-pull-all.sh index ec8511d27..6fe7e5981 100755 --- a/scripts/git/git-pull-all.sh +++ b/scripts/git/git-pull-all.sh @@ -14,7 +14,7 @@ # ... which means that the tor worktrees are in /home/<user>/git/tor-wkt

# Where are all those git repositories? -GIT_PATH="FULL_PATH_TO_GIT_REPOSITORY_DIRECTORY" +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"