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

Unable to merge pull request #5824

Closed
2 of 7 tasks
yasuokav opened this issue Jan 24, 2019 · 8 comments · Fixed by #5825
Closed
2 of 7 tasks

Unable to merge pull request #5824

yasuokav opened this issue Jan 24, 2019 · 8 comments · Fixed by #5825
Labels

Comments

@yasuokav
Copy link
Contributor

yasuokav commented Jan 24, 2019

  • Gitea version (or commit ref): 386e531
  • Git version: git version 2.20.1
  • Operating system: macOS
  • Database (use [x]):
    • PostgreSQL
    • MySQL
    • MSSQL
    • SQLite
  • Can you reproduce the bug at https://try.gitea.io:
    • Yes (provide example URL)
    • No
    • Not relevant
  • Log gist:
[...routers/repo/pull.go:589 MergePullRequest()] [E] Merge: Writing sparse-checkout file to /Users/user/giteatmp/tmp/local-repo/merge-70720432.git/.git/info/sparse-checkout: open /Users/user/giteatmp/tmp/local-repo/merge-70720432.git/.git/info/sparse-checkout: no such file or directory

Description

Use squash merge style
@typeless

Screenshots

@typeless
Copy link
Contributor

typeless commented Jan 24, 2019

@yasuokav Have you mixed up with other changes?
The message should be at L452, not L589.

oops, I confused the file path. sorry.

@lunny lunny added the type/bug label Jan 24, 2019
@typeless
Copy link
Contributor

I have no access to a MacOS machine for now.
But I have a conjecture that the info directory under .git might not exist under certain circumstances.

Can you comment out

defer os.RemoveAll(path.Dir(tmpBasePath))
and look into the path to verify that?

I can submit a patch to create .git/info, but it'd be better if we can make sure.

@yasuokav
Copy link
Contributor Author

I have no access to a MacOS machine for now.
But I have a conjecture that the info directory under .git might not exist under certain circumstances.

Yes. I can confirm that.

ls

FETCH_HEAD  HEAD        config      hooks       logs        objects     packed-refs refs

@typeless
Copy link
Contributor

Ok, I'll submit a patch soon.

By the way, thanks your your testing & report.

@typeless
Copy link
Contributor

@yasuokav #5825

If you can verify this PR, that would be nice.

@yasuokav
Copy link
Contributor Author

yasuokav commented Jan 24, 2019

@yasuokav #5825

If you can verify this PR, that would be nice.

This PR will cause another problem.

[...routers/repo/pull.go:589 MergePullRequest()] [E] Merge: Writing sparse-checkout file to /Users/user/giteatmp/tmp/local-repo/merge-915998714.git/.git/info/sparse-checkout: open /Users/user/giteatmp/tmp/local-repo/merge-915998714.git/.git/info/sparse-checkout: permission denied
cd info
cd: permission denied: info

...
drwxr-xr-x  hooks
drw-------  info
drwxr-xr-x  logs
drwxr-xr-x  objects
...

@typeless
Copy link
Contributor

My bad. I have updated the PR.

@yasuokav
Copy link
Contributor Author

@typeless This PR solves this problem! Thank you

@go-gitea go-gitea locked and limited conversation to collaborators Nov 24, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging a pull request may close this issue.

3 participants