strangedev / neuron-buildbot Goto Github PK

Hi 👋

cool project you have here. I found a teeny little bug:

If i force push a change in my history - as I sometimes do when I find typos I made just seconds ago - the history in the remote diverges from the current state of the repo in the buildbot. When it then receives a webhook call, it tries to pull using a fast-forward merge - which obviously fails.

This is the error message I get:

[2020-12-02T19:55:04.214Z][Info] ❗ Received a push event.
[2020-12-02T19:55:04.997Z][Error] 💥 Cannot pull from https://git.staubwolke.org/yeldir/zettelkasten: CannotPullRepository: FastForwardError: A simple fast-forward merge was not possible.

I suggest to always force-pull, since the build bot never makes changes to its local repository. When it receives a webhook call, it should just get the current state from remote and disregard its own history, if it diverges.

Kind regards and I'll surely help out,
yeldiR