Skip to content

Commit

Permalink
Fix GitLab CI integration depending on premium-only feature
Browse files Browse the repository at this point in the history
  • Loading branch information
underyx committed Jun 17, 2020
1 parent 2eb0a94 commit 53bd53b
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions semgrep_agent/bento.py
Original file line number Diff line number Diff line change
Expand Up @@ -122,11 +122,11 @@ def scan_gitlab_merge_request(ctx: click.Context) -> sh.RunningCommand:
debug_echo(
"== [1/4] going to go back to the commit you based your pull request on…"
)
git.checkout(os.environ["CI_MERGE_REQUEST_TARGET_BRANCH_SHA"])
git.checkout(os.environ["CI_MERGE_REQUEST_TARGET_BRANCH_NAME"])
debug_echo(git.status("--branch", "--short").stdout.decode())

debug_echo("== [2/4] …now adding your pull request's changes back…")
git.checkout(os.environ["CI_MERGE_REQUEST_SOURCE_BRANCH_SHA"], "--", ".")
git.checkout(os.environ["CI_MERGE_REQUEST_SOURCE_BRANCH_NAME"], "--", ".")
debug_echo(git.status("--branch", "--short").stdout.decode())

debug_echo("== [3/4] …adding the bento configuration…")
Expand Down

0 comments on commit 53bd53b

Please sign in to comment.