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

Issue with merge pull request and update workspace #7349

Open
knevan opened this issue Feb 21, 2025 · 9 comments
Open

Issue with merge pull request and update workspace #7349

knevan opened this issue Feb 21, 2025 · 9 comments
Labels
bug Something isn't working

Comments

@knevan
Copy link

knevan commented Feb 21, 2025

Version

0.14.8

Operating System

Windows

Distribution Method

msi (Windows)

Describe the issue

Hi, I have some problems on the first image there is an access denied error when I want to update the workspace and sometimes it will take a very long time to load to update the workspace 3~7 minute. While the second image occurs after I create a pull request and want to merge PR.

Image

Image

How to reproduce (Optional)

No response

Expected behavior (Optional)

  1. I can merge pull requests after I create a pull request.
  2. When updating the workspace, gitbutler will resolve integrated upstream normally and will not take long.

Relevant log output (Optional)

@knevan knevan added the bug Something isn't working label Feb 21, 2025
@Byron
Copy link
Collaborator

Byron commented Feb 22, 2025

Thanks a lot for reporting.

The "access denied" issue is more common on Windows and I hope we will be able to fully resolve it over time, I think the last stage of this will be to use a sqlite database instead of loose files, assuming that it will deal with file access for us and better than we ever could.

Regarding the long computation time, this might have something to do with integration checks, something that may be slow and may run a lot more than we'd hope. This should be partially resolved in the next major release, so we will revisit all open bugs once it is released.

My apologies for the inconvenience, and thanks for your patience.

@knevan
Copy link
Author

knevan commented Feb 23, 2025

Hello, thank you for responding to this issue. For “access denied” it only happens a few times when I click update workshop or integrated upstream, when the error “access denied” appears then integrated upstream loading becomes very long. If “access denied” does not appear integrated upstream will not take a long time.

For gpg issues forwarded from discord:

Unverified commit when committing to a PR via Gitbutler:

tree 3045fb0ad3cf6cfd105f2d539aa4e82455b48ac9
parent db985e8908d2d17cc02903f61db6f321a97ad856
author wahyu <wahyuby.nev@gmail.com> 1740242936 +0700
committer GitButler <gitbutler@gitbutler.com> 1740242936 +0700
gitbutler-headers-version 2
gitbutler-change-id a53319df-18cf-4ab9-90b3-55dcc36398c9
gpgsig -----BEGIN PGP SIGNATURE-----

 iHUEABYKAB0WIQSC0xaIgJBShMPNYqX1TJYIcnGXKAUCZ7n/+AAKCRD1TJYIcnGX
 KB3wAP442h3heztyGMsSZ5uCMeUjKBoMdIcObVm4anp0HiyUywEAhPs0VqqQPd33
 MKDyaAfgdiSAWWcaCh87b6mrv8vPbAM=
 =VlWJ
 -----END PGP SIGNATURE-----

Verified commit when committing directly without going through Gitbutler:

tree 9c45d4472fec422cccc228356ad780f8b83f22ec                                                                                                                                        
parent b0117c777bfac8fc53745ac04574e85edd67afaf                                                                                                                                      
author wahyu <wahyuby.nev@gmail.com> 1740197493 +0700
committer wahyu <wahyuby.nev@gmail.com> 1740197493 +0700
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iHUEABYKAB0WIQSC0xaIgJBShMPNYqX1TJYIcnGXKAUCZ7lOdQAKCRD1TJYIcnGX
 KBTQAQCrWf/EHRoa5EwpoWiaawpjoxqsAHuVRlHy8mARCKatnwEAuJo9JTxNUP21
 V9/Ty24r2M/3A57yNpeB0fZPLpJjNAA=
 =FDjJ
 -----END PGP SIGNATURE-----

@Byron
Copy link
Collaborator

Byron commented Feb 23, 2025

I see, thanks so much for the commits, I hope to have a solution for you.

In short, in the preferences, turn off crediting GitButler.

Image

The problem is not the signature, the problem is that with PGP signatures, the author name and email must much to a greater extent, they are relevant, at least that's what I think.

If it's true, then turning off the GitButler crediting will solve the issue.

@knevan
Copy link
Author

knevan commented Feb 23, 2025

Thanks for the solution, it's true that by disabling the credit gitbuttler as committer I can now do a verified commit to my PR. I thought by enabling credit gitbutler as committer can still make a verified commit to the pr, because I feel helped by gitbutler so at least I can give credit to gitbutler. 🤔

@knevan
Copy link
Author

knevan commented Feb 23, 2025

I feel that OS errors are becoming more frequent and causing infinite loading issues when updating the workspace. However, these errors not only appear during workspace updates, they also occur when I perform a force push, merge a pull request, or create a pull request.

Image

Image

@Byron
Copy link
Collaborator

Byron commented Feb 24, 2025

Thanks for sharing, it really is a pity. The next major release will be better with this, but it's definitely still a bit away before it can be tested.

Just out of curiosity, could you share some statistics about the repository (from Git bash)?

 git ls-files | wc -l && git log --oneline | wc -l

Thank you

@Byron
Copy link
Collaborator

Byron commented Feb 24, 2025

Thanks for the solution, it's true that by disabling the credit gitbuttler as committer I can now do a verified commit to my PR. I thought by enabling credit gitbutler as committer can still make a verified commit to the pr, because I feel helped by gitbutler so at least I can give credit to gitbutler. 🤔

I forgot to address this: Yes, it's known to not be working and I think it can't for GPG signatures as GitHub will also consider the email address of the committer. Locally, they will look like good signatures though, it's GitHub that goes the extra mile.
In the next major release, this won't be supported anymore when signing is enabled.

@knevan
Copy link
Author

knevan commented Feb 24, 2025

Just out of curiosity, could you share some statistics about the repository (from Git bash)?

No problem, it's just a small repository but unfortunately also affected by the os error.

$  git ls-files | wc -l && git log --oneline | wc -l
8
29

@Byron
Copy link
Collaborator

Byron commented Feb 24, 2025

Thanks a lot for sharing! Indeed, it's not the size of the repository that's causing this issue, but something more fundamental.

Let's hope this resolves itself with the next major version.

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

2 participants