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.

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

branch config: invalid merge #688

Open
daurnimator opened this issue Jun 2, 2021 · 4 comments
Open

branch config: invalid merge #688

daurnimator opened this issue Jun 2, 2021 · 4 comments
Labels
lifecycle/stale Inactive for 90d or more

Comments

@daurnimator
Copy link

daurnimator commented Jun 2, 2021

I'm trying to run git bug bridge pull but it fails with:

Error: can't read configured bridges: branch config: invalid merge
$ git bug version
git-bug version: 0.7.1-dev-663c429605

I'm running this in a repository where I once ran an old (0.4.0?) version of git-bug; but attempted to clean out.

git for-each-ref refs/ # shows no identities or bugs
rm -rf .git/git-bug
@daurnimator
Copy link
Author

This seems to be caused by the following piece of the repository's .git/config:

[branch "refs/pull/6952/head"]
	remote = origin
	merge = refs/pull/6952/head

For some reason, git-bug doesn't like that value for merge.

@GlancingMind
Copy link
Contributor

Possible a go-git bug as a similar looking issue is posted at go-git/go-git#331

@MichaelMure
Copy link
Collaborator

This is indeed the problem, also mentioned in go-git/go-git#530

Copy link

This bot triages untriaged issues and PRs according to the following rules:

  • After 90 days of inactivity, the lifecycle/stale label is applied
  • After 30 days of inactivity since lifecycle/stale was applied, the issue is closed

To remove the stale status, you can:

  • Remove the lifecycle/stale label
  • Comment on this issue

@github-actions github-actions bot added the lifecycle/stale Inactive for 90d or more label Jul 23, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
lifecycle/stale Inactive for 90d or more
Projects
None yet
Development

No branches or pull requests

3 participants