Skip to content

Make git-upstream-sync use a configurable remote #64

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 4, 2018
Merged

Make git-upstream-sync use a configurable remote #64

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f32ca9d
Make git-upstream-sync use a configurable remote
unixorn Jan 4, 2018
0894587
Humor shellcheck
unixorn Jan 4, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions bin/git-upstream-sync
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,18 @@
# Sync to upstream/yourforkname and rebase into your local fork. then push
# back into yourfork/yourforkname
#
# Assumes that your upstream fork's remote is named upstream
# Assumes that your upstream fork's remote is named upstream unless you
# set upstream-sync.remote with git config

branch_name=$(git symbolic-ref --short -q HEAD)
upstream_remote=$(git config --get upstream-sync.remote)
# shellcheck disable=SC2181
if [[ $? != 0 ]]; then
echo 'Using default remote of upstream'
upstream_remote='upstream'
fi

git fetch upstream && \
git rebase upstream/${branch_name} && \
git fetch ${upstream_remote} && \
git rebase "${upstream_remote}/${branch_name}" && \
git push && \
git fetch -p