Commit 87147385 authored by norvell's avatar norvell
Browse files

Fix fetch

parent 34e13b27

.gitlab-ci.yml

+2 −2
Original line number Diff line number Diff line
@@ -1077,7 +1077,7 @@ branch-is-up-to-date-with-target-pre: 
        echo "Your branch is behind the target branch, run 'git pull origin $CI_MERGE_REQUEST_TARGET_BRANCH_NAME' to update."

        exit 1

      fi

    - git fetch $CI_MERGE_REQUEST_TARGET_BRANCH_NAME

    - git fetch origin $CI_MERGE_REQUEST_TARGET_BRANCH_NAME

    - TARGET_COMMIT=$(git rev-parse origin/$CI_MERGE_REQUEST_TARGET_BRANCH_NAME)

    - echo "TARGET_COMMIT is $TARGET_COMMIT"

    - echo $TARGET_COMMIT > $MERGE_TARGET_COMMIT_FILE
@@ -1148,7 +1148,7 @@ branch-is-up-to-date-with-target-pre: 
        echo -e "Your branch is $commits_behind_count commits behind the target branch, run\n\tgit pull origin $CI_MERGE_REQUEST_TARGET_BRANCH_NAME\nto update."

        exit 1

      fi

    - git fetch $CI_MERGE_REQUEST_TARGET_BRANCH_NAME

    - git fetch origin $CI_MERGE_REQUEST_TARGET_BRANCH_NAME

    - TARGET_COMMIT=$(git rev-parse origin/$CI_MERGE_REQUEST_TARGET_BRANCH_NAME)

    - echo "TARGET_COMMIT is $TARGET_COMMIT"

    - echo $TARGET_COMMIT > $MERGE_TARGET_COMMIT_FILE