Skip to content
This repository has been archived by the owner on May 7, 2024. It is now read-only.

fix(chore): bugs autosquash always set true #103

Merged
merged 2 commits into from Dec 13, 2022
Merged

fix(chore): bugs autosquash always set true #103

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
75feed6
fix(chore): bugs autosquash always set true
adeherysh Jul 30, 2022
c20769a
fix(chore): autosquash input default as string
adeherysh Jul 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions action.yml
View file
Open in desktop
Expand Up @@ -8,7 +8,7 @@ inputs:
autosquash:
description: Should the rebase autosquash fixup and squash commits
required: false
default: false
default: 'false'
branding:
icon: git-pull-request
color: purple
color: purple
2 changes: 1 addition & 1 deletion entrypoint.sh
View file
Open in desktop
Expand Up @@ -100,7 +100,7 @@ git fetch fork $HEAD_BRANCH

# do the rebase
git checkout -b fork/$HEAD_BRANCH fork/$HEAD_BRANCH
if [[ $INPUT_AUTOSQUASH -eq 'true' ]]; then
if [[ $INPUT_AUTOSQUASH == 'true' ]]; then
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 Thanks, this is affecting me too.

GIT_SEQUENCE_EDITOR=: git rebase -i --autosquash origin/$BASE_BRANCH
else
git rebase origin/$BASE_BRANCH
Expand Down