From 4c834172eda36e722e62d0d47b9445b0e328c144 Mon Sep 17 00:00:00 2001 From: Tim Abbott Date: Wed, 24 Aug 2016 14:23:08 -0700 Subject: [PATCH] tools: Use 'upstream' as expected name for main zulip repo. Fixes: #1698. --- tools/fetch-rebase-pull-request | 4 ++-- tools/reset-to-pull-request | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/fetch-rebase-pull-request b/tools/fetch-rebase-pull-request index 25dd48d619..a9e2e9cb52 100755 --- a/tools/fetch-rebase-pull-request +++ b/tools/fetch-rebase-pull-request @@ -3,8 +3,8 @@ set -e set -x request_id="$1" -git fetch origin "pull/$request_id/head" -git checkout origin/master -b "review-${request_id}" +git fetch upstream "pull/$request_id/head" +git checkout upstream/master -b "review-${request_id}" git reset --hard FETCH_HEAD git pull --rebase diff --git a/tools/reset-to-pull-request b/tools/reset-to-pull-request index fcf5d9750b..af8b5b11a0 100755 --- a/tools/reset-to-pull-request +++ b/tools/reset-to-pull-request @@ -3,5 +3,5 @@ set -e set -x request_id="$1" -git fetch origin "pull/$request_id/head" +git fetch upstream "pull/$request_id/head" git reset --hard FETCH_HEAD