Danger fails with "Cannot find a merge base between danger_base and danger_head" #768

php-coder · 2017-03-30T22:23:10Z

Report

What did you do?

I'm running danger on Travis CI from a pull request.

What did you expect to happen?

Danger shouldn't crash.

What happened instead?

There is no comment on a PR and in the travis log I see the following error:

remote: Counting objects: 5, done.
remote: Compressing objects: 100% (5/5), done.
remote: Total 5 (delta 0), reused 5 (delta 0), pack-reused 0
Unpacking objects: 100% (5/5), done.
From https://github.com/php-coder/mystamps
 * [new tag]         0.1        -> 0.1
 * [new tag]         0.1.1      -> 0.1.1
 * [new tag]         0.1.2      -> 0.1.2
 * [new tag]         0.1.3      -> 0.1.3
 * [new tag]         0.2        -> 0.2
 * [new tag]         0.3        -> 0.3
/home/travis/.rvm/gems/ruby-2.2.5/gems/danger-4.3.2/lib/danger/scm_source/git_repo.rb:77:in `find_merge_base': Cannot find a merge base between danger_base and danger_head. (RuntimeError)
	from /home/travis/.rvm/gems/ruby-2.2.5/gems/danger-4.3.2/lib/danger/scm_source/git_repo.rb:16:in `diff_for_folder'
	from /home/travis/.rvm/gems/ruby-2.2.5/gems/danger-4.3.2/lib/danger/danger_core/dangerfile.rb:259:in `setup_for_running'
	from /home/travis/.rvm/gems/ruby-2.2.5/gems/danger-4.3.2/lib/danger/danger_core/dangerfile.rb:269:in `run'
	from /home/travis/.rvm/gems/ruby-2.2.5/gems/danger-4.3.2/lib/danger/danger_core/executor.rb:27:in `run'
	from /home/travis/.rvm/gems/ruby-2.2.5/gems/danger-4.3.2/lib/danger/commands/runner.rb:66:in `run'
	from /home/travis/.rvm/gems/ruby-2.2.5/gems/claide-1.0.1/lib/claide/command.rb:334:in `run'
	from /home/travis/.rvm/gems/ruby-2.2.5/gems/danger-4.3.2/bin/danger:5:in `<top (required)>'
	from /home/travis/.rvm/gems/ruby-2.2.5/bin/danger:22:in `load'
	from /home/travis/.rvm/gems/ruby-2.2.5/bin/danger:22:in `<main>'
	from /home/travis/.rvm/gems/ruby-2.2.5/bin/ruby_executable_hooks:15:in `eval'
	from /home/travis/.rvm/gems/ruby-2.2.5/bin/ruby_executable_hooks:15:in `<main>'

Your Environment

Which CI are you running on? Travis CI
Are you running the latest version of Danger? yes
What is your Dangerfile? It's here but error doesn't relate to my configuration

The text was updated successfully, but these errors were encountered:

php-coder · 2017-04-03T21:35:39Z

This issue is reproduced on one of my PRs and danger doesn't work at all :(

orta · 2017-04-04T08:01:25Z

Does 4.3.1?

php-coder · 2017-04-04T08:28:49Z

4.3.2 Should I try 4.3.1?

orta · 2017-04-04T08:35:27Z

There were changes around this in 4.3.2 - CHANGELOG

Might be worth seeing if they affected you.

php-coder · 2017-04-04T10:07:19Z

No, it's definitely not related to a new version because another PR is also running on a new version and doesn't fail with such error.

orta · 2017-04-04T10:12:49Z

Sounds like this is a dupe of #768 then

php-coder · 2017-04-04T10:47:17Z

Sounds like this is a dupe of #768 then

Duplicate of itself? :)

orta · 2017-04-04T10:48:12Z

ah yeah, #660

…n danger_base and danger_head" error. Details: danger/danger#768

php-coder · 2017-04-05T22:20:42Z

No, it's definitely not related to a new version because another PR is also running on a new version and doesn't fail with such error.

I was wrong, it fails on both of PRs. I'm trying to rollback to 4.3.1

php-coder · 2017-04-06T21:16:14Z

I confirm that rolling back to 4.3.1 is solving this error.

orta · 2017-04-07T16:41:02Z

I wonder if different versions of git have different behaviour here, can you leave some breadcrumbs in #660 so that you or others can debug 👍

php-coder · 2017-04-08T11:30:25Z

I'm not sure that this issue is the same as #660 because error messages and stack traces are different.

orta · 2017-04-08T14:26:05Z

Changes due to #660 were the only thing that shipped in 4.3.1

php-coder · 2017-04-15T20:56:25Z

Could it be related to custom git clone depth in TravisCI?

git:
  depth: 1

orta · 2017-04-15T21:37:34Z

Yep, that would make sure that the commits Danger is looking for would need to be re-downloaded

kgaidis · 2017-07-31T16:09:07Z

We had this error because there were two branches with the same name: feature/iOS-11 and feature/ios-11 (a mistake). Deleting one of the branches fixed the error.

The tricky thing is that PR's unrelated to these branches were failing, so out of nowhere, all PR's were failing.

Could there be some branch naming collision "bug" in Danger?

Related: https://stackoverflow.com/a/38494084/826435

bundler: failed to load command: danger (/Users/behance/.rbenv/versions/2.3.1/bin/danger)
RuntimeError: Cannot find a merge base between danger_base and danger_head.
  /Users/behance/.rbenv/versions/2.3.1/lib/ruby/gems/2.3.0/gems/danger-5.3.2/lib/danger/scm_source/git_repo.rb:104:in `find_merge_base'
  /Users/behance/.rbenv/versions/2.3.1/lib/ruby/gems/2.3.0/gems/danger-5.3.2/lib/danger/scm_source/git_repo.rb:16:in `diff_for_folder'
  /Users/behance/.rbenv/versions/2.3.1/lib/ruby/gems/2.3.0/gems/danger-5.3.2/lib/danger/danger_core/dangerfile.rb:259:in `setup_for_running'
  /Users/behance/.rbenv/versions/2.3.1/lib/ruby/gems/2.3.0/gems/danger-5.3.2/lib/danger/danger_core/dangerfile.rb:269:in `run'
  /Users/behance/.rbenv/versions/2.3.1/lib/ruby/gems/2.3.0/gems/danger-5.3.2/lib/danger/danger_core/executor.rb:27:in `run'
  /Users/behance/.rbenv/versions/2.3.1/lib/ruby/gems/2.3.0/gems/danger-5.3.2/lib/danger/commands/runner.rb:66:in `run'
  /Users/behance/.rbenv/versions/2.3.1/lib/ruby/gems/2.3.0/gems/claide-1.0.2/lib/claide/command.rb:334:in `run'
  /Users/behance/.rbenv/versions/2.3.1/lib/ruby/gems/2.3.0/gems/danger-5.3.2/bin/danger:5:in `<top (required)>'
  /Users/behance/.rbenv/versions/2.3.1/bin/danger:22:in `load'
  /Users/behance/.rbenv/versions/2.3.1/bin/danger:22:in `<top (required)>'
Build step 'Execute shell' marked build as failure
[BFA] Scanning build for known causes...
[BFA] No failure causes found
[BFA] Done. 0s

…n danger_base and danger_head" error. Details: danger/danger#768

zdnk · 2017-09-04T18:04:41Z

I have this issue too with jenkins and Bitbucket.
This is our config:

And what it does:

raymondhoagland · 2017-10-20T13:36:27Z

I'm seeing this as well with Jenkins and Github. We are doing shallow clones with a depth of 1 and the error appears to be sporadic.

Most of the time the job works fine, but ~20% it runs into the error. Usually running the job again seems to fix it which makes it even more confusing for us to track down.

Seems almost like it bails every time fetch has to do either a forced update or gets a new ref.

iwasrobbed-ks · 2018-06-20T20:53:45Z

Just dropping a breadcrumb: we were doing shallow clones on CI for PR builds and once the # of commits on that PR surpassed that depth, it started failing with this error

JoeSSS · 2019-01-10T20:26:06Z

It feels like danger does some black magic to get the base and the HEAD, which is not really compatible to what shallow clone is about. What helped to me is adding master additionally to refspec: +refs/pull/${ghprbPullId}/merge:refs/remotes/origin/pr/${ghprbPullId}/merge +refs/heads/master:refs/remotes/origin/master and then defining base and the head on my own while calling danger like: danger --head=\$(git rev-parse HEAD) --base=\$(git rev-parse origin/master) ....

kgaidis · 2019-01-10T21:42:38Z

I think I forgot to comment on an update.

I'm pretty sure that what @rob-keepsafe said worked. We had shallow clone of depth 1, and once it was changed to shallow clone of depth 100 it has worked since. The 100 is just a random number to maximize the chance of this issue not happening.

JCarlosR · 2023-08-23T04:14:40Z

I tried with depth 100 and bigger numbers, also disabling shadow clone, but still get this error:

bundler: failed to load command: danger (/root/.asdf/installs/ruby/3.2.1/bin/danger)
/root/.asdf/installs/ruby/3.2.1/lib/ruby/gems/3.2.0/gems/danger-9.3.1/lib/danger/scm_source/git_repo.rb:135:in `find_merge_base': Cannot find a merge base between danger_base and danger_head. If you are using shallow clone/fetch, try increasing the --depth (RuntimeError)

Any insights on what else could be causing this?

On the logs I see the repo being completely cloned (all branches, tags).

Edit: Might be related to this.

php-coder added a commit to php-coder/mystamps that referenced this issue Apr 5, 2017

.travis.yml: use danger 4.3.1 to fix "Cannot find a merge base betwee…

f0db775

…n danger_base and danger_head" error. Details: danger/danger#768

bodom91 pushed a commit to bodom91/mystamps that referenced this issue Aug 2, 2017

.travis.yml: use danger 4.3.1 to fix "Cannot find a merge base betwee…

15c701c

…n danger_base and danger_head" error. Details: danger/danger#768

jywarren mentioned this issue Jan 12, 2018

API for fetching nearby coordinates information publiclab/plots2#1978

Closed

ryzokuken mentioned this issue Feb 3, 2018

Add tweet button to suscription share button publiclab/plots2#2217

Merged

jywarren mentioned this issue Nov 9, 2018

Danger error reporting is failing with publiclab/plots2#3935

Closed

kgaidis mentioned this issue Jan 10, 2019

Git Fatal on Danger Branches #913

Open

philipqnguyen mentioned this issue Jun 26, 2020

Descriptive error message on shallow clone/fetch #trivial #1239

Merged

danielgomezrico mentioned this issue Jan 14, 2022

Danger crash on start with a repository that has more than 2041 branches #1344

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Danger fails with "Cannot find a merge base between danger_base and danger_head" #768

Danger fails with "Cannot find a merge base between danger_base and danger_head" #768

php-coder commented Mar 30, 2017

php-coder commented Apr 3, 2017

orta commented Apr 4, 2017

php-coder commented Apr 4, 2017

orta commented Apr 4, 2017

php-coder commented Apr 4, 2017

orta commented Apr 4, 2017

php-coder commented Apr 4, 2017

orta commented Apr 4, 2017

php-coder commented Apr 5, 2017

php-coder commented Apr 6, 2017 •

edited

orta commented Apr 7, 2017

php-coder commented Apr 8, 2017

orta commented Apr 8, 2017

php-coder commented Apr 15, 2017

orta commented Apr 15, 2017

kgaidis commented Jul 31, 2017 •

edited

zdnk commented Sep 4, 2017 •

edited

raymondhoagland commented Oct 20, 2017 •

edited

iwasrobbed-ks commented Jun 20, 2018

JoeSSS commented Jan 10, 2019

kgaidis commented Jan 10, 2019

JCarlosR commented Aug 23, 2023 •

edited

Danger fails with "Cannot find a merge base between danger_base and danger_head" #768

Danger fails with "Cannot find a merge base between danger_base and danger_head" #768

Comments

php-coder commented Mar 30, 2017

Report

What did you do?

What did you expect to happen?

What happened instead?

Your Environment

php-coder commented Apr 3, 2017

orta commented Apr 4, 2017

php-coder commented Apr 4, 2017

orta commented Apr 4, 2017

php-coder commented Apr 4, 2017

orta commented Apr 4, 2017

php-coder commented Apr 4, 2017

orta commented Apr 4, 2017

php-coder commented Apr 5, 2017

php-coder commented Apr 6, 2017 • edited

orta commented Apr 7, 2017

php-coder commented Apr 8, 2017

orta commented Apr 8, 2017

php-coder commented Apr 15, 2017

orta commented Apr 15, 2017

kgaidis commented Jul 31, 2017 • edited

zdnk commented Sep 4, 2017 • edited

raymondhoagland commented Oct 20, 2017 • edited

iwasrobbed-ks commented Jun 20, 2018

JoeSSS commented Jan 10, 2019

kgaidis commented Jan 10, 2019

JCarlosR commented Aug 23, 2023 • edited

php-coder commented Apr 6, 2017 •

edited

kgaidis commented Jul 31, 2017 •

edited

zdnk commented Sep 4, 2017 •

edited

raymondhoagland commented Oct 20, 2017 •

edited

JCarlosR commented Aug 23, 2023 •

edited