Skip to content
This repository was archived by the owner on Jun 19, 2023. It is now read-only.

Perform git push before deleting branch #330

Closed
wants to merge 2 commits into from
Closed

Perform git push before deleting branch #330

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
219ec62
Perform git push before deleting branch
pokey Aug 2, 2017
94ff231
Apply git push fix to other commands
pokey Aug 23, 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
8 changes: 4 additions & 4 deletions git-flow-bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,6 +438,10 @@ helper_finish_cleanup() {
remotebranchdeleted=$FLAGS_FALSE
localbranchdeleted=$FLAGS_FALSE

if flag push; then
git_do push "$ORIGIN" "$BASE_BRANCH" || die "Could not push branch '$BASE_BRANCH' to remote '$ORIGIN'."
fi

if noflag keep; then

# Always delete remote first
Expand Down Expand Up @@ -469,10 +473,6 @@ helper_finish_cleanup() {
fi
fi

if flag push; then
git_do push "$ORIGIN" "$BASE_BRANCH" || die "Could not push branch '$BASE_BRANCH' to remote '$ORIGIN'."
fi

echo
echo "Summary of actions:"
echo "- The bugfix branch '$BRANCH' was merged into '$BASE_BRANCH'"
Expand Down
8 changes: 4 additions & 4 deletions git-flow-feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,6 +438,10 @@ helper_finish_cleanup() {
remotebranchdeleted=$FLAGS_FALSE
localbranchdeleted=$FLAGS_FALSE

if flag push; then
git_do push "$ORIGIN" "$BASE_BRANCH" || die "Could not push branch '$BASE_BRANCH' to remote '$ORIGIN'."
fi

if noflag keep; then

# Always delete remote first
Expand Down Expand Up @@ -469,10 +473,6 @@ helper_finish_cleanup() {
fi
fi

if flag push; then
git_do push "$ORIGIN" "$BASE_BRANCH" || die "Could not push branch '$BASE_BRANCH' to remote '$ORIGIN'."
fi

echo
echo "Summary of actions:"
echo "- The feature branch '$BRANCH' was merged into '$BASE_BRANCH'"
Expand Down
20 changes: 10 additions & 10 deletions git-flow-hotfix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -582,6 +582,16 @@ T,tagname! Use given tag name

run_post_hook "$VERSION_PREFIX$TAGNAME" "$ORIGIN" "$BRANCH"

if flag push; then
if [ "$BASE_BRANCH" = "$MASTER_BRANCH" ]; then
git_do push "$ORIGIN" "$DEVELOP_BRANCH" || die "Could not push branch '$DEVELOP_BRANCH' to remote '$ORIGIN'."
fi
git_do push "$ORIGIN" "$BASE_BRANCH" || die "Could not push branch '$BASE_BRANCH' to remote '$ORIGIN'."
if noflag notag; then
git_do push --tags "$ORIGIN" || die "Could not push tags to remote '$ORIGIN'."
fi
fi

# Delete branch
if noflag keep; then

Expand Down Expand Up @@ -611,16 +621,6 @@ T,tagname! Use given tag name

fi

if flag push; then
if [ "$BASE_BRANCH" = "$MASTER_BRANCH" ]; then
git_do push "$ORIGIN" "$DEVELOP_BRANCH" || die "Could not push branch '$DEVELOP_BRANCH' to remote '$ORIGIN'."
fi
git_do push "$ORIGIN" "$BASE_BRANCH" || die "Could not push branch '$BASE_BRANCH' to remote '$ORIGIN'."
if noflag notag; then
git_do push --tags "$ORIGIN" || die "Could not push tags to remote '$ORIGIN'."
fi
fi

echo
echo "Summary of actions:"
if flag fetch; then
Expand Down
24 changes: 12 additions & 12 deletions git-flow-release
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,18 @@ _finish_from_develop() {

run_post_hook "$VERSION_PREFIX$TAGNAME" "$ORIGIN" "$BRANCH"

if flag push; then
if flag pushdevelop; then
git_do push "$ORIGIN" "$DEVELOP_BRANCH" || die "Could not push branch '$DEVELOP_BRANCH' to remote '$ORIGIN'."
fi
if flag pushproduction; then
git_do push "$ORIGIN" "$MASTER_BRANCH" || die "Could not push branch '$MASTER_BRANCH' to remote '$ORIGIN'."
fi
if noflag notag && flag pushtag; then
git_do push --tags "$ORIGIN" || die "Could not push tags to remote '$ORIGIN'."
fi
fi

# Delete branch
if noflag keep; then

Expand Down Expand Up @@ -207,18 +219,6 @@ _finish_from_develop() {
fi
fi

if flag push; then
if flag pushdevelop; then
git_do push "$ORIGIN" "$DEVELOP_BRANCH" || die "Could not push branch '$DEVELOP_BRANCH' to remote '$ORIGIN'."
fi
if flag pushproduction; then
git_do push "$ORIGIN" "$MASTER_BRANCH" || die "Could not push branch '$MASTER_BRANCH' to remote '$ORIGIN'."
fi
if noflag notag && flag pushtag; then
git_do push --tags "$ORIGIN" || die "Could not push tags to remote '$ORIGIN'."
fi
fi

echo
echo "Summary of actions:"
if flag fetch; then
Expand Down