Skip to content

Improve default remote detection #793

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 1 commit into from
Nov 19, 2024
Merged

Improve default remote detection #793

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 6 additions & 5 deletions bin/git-upstream-sync
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,14 @@

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'
if [[ -n "$upstream_remote" ]]; then
upstream_remote=$(git remote show | head -1)
fi
fi

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