| commit | af465c0c28d2b299c08613e97d6df0ec23d86fbb | |
| author | yaras <yaras6@gmail.com> | |
| Tue, 23 Feb 2016 11:55:46 +0000 (23 11:55 +0000) | ||
| committer | Pat Thoyts <patthoyts@users.sourceforge.net> | |
| Mon, 3 Oct 2016 22:27:14 +0000 (3 23:27 +0100) | ||
| tree | 8e80e78730d623080c25625c2f77710abc70e179 | treesnapshot (tar.gz zip) |
| parent | c217e26c9df0a701a3ba4be0654bedf8c328c36b | commitdiff |
git-gui: fix initial git gui message encoding
This fix refers https://github.com/git-for-windows/git/issues/664
After `git merge --squash` git creates .git/SQUASH_MSG (UTF-8 encoded)
which contains squashed commits. When run `git gui` it copies SQUASH_MSG
to PREPARE_COMMIT_MSG, but without honoring UTF-8. This leads to encoding
problems on `git gui` commit prompt.
The same applies on git cherry-pick conflict, where MERGE_MSG is created
and then is copied to PREPARE_COMMIT_MSG.
In both cases PREPARE_COMMIT_MSG must be configured to store data in UTF-8.
Signed-off-by: yaras <yaras6@gmail.com>
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
This fix refers https://github.com/git-for-windows/git/issues/664
After `git merge --squash` git creates .git/SQUASH_MSG (UTF-8 encoded)
which contains squashed commits. When run `git gui` it copies SQUASH_MSG
to PREPARE_COMMIT_MSG, but without honoring UTF-8. This leads to encoding
problems on `git gui` commit prompt.
The same applies on git cherry-pick conflict, where MERGE_MSG is created
and then is copied to PREPARE_COMMIT_MSG.
In both cases PREPARE_COMMIT_MSG must be configured to store data in UTF-8.
Signed-off-by: yaras <yaras6@gmail.com>
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
| git-gui.sh | diffblobblamehistory |