Skip to content

Commit

Permalink
Revert "Feature: Create a new branch, if the given branch name doesn'…
Browse files Browse the repository at this point in the history
…t exist yet"
  • Loading branch information
stefanzweifel committed Feb 23, 2021
1 parent 3870982 commit 75625df
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 44 deletions.
25 changes: 3 additions & 22 deletions entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -48,28 +48,9 @@ _switch_to_branch() {
git fetch --depth=1;
fi


# If INPUT_BRANCH is empty, just run `git checkout`
if [ -z "$INPUT_BRANCH" ]
then
# shellcheck disable=SC2086
git checkout $INPUT_BRANCH;
else
# If the branch which we should checkout already exists, just
# run `git checkout $INPUT_BRANCH`
# Otherwhise create a new branch by adding the `-b` option to
# `git-checkout`
# shellcheck disable=SC2086
if [ -n "$(git branch --list $INPUT_BRANCH)" ]
then
# shellcheck disable=SC2086
git checkout $INPUT_BRANCH;
else
# shellcheck disable=SC2086
git checkout -b $INPUT_BRANCH;
fi
fi

# Switch to branch from current Workflow run
# shellcheck disable=SC2086
git checkout $INPUT_BRANCH;
}

_add_files() {
Expand Down
22 changes: 0 additions & 22 deletions tests/git-auto-commit.bats
Original file line number Diff line number Diff line change
Expand Up @@ -331,25 +331,3 @@ git_auto_commit() {

assert_line "::debug::git-fetch has not been executed"
}

@test "If INPUT_BRANCH is set and the branch does not exist it creates one" {
INPUT_BRANCH="new-branch"

run git branch
refute_line "new-branch"

touch "${FAKE_LOCAL_REPOSITORY}"/new-file-{1,2,3}.txt

run git_auto_commit

assert_success

assert_line "INPUT_BRANCH value: new-branch"
assert_line --partial "::debug::Push commit to remote branch new-branch"

# Assert that branch "new-branch" was updated on remote
current_sha="$(git rev-parse --verify --short new-branch)"
remote_sha="$(git rev-parse --verify --short origin/new-branch)"

assert_equal $current_sha $remote_sha
}

0 comments on commit 75625df

Please sign in to comment.