Git Shell in Windows: patch’s default character encoding is UCS-2 Little Endian – how to change this to ANSI or UTF-8 without BOM?

by

I’m not a Windows user, so take my answer with a grain of salt. According to the Windows PowerShell Cookbook, PowerShell preprocesses the output of git diff, splitting it in lines. Documentation of the Out-File Cmdlet suggests, that > is the same as | Out-File without parameters. We also find this comment in the PowerShell documentation:

The results of using the Out-File cmdlet may not be what you expect if you are used to traditional output redirection. To understand its behavior, you must be aware of the context in which the Out-File cmdlet operates.

By default, the Out-File cmdlet creates a Unicode file. This is the best default in the long run, but it means that tools that expect ASCII files will not work correctly with the default output format. You can change the default output format to ASCII by using the Encoding parameter:

[…]

Out-file formats file contents to look like console output. This causes the output to be truncated just as it is in a console window in most circumstances. […]

To get output that does not force line wraps to match the screen width, you can use the Width parameter to specify line width.

So, apparently it is not Git which chooses the character encoding, but Out-File. This suggests a) that PowerShell redirection really should only be used for text and b) that

| Out-File -encoding ASCII -Width 2147483647 my.patch

will avoid the encoding problems. However, this still does not solve the problem with Windows vs. Unix line-endings . There are Cmdlets (see the PowerShell Community Extensions) to do conversion of line-endings.

However, all this recoding does not increase my confidence in a patch (which has no encoding itself, but is just a string of bytes). The aforementioned Cookbook contains a script Invoke-BinaryProcess, which can be used redirect the output of a command unmodified.

To sidestep this whole issue, an alternative would be to use git format-patch instead of git diff. format-patch writes directly to a file (and not to stdout), so its output is not recoded. However, it can only create patches from commits, not arbitrary diffs.

format-patch takes a commit range (e.g. master^10..master^5) or a single commit (e.g. X, meaning X..HEAD) and creates patch files of the form NNNN-SUBJECT.patch, where NNNN is an increasing 4-digit number and subject is the (mangled) subject of the patch. An output directory can be specified with -o.

More Related Contents:

  1. Different behaviour and output when piping in CMD and PowerShell
  2. UTF-8 output from PowerShell
  3. Powershell function call changing passed string into int
  4. Git pull / push – unable to access HTTPS, SSL routines seem to be down
  5. PowerShell’s parsing modes: argument (command) mode vs. expression mode
  6. Git Push ERROR: Repository not found
  7. How to get an object’s property’s value by property name?
  8. Delete files older than 15 days using PowerShell
  9. How can I automatically deploy my app after a git push ( GitHub and node.js)?
  10. Powershell equivalent of bash ampersand (&) for forking/running background processes
  11. Why does ‘continue’ behave like ‘break’ in a Foreach-Object?
  12. Why don’t .NET objects in PowerShell use the current directory?
  13. How can I display my current git branch name in my PowerShell prompt?
  14. There isn’t anything to compare. Nothing to compare, branches are entirely different commit histories
  15. Copy a git repo without history
  16. How remove accents in PowerShell?
  17. Remove directory from remote repository after adding them to .gitignore
  18. GitHub – fatal: could not read Username for ‘https://github.com’: No such file or directory
  19. How to use PowerShell copy-item and keep structure
  20. Why are connections to GitHub over SSH throwing an error “Warning: Remote Host Identification Has Changed”?
  21. Understanding the basics of Git and GitHub [closed]
  22. Permission denied error on Github Push
  23. “Cannot spawn ssh” when connecting to Github, but ssh -T [email protected] works?
  24. How to download the SSL certificate from a website using PowerShell?
  25. Rename file on FTP with PowerShell
  26. How do I fix “remote: fatal error in commit_refs” errors trying to push with Git?
  27. Git push error: RPC failed; result=56, HTTP code = 200 fatal: The remote end hung up unexpectedly fatal
  28. Run Executable from Powershell script with parameters
  29. Why are Github project document page urls case sensitive? What are the negative effects?
  30. Powershell script from shortcut to change desktop

Leave a Comment