Recent force-push to master may have omitted changes

[gotgenes]

Description

Hi,

master has recently diverged from its previous history. I noticed this when Packer failed to updated the plugin, saying it could not fast-forward to the latest changes. Here's a look at the recent history locally vs. in GitHub.

* 87961d3 - (origin/master, origin/HEAD) fix(#1822): test directory capable of watching before presenting it (#1901) (16 hours ago) <Alexander Courtis>
| * bac962c - (HEAD -> master) feat(api): add api.config.mappings.active, api.config.mappings.default (#1876) (7 days ago) <Alexander Courtis>
| * cdbd7da - fix(#1878): nvim frozen on no name buffer when modified.enable (#1879) (7 days ago) <Richard Li>
|/
* 951b6e7 - fix(#1836): add view.debounce_delay (#1871) (8 days ago) <Richard Li>
* e322fbb - chore: remove diagnostic suppressions after tidying nits (9 days ago) <Alexander Courtis>
* 9d27c9e - doc: add recipes and tips links to API (9 days ago) <Alexander Courtis>
* 013b498 - doc: add recipes and tips links to API (9 days ago) <Alexander Courtis>

It is possible that the changes in #1876 and #1879 have been omitted. You might want to verify the changes in those PRs are still present in the codebase.

Neovim version

N/A

Operating system and version

N/A

nvim-tree version

master

Minimal config

N/A

Steps to reproduce

N/A

Expected behavior

No response

Actual behavior

No response

[alex-courtis]

Thank you @gotgenes for digging into this and finding these.

Force pushing is always a bad idea.

Users experiencing problems: please reinstall or delete/install nvim-tree.

[alex-courtis]

Packer didn't pick up anything for me as I'm using the default depth of 1. Have you configured packer to get full history?

Should be fixed now, thanks again.

[chomosuke]

@alex-courtis Packer complained because for people who have done git config --global pull.ff only git will complain unable to fastward which will then cause packer to fail. Interestingly Lazy.nvim by default is actually fine as they just check out origin/master.

While the current state of master is okay, I'd actually recommend @alex-courtis to force push again so that 5a3a7f5ba47f7e976462bc8431e34252fbd08888 come back and be present in master again (Edit: i mean to force push to bring master back to the state it was 20 hours ago before any force push happened). In this way only people who have updated in the last 19 hours will be unable to fast forward instead of all the people who've updated in the last week. This would also allow people who had simply ignored the packer error to have the update working again :).

[alex-courtis]

I've manually merged all the missing commits:

* cc3c5e7 (HEAD -> master, origin/master, origin/HEAD) ci: fix release-please workflow (#1899)  Alexander Courtis  36 seconds ago
* 37eda63 chore(deps): bump JohnnyMorganz/stylua-action from 1 to 2 (#1897)  Alexander Courtis  73 seconds ago
* 4b74990 chore(deps): bump actions/checkout from 2 to 3 (#1898)  dependabot[bot]  Alexander Courtis  2 minutes ago
* 907adac ci: add release-please workflow (#1892)  Alexander Courtis  4 minutes ago
* 5417557 feat(event): add TreeAttachedPost (#1877)  Alexander Courtis  5 minutes ago
* 3c51d1f feat: add ui.confirm.remove and ui.confirm.trash, deprecate trash.require_confirm (#1887)  Alexander Courtis  22 minutes ago
* 16a0e3c (tag: nightly) feat(api): add api.config.mappings.active, api.config.mappings.default (#1876)  Alexander Courtis  65 minutes ago
* 54b850a fix(#1878): nvim frozen on no name buffer when modified.enable (#1879)  Alexander Courtis  66 minutes ago
* 87961d3 fix(#1822): test directory capable of watching before presenting it (#1901)  Alexander Courtis  Mon 13:59

[alex-courtis]

While the current state of master is okay, I'd actually recommend @alex-courtis to force push again so that 5a3a7f5ba47f7e976462bc8431e34252fbd08888 come back and be present in master again

That would have been much smarter. My acting fast has caused a lot of problems. There will be no further such repository forces.

[chomosuke]

That would have been much smarter. My acting fast has caused a lot of problems. There will be no further such repository forces.

You can still do that now. It's only been 20 hours.

[alex-courtis]

That would have been much smarter. My acting fast has caused a lot of problems. There will be no further such repository forces.

You can still do that now. It's only been 20 hours.

I am not confident in my ability to do that.

Could you execute that?

The only commit after that point has been 87961d3 and I can reapply that afterwards.

[chomosuke]

Ahh sure, I didn't know I had premission to force push to master haha.