Skip to content

Commit e1da900

Browse files
authored
Merge pull request #15 from stavxyz/update-github-cli
Update GitHub CLI to 1.13.1
2 parents 6a8e32c + e04f228 commit e1da900

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
FROM alpine:3.14
22

33
ARG GH_VERSION
4-
ENV GH_VERSION ${GH_VERSION:-1.12.1}
4+
ENV GH_VERSION ${GH_VERSION:-1.13.1}
55
WORKDIR /gitmux
66

77
COPY gitmux.sh .

gitmux.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -645,13 +645,13 @@ perform_rebase () {
645645
fi
646646

647647
log "Pushing to branch ${DESTINATION_PR_BRANCH_NAME}"
648-
git push --tags destination
648+
git push --force-with-lease --tags destination
649649
git push --follow-tags --progress --atomic --verbose --force-with-lease destination "${DESTINATION_PR_BRANCH_NAME}"
650650
else
651651
# rebase in elif condition succeeded
652652
log "Rebase completed successfully."
653653
log "Pushing to branch ${DESTINATION_PR_BRANCH_NAME}"
654-
git push --tags destination
654+
git push --force-with-lease --tags destination
655655
git push --follow-tags --progress --atomic --verbose --force-with-lease destination "${DESTINATION_PR_BRANCH_NAME}"
656656
fi
657657
}

0 commit comments

Comments
 (0)