Skip to content

Add no-force option to git push without force. #36

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

Open
glennpratt wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add no-force option to git push without force. #36

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
7 changes: 5 additions & 2 deletions git-subsplit.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ tags= only publish for listed tags instead of all tags
no-tags do not publish any tags
update fetch updates from repository before publishing
rebuild-tags rebuild all tags (as opposed to skipping tags that are already synced)
no-force do not force push git branches or tags
"
eval "$(echo "$OPTS_SPEC" | git rev-parse --parseopt -- "$@" || echo exit $?)"

Expand Down Expand Up @@ -55,6 +56,7 @@ NO_TAGS=
REBUILD_TAGS=
DRY_RUN=
VERBOSE=
GIT_FORCE="--force"

subsplit_main()
{
Expand All @@ -72,6 +74,7 @@ subsplit_main()
-n) DRY_RUN="--dry-run" ;;
--dry-run) DRY_RUN="--dry-run" ;;
--rebuild-tags) REBUILD_TAGS=1 ;;
--no-force) GIT_FORCE="" ;;
--) break ;;
*) die "Unexpected option: $opt" ;;
esac
Expand Down Expand Up @@ -235,7 +238,7 @@ subsplit_publish()

if [ $RETURNCODE -eq 0 ]
then
PUSH_CMD="git push -q ${DRY_RUN} --force $REMOTE_NAME ${LOCAL_BRANCH}:${HEAD}"
PUSH_CMD="git push -q ${DRY_RUN} ${GIT_FORCE} $REMOTE_NAME ${LOCAL_BRANCH}:${HEAD}"

if [ -n "$VERBOSE" ];
then
Expand Down Expand Up @@ -303,7 +306,7 @@ subsplit_publish()
say " - subtree split for '${TAG}' [DONE]"
if [ $RETURNCODE -eq 0 ]
then
PUSH_CMD="git push -q ${DRY_RUN} --force ${REMOTE_NAME} ${LOCAL_TAG}:refs/tags/${TAG}"
PUSH_CMD="git push -q ${DRY_RUN} ${GIT_FORCE} ${REMOTE_NAME} ${LOCAL_TAG}:refs/tags/${TAG}"

if [ -n "$VERBOSE" ];
then
Expand Down