aboutsummaryrefslogtreecommitdiff
path: root/scripts/git
diff options
context:
space:
mode:
authorteor <teor@torproject.org>2019-04-10 19:26:47 +1000
committerteor <teor@torproject.org>2019-04-10 19:26:47 +1000
commit5722c6d12d75ad1ddb28c32a11aae7aed7ccf5db (patch)
treeaf60408d58597c7b5e09f64488d9bc77c0a65397 /scripts/git
parentc28cdcc9bf5df9ed6479881a1fc4124a7b7a2676 (diff)
downloadtor-5722c6d12d75ad1ddb28c32a11aae7aed7ccf5db.tar.gz
tor-5722c6d12d75ad1ddb28c32a11aae7aed7ccf5db.zip
scripts: In git-pull-all.sh, also fetch the latest tor-github pull requests
Implements ticket 30114.
Diffstat (limited to 'scripts/git')
-rwxr-xr-xscripts/git/git-pull-all.sh18
1 files changed, 17 insertions, 1 deletions
diff --git a/scripts/git/git-pull-all.sh b/scripts/git/git-pull-all.sh
index 0a4898a111..5d1d58e4bf 100755
--- a/scripts/git/git-pull-all.sh
+++ b/scripts/git/git-pull-all.sh
@@ -174,6 +174,19 @@ function fetch_origin
fi
}
+# Fetch tor-github pull requests. No arguments.
+function fetch_tor_github
+{
+ local cmd="git fetch tor-github"
+ printf " %s Fetching tor-github..." "$MARKER"
+ if [ $DRY_RUN -eq 0 ]; then
+ msg=$( eval "$cmd" 2>&1 )
+ validate_ret $? "$msg"
+ else
+ printf "\\n %s\\n" "${IWTH}$cmd${CNRM}"
+ fi
+}
+
###############
# Entry point #
###############
@@ -188,8 +201,11 @@ while getopts "n" opt; do
esac
done
-# First, fetch the origin.
+# First, fetch tor-github.
goto_repo "$ORIGIN_PATH"
+fetch_tor_github
+
+# Then, fetch the origin.
fetch_origin
# Go over all configured worktree.