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

[Bug]: "Pull updates on startup" also commits and pushes #736

Open
Kageetai opened this issue Jun 12, 2024 · 5 comments
Open

[Bug]: "Pull updates on startup" also commits and pushes #736

Kageetai opened this issue Jun 12, 2024 · 5 comments
Labels
bug Something isn't working

Comments

@Kageetai
Copy link

Describe the bug

Hello,

first, many thanks for this plugin and the work. I would not be able to work without Git in Obsidian :)

One thing I noticed and has become a small nuisance from time to time, though: I have the option "Pull updates on startup" on, as I want to have my latest changes pulled every time. But what I don't necessarily want is to commit/push my latest local changes at the same time.
But it seems this is not possible. Below, a screenshot of my current settings around that:

Screenshot 2024-06-12 at 10 40 30

From my understanding of these settings, this should only pull on startup, but not commit/push. But it does so anyway.
Would it be possible to adjust that, maybe with a setting?!

Relevant errors (if available) from notifications or console (CTRL+SHIFT+I)

No response

Steps to reproduce

  1. Activate settings as shown above
  2. Restart or reload Obsidian
  3. All previously uncommitted files get committed automatically on startup

Expected Behavior

  • nothing should be committed on startip

Addition context

No response

Operating system

macOS

Installation Method

None

Plugin version

2.24.2

@Kageetai Kageetai added the bug Something isn't working label Jun 12, 2024
@Vinzent03
Copy link
Owner

Can you please share your other settings under the "Automatic" heading in the plugin settings?

@Kageetai
Copy link
Author

Here a screenshot of the "Automatic" section:

Screenshot 2024-06-16 at 12 56 12

@Vinzent03
Copy link
Owner

That's the expected behavior. Or, at least, if you haven't used Obsidian for 6 (360 min) hours. When the last edit is 6h ago, and you start Obsidian, it first pulls because of the "Pull on startup" setting and afterward creates a backup, because of your Auto backup settings.

@Kageetai
Copy link
Author

Unfortunately, it's not just about the backup interval. It also happens if I just did a manual backup and then restart/refresh Obsidian. It then does another backup.
Are there any other settings that can influence that?

@dbischof90
Copy link

This is an annoyance. I have three devices I work with and it happens from time to time that on the third device, which I rarely use, files which are out of date are pushed and I "loose" the content. That is "git-legal", which is fine, but I then have to go back to my laptop to sort things out manually.

Two ideas:

  • In some form "git stash, pull, stash pop"? Such that old changes aren't overwritten?
  • "git branch, pull, merge"?

I am writing this right now because that has happened the third time this week already...

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

No branches or pull requests

3 participants