Skip to content

Teach "git submit" the same user:branch trick as "git sync". #116

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
iphydf merged 1 commit into from
Apr 5, 2020
Merged

Teach "git submit" the same user:branch trick as "git sync". #116

Show file tree
Hide file tree
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
20 changes: 15 additions & 5 deletions tools/git-submit
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,22 @@

set -eu

BRANCH=$1
REMOTE=""
BRANCH="${1-master}"

if (echo "$BRANCH" | grep ':' > /dev/null); then
REMOTE="$(echo "$BRANCH" | grep -o '^[^:]*')"
BRANCH="$(echo "$BRANCH" | grep -o '[^:]*$')"
REMOTE="$(git remote -v | grep ":$REMOTE/.* (push)" | grep -o '^\S*')"
fi

if [ -n "$REMOTE" ]; then
git checkout --track "$REMOTE/$BRANCH"
else
git checkout $BRANCH
fi

git checkout "$BRANCH"
git push upstream "$BRANCH:master"
git checkout master
git merge upstream/master
git push
git sync
git branch -d "$BRANCH"
git push origin ":$BRANCH"
1 change: 0 additions & 1 deletion tools/git-sync
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ case "$BRANCH" in
else
git checkout $BRANCH
fi
git checkout $BRANCH
git rebase upstream/master
;;
esac
Expand Down