Merge main from upstream

[radsaq]

There are some failing tests here, but there were some failing tests before due to the changes to error handling. I've tested it locally with lazygit and it seems to work (and passes integration tests).

This is the second step towards fixing jesseduffield/lazygit#4354 and requires jesseduffield/lazygit#4377 to be merged first.

[jesseduffield]

@radsaq Given how small the (pre-existing) changes are on this fork, what do you think about hard resetting to the upstream and then re-applying the changes over the top. We could even use a replace directive in the go.mod file to remove the need to update import paths.

Thoughts?

[jesseduffield]

Actually @stefanhaller has just reminded me that we had issues with the replace directive in the past so it's not worth doing.

[radsaq]

I tested this with a replace directive to a local repo, so it seems to work for that. Does it not work as well when it's pointing to a remote url?

[stefanhaller]

@radsaq Replace directives have the problem that they don't work when users want to do go install github.com/jesseduffield/lazygit@latest. We discussed this at length the last time we tried to use one for a fork, and had to revert the change eventually. It seems to be a well-known problem, and as far as I understand, replace directives are only meant to be used for overriding a dependency during local development.

--

I now rebased the master branch onto upstream; I didn't force-push yet so that you guys can have a look. I pushed it as rebased-master in this repo.

A few things:

• I decided not to rebase it onto upstream main, but onto the last release (5.14.1). They diverge quite a bit, it seems. The reason is that main is currently somewhere in the middle between v5 and v6, so it doesn't feel like a good base for use to use.
• I reverted the two commits that deal with branch unmarshalling errors, and replaced them with a much simpler change. I can't test it because I don't know what the original problem was that those changes were supposed to fix (better commit messages please!). If this looks fine, I'll drop the original commits and the reverts.

A PR that integrates this into lazygit is here: jesseduffield/lazygit#4460

[jesseduffield]

I decided not to rebase it onto upstream main, but onto the last release (5.14.1). They diverge quite a bit, it seems. The reason is that main is currently somewhere in the middle between v5 and v6, so it doesn't feel like a good base for use to use.

Makes sense to me

I reverted the two commits that deal with branch unmarshalling errors, and replaced them with a much simpler change. I can't test it because I don't know what the original problem was that those changes were supposed to fix (better commit messages please!). If this looks fine, I'll drop the original commits and the reverts.

My bad on the commit messages. I like to believe that I've improved in that area since 2020!

Your commit looks good to me so let's go with that

[stefanhaller]

I rebased and force-pushed master, so I'm going to close this.