tor

commit 2db9bb02c79e023128e7b6fc89f4601b88e8ef4b
parent d867b7ae1dcd77ca7af64c3e5489644670b136f5
Author: George Kadianakis <desnacked@riseup.net>
Date:   Thu, 18 Apr 2019 13:22:54 +0300

Merge branch 'tor-github/pr/925'

Diffstat:
A
changes/ticket30114
 | 
3
+++
M
scripts/git/git-pull-all.sh
 | 
18
+++++++++++++++++-

2 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/changes/ticket30114 b/changes/ticket30114
@@ -0,0 +1,3 @@
+  o Minor features (git scripts):
+    - In git-pull-all.sh, also fetch the latest tor-github pull requests.
+      Implements ticket 30114.
diff --git 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.