Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix new branch ancestor handling flow #36

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix new branch ancestor handling flow #36

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/commands/reconstruct.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,15 +163,16 @@ steps:
cd <<parameters.project-path>>

# check if commit from JOB_NUM is an ancestor of $CIRCLE_SHA1
git merge-base --is-ancestor $COMMIT_FROM_JOB_NUM $CIRCLE_SHA1 || { RETURN_CODE=$?; }
git merge-base --is-ancestor $COMMIT_FROM_JOB_NUM $CIRCLE_SHA1
RETURN_CODE=$?

if [[ $RETURN_CODE == 1 ]]; then
echo "----------------------------------------------------------------------------------------------------"
echo "commit $COMMIT_FROM_JOB_NUM from job $JOB_NUM is not an ancestor of the current commit"
echo "----------------------------------------------------------------------------------------------------"
JOB_NUM=$(( $JOB_NUM - 1 ))
continue
elif [[ $RETURN_CODE == "" ]]; then
elif [[ $RETURN_CODE == 0 ]]; then
echo "----------------------------------------------------------------------------------------------------"
echo "commit $COMMIT_FROM_JOB_NUM from job $JOB_NUM is an ancestor of the current commit"
echo "----------------------------------------------------------------------------------------------------"
Expand Down