Pull failed warning

[drozzy]

Setting both push and pull time to 1 minute I still get this occasionally (but nothing breaks):

[Vinzent03]

Are you on the latest version? (1.8.0)

[drozzy]

Yeah, I just installed it today.
It's odd it happens occasionally. Maybe it has something to do with pull&push and pull happening at the same time?

[Vinzent03]

What is the output of git status in the terminal? (Open terminal in your vault root)

[drozzy]

It's all clean. So clearly the pull/add/commit/push happens successfully.

[Vinzent03]

I have no problems with setting both pull and push to one minute. Now I get it. That's a normal git error message. You called pull, which was not able to merge fast-forward your changes, why git wants you to commit your changes. That happened, because the pushcommand was called directly afterwards. That's no error with this plugin,
In generally you cannot pull when pulled files are not committed in your working directory.

[drozzy]

Um... I didn't call anything manually. My repo is pushed.
But that's not even the issue for me. It's the pop up that's annoying.

The plug-in still shows this error as a pop up even though I disabled notifications. It would be nice to disable this notification as well.

[Vinzent03]

The issue does still occur? Could you run git pull manually from the terminal? Does it work without error?

This notification is handled as an error and not as an information, why the notifications is still shown.

[denolehov]

@drozzy please make sure that your files are backed up by other means rather than via git, and run git reset --hard and then git pull from the command line. Making your repository "clean" should resolve this issue.

[drozzy]

Yes, I ensured that my git pull is clean and I did git reset --hard as well. I am certain my repository is clean. Yet it still happens.

I observed that this happens if I am typing something continuously, and the "obsidian git" plugin is triggered in the middle of me typing.

[a-trost]

Getting this same exact error every time my auto-pull triggers. Already did git reset --hard and git pull, it's all good except for that error getting thrown. On the latest version.

I'm also seeing that it seems to happen if it triggers when I'm typing.

Also I agree with this:

The plug-in still shows this error as a pop up even though I disabled notifications. It would be nice to disable this notification as well.

Let me know if there's anything I can do to help with this.

[Vinzent03]

Do you have only auto pull enabled or auto push too? And the remote repo had no changes since the last push from Obsidian? Because I think this error can just be related to changes from the remote.

[a-trost]

Hey @Vinzent03 I have both enabled at 3 minute intervals.
Here are my settings:

Nothing changed on the remote repo.
I'm guessing there's something weird with the combination of Push+Pull happening at the same time plus the "Pull changes before push" firing all at once. Just a hunch though.

[Vinzent03]

I can reproduce. Working on it now.

[Vinzent03]

I hope the new release fixes the issue. Added a promise queue so that the commands are not executed simultaneously.