Title: wrong path in case of workdirs · Issue #1972 · pre-commit/pre-commit · GitHub
Open Graph Title: wrong path in case of workdirs · Issue #1972 · pre-commit/pre-commit
X Title: wrong path in case of workdirs · Issue #1972 · pre-commit/pre-commit
Description: When working with work dirs the conflict check is using the wrong path. This results in a weird error message during a commit with the base worktree in conflict. [INFO] Checking merge-conflict files only. An unexpected error has occurred...
Open Graph Description: When working with work dirs the conflict check is using the wrong path. This results in a weird error message during a commit with the base worktree in conflict. [INFO] Checking merge-conflict file...
X Description: When working with work dirs the conflict check is using the wrong path. This results in a weird error message during a commit with the base worktree in conflict. [INFO] Checking merge-conflict file...
Opengraph URL: https://github.com/pre-commit/pre-commit/issues/1972
X: @github
Domain: github.com
{"@context":"https://schema.org","@type":"DiscussionForumPosting","headline":"wrong path in case of workdirs ","articleBody":"When working with work dirs the conflict check is using the wrong path. This results in a weird error message during a commit with the base worktree in conflict. \r\n```\r\n[INFO] Checking merge-conflict files only.\r\nAn unexpected error has occurred: CalledProcessError: command: ('/usr/lib/git-core/git', 'diff', '--name-only', '--no-ext-diff', '-z', '-m', 'e8fb6f96dfe86b454ceb6913a3e02f88a9103565', 'HEAD', 'MERGE_HEAD')\r\nreturn code: 128\r\nexpected return code: 0\r\nstdout: (none)\r\nstderr:\r\n fatal: mehrdeutiges Argument 'MERGE_HEAD': unbekannter Commit oder Pfad existiert nicht\r\n im Arbeitsverzeichnis\r\n Benutzen Sie '--', um Pfade und Commits zu trennen, ähnlich wie:\r\n 'git \u003cBefehl\u003e [\u003cCommit\u003e...] -- [\u003cDatei\u003e...]'\r\n \r\nCheck the log at /home/sperry/.cache/pre-commit/pre-commit.log\r\n```","author":{"url":"https://github.com/daschuer","@type":"Person","name":"daschuer"},"datePublished":"2021-07-11T05:30:14.000Z","interactionStatistic":{"@type":"InteractionCounter","interactionType":"https://schema.org/CommentAction","userInteractionCount":12},"url":"https://github.com/1972/pre-commit/issues/1972"}
| route-pattern | /_view_fragments/issues/show/:user_id/:repository/:id/issue_layout(.:format) |
| route-controller | voltron_issues_fragments |
| route-action | issue_layout |
| fetch-nonce | v2:cf6c99ad-2ac1-eefb-cabb-9308403b3ad1 |
| current-catalog-service-hash | 81bb79d38c15960b92d99bca9288a9108c7a47b18f2423d0f6438c5b7bcd2114 |
| request-id | C7AA:146E92:55F440:7D1142:6A55EFE8 |
| html-safe-nonce | 4152d6cf92785b11d09d3453068e9c70a570c56e95ca2bce82d048fcfd775484 |
| visitor-payload | eyJyZWZlcnJlciI6IiIsInJlcXVlc3RfaWQiOiJDN0FBOjE0NkU5Mjo1NUY0NDA6N0QxMTQyOjZBNTVFRkU4IiwidmlzaXRvcl9pZCI6IjI5ODAxNDk3MDU2NjAxMjkwNCIsInJlZ2lvbl9lZGdlIjoiaWFkIiwicmVnaW9uX3JlbmRlciI6ImlhZCJ9 |
| visitor-hmac | d25dc2d8295dace6bcf2c269ae46429b277e4dff5db941faa284f75931c5c5ab |
| hovercard-subject-tag | issue:941377178 |
| github-keyboard-shortcuts | repository,issues,commits,copilot |
| google-site-verification | Apib7-x98H0j5cPqHWwSMm6dNU4GmODRoqxLiDzdx9I |
| octolytics-url | https://collector.github.com/github/collect |
| analytics-location | / |
| fb:app_id | 1401488693436528 |
| apple-itunes-app | app-id=1477376905, app-argument=https://github.com/_view_fragments/issues/show/pre-commit/pre-commit/1972/issue_layout |
| twitter:image | https://opengraph.githubassets.com/f76a90406c003d2475d6590afa87eb59f3a2d10396958d9e353cdf4438d845fc/pre-commit/pre-commit/issues/1972 |
| twitter:card | summary_large_image |
| og:image | https://opengraph.githubassets.com/f76a90406c003d2475d6590afa87eb59f3a2d10396958d9e353cdf4438d845fc/pre-commit/pre-commit/issues/1972 |
| og:image:alt | When working with work dirs the conflict check is using the wrong path. This results in a weird error message during a commit with the base worktree in conflict. [INFO] Checking merge-conflict file... |
| og:image:width | 1200 |
| og:image:height | 600 |
| og:site_name | GitHub |
| og:type | object |
| og:author:username | daschuer |
| hostname | github.com |
| expected-hostname | github.com |
| None | b5665c84831ed9ac4fb79519c16c9c5580ba8092fb8bb6e3e72972ec7197348e |
| turbo-cache-control | no-preview |
| go-import | github.com/pre-commit/pre-commit git https://github.com/pre-commit/pre-commit.git |
| octolytics-dimension-user_id | 6943086 |
| octolytics-dimension-user_login | pre-commit |
| octolytics-dimension-repository_id | 17689377 |
| octolytics-dimension-repository_nwo | pre-commit/pre-commit |
| octolytics-dimension-repository_public | true |
| octolytics-dimension-repository_is_fork | false |
| octolytics-dimension-repository_network_root_id | 17689377 |
| octolytics-dimension-repository_network_root_nwo | pre-commit/pre-commit |
| turbo-body-classes | logged-out env-production page-responsive |
| disable-turbo | false |
| browser-stats-url | https://api.github.com/_private/browser/stats |
| browser-errors-url | https://api.github.com/_private/browser/errors |
| release | 3725c7f9b2a6e3a27ef57c5aed13428c0f65e045 |
| ui-target | full |
| theme-color | #1e2327 |
| color-scheme | light dark |
Links:
Viewport: width=device-width