fix: Docs in "User guide -> tools -> merge -> use vscode as the merge tool" don't work for paths with spaces in them #4731
+2
−2
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
twpayne
reviewed
Oct 23, 2025
| args = [ | ||
| "-c", | ||
| "cp {{ .Target }} {{ .Target }}.base && code --new-window --wait --merge {{ .Destination }} {{ .Target }} {{ .Target }}.base {{ .Source }}", | ||
| "cp \"{{ .Target }}\" \"{{ .Target }}.base\" && code --new-window --wait --merge \"{{ .Destination }}\" \"{{ .Target }}\" \"{{ .Target }}.base\" \"{{ .Source }}\"", |
There was a problem hiding this comment.
Thanks, for this. However it's better to use the quote template function, e.g. {{ .Target | quote }}, than adding quotes manually at each end.
There was a problem hiding this comment.
I have tried it and it doesn't work. I get the following error: 'chezmoi: template: merge.args[1]:1: function "quote" not defined'
Also, I just found this issue #4169
|
Your commit will need to be updated; the title should be "fix: Docs…". Note the lowercase value for the change type. |
… tool" don't work for paths with spaces in them
Lorite
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Solves #4730