search

CircleCI-Archived / build-tools-orb

An orb with handy tools for use in CircleCI jobs
https://circleci.com/developer/orbs/orb/circleci/build-tools
MIT License
8 stars 9 forks source link

"merge-with-parent" on 2.8.0 still fails #31

Closed akx closed 3 years ago

akx commented 3 years ago

Orb version

2.8.0

What happened

Refs #29 – 2.8.0 fixed the non-existing user but Git would also like to have a merge message without opening up an editor for it.

#!/bin/bash --login
CHILD_BRANCH=$(git rev-parse --abbrev-ref HEAD)
if [ "$CHILD_BRANCH" = "master" ]; then
  echo "Can't merge branch into itself! Skipping."
  exit 0
fi
git checkout master
git merge $CHILD_BRANCH
Switched to branch 'master'
Your branch is up to date with 'origin/master'.
error: Terminal is dumb, but EDITOR unset
Not committing merge; use 'git commit' to complete the merge.

Exited with code exit status 1
CircleCI received exit code 1

Expected behavior

The merge should succeed with some default message.

gmemstr commented 3 years ago

Interesting - according to the integration tests, this goes off without a hitch, so I wonder what might require the editor (I can't recall the exact scenario off the top of my head).