Skip to content

Commit

Permalink
Merge pull request #80 from imba-tjd/patch-1
Browse files Browse the repository at this point in the history
Use --force-with-lease instead of --force
  • Loading branch information
ZPascal authored May 4, 2022
2 parents 21d44fe + 59160b8 commit f43881e
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion start.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ echo "Push to branch $INPUT_BRANCH";
};

if ${INPUT_FORCE}; then
_FORCE_OPTION='--force'
_FORCE_OPTION='--force-with-lease'
fi

if ${INPUT_TAGS}; then
Expand Down

4 comments on commit f43881e

@matthewgarrettks
Copy link

Choose a reason for hiding this comment

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

This is causing all of our deploys to hang with a "stale info" status.:

! [rejected] HEAD -> staging-deploy (stale info)

@ZPascal
Copy link
Collaborator Author

@ZPascal ZPascal commented on f43881e May 5, 2022

Choose a reason for hiding this comment

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

Hi @matthewgarrettks, I'll revert the change. But in general, a --prune beforehand is not an option?

@dustinandband
Copy link

Choose a reason for hiding this comment

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

Was wondering why my auto-commits suddenly started erroring out with a "stale info" status when it had no problem beforehand. The revert fixed the issue. Thanks

@matthewgarrettks
Copy link

Choose a reason for hiding this comment

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

Thanks!!

Please sign in to comment.