Commit 5c502ad5 authored by Lin Jen-Shin's avatar Lin Jen-Shin

Also show diff because git status might not be readable

As shown at: https://gitlab.com/gitlab-org/gitlab-ee/-/jobs/82553270
parent 583c2ccc
......@@ -99,6 +99,7 @@ module EESpecificCheck
if status.porcelain == ''
status.head
else
diff = run_git_command("diff")
run_git_command("merge --abort")
say <<~MESSAGE
......@@ -106,9 +107,9 @@ module EESpecificCheck
💥 #{ce_fetch_head} with canonical-ce/master. Please resolve
💥 the conflict from CE master and retry this job.
⚠️ Git status:
⚠️ Git diff:
#{status.porcelain}
#{diff}
MESSAGE
exit(254)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment