tachybase/git-auto-commit-action
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #108 from stefanzweifel/fetch-repo-before-checkout

Browse Source 
Better support branches with special characters in them
This commit is contained in:
Stefan Zweifel 2020-10-10 19:19:48 +02:00 committed by GitHub
commit a9d1ac4f06
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
entrypoint.sh
View File

@ -39,6 +39,9 @@ _git_is_dirty() {
_switch_to_branch() { _switch_to_branch() {
echo "INPUT_BRANCH value: $INPUT_BRANCH"; echo "INPUT_BRANCH value: $INPUT_BRANCH";
# Fetch remote to make sure that repo can be switched to the right branch.
git fetch;
# Switch to branch from current Workflow run # Switch to branch from current Workflow run
git checkout $INPUT_BRANCH; git checkout $INPUT_BRANCH;
} }

10
tests/commit.bats
View File

@ -98,6 +98,7 @@ main() {
INPUT_SKIP_DIRTY_CHECK=true INPUT_SKIP_DIRTY_CHECK=true
shellmock_expect git --type exact --match "status -s ." shellmock_expect git --type exact --match "status -s ."
shellmock_expect git --type exact --match "fetch"
shellmock_expect git --type exact --match "checkout master" shellmock_expect git --type exact --match "checkout master"
shellmock_expect git --type exact --match "add ." shellmock_expect git --type exact --match "add ."
shellmock_expect git --type partial --match '-c' shellmock_expect git --type partial --match '-c'
@ -109,10 +110,11 @@ main() {
shellmock_verify shellmock_verify
[ "${capture[0]}" = "git-stub status -s -- ." ] [ "${capture[0]}" = "git-stub status -s -- ." ]
[ "${capture[1]}" = "git-stub checkout master" ] [ "${capture[1]}" = "git-stub fetch" ]
[ "${capture[2]}" = "git-stub add ." ] [ "${capture[2]}" = "git-stub checkout master" ]
[ "${capture[3]}" = "git-stub -c user.name=Test Suite -c user.email=test@github.com commit -m Commit Message --author=Test Suite <test@users.noreply.github.com>" ] [ "${capture[3]}" = "git-stub add ." ]
[ "${capture[4]}" = "git-stub push --set-upstream origin HEAD:master --tags" ] [ "${capture[4]}" = "git-stub -c user.name=Test Suite -c user.email=test@github.com commit -m Commit Message --author=Test Suite <test@users.noreply.github.com>" ]
[ "${capture[5]}" = "git-stub push --set-upstream origin HEAD:master --tags" ]
# Failed Exit Code # Failed Exit Code
[ "$status" -ne 0 ] [ "$status" -ne 0 ]