1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-04 16:27:54 +01:00
Find a file
yaras af465c0c28 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>
2016-10-03 23:27:14 +01:00
lib git-gui: Makes chooser set 'gitdir' to the resolved path 2015-03-07 12:29:03 +00:00
macosx git-gui: Make git-gui lib dir configurable at runime 2014-08-10 12:48:28 +01:00
po git-gui/po/glossary/txt-to-pot.sh: use the $( ... ) construct for command substitution 2016-10-03 23:27:14 +01:00
windows git-gui: chmod +x po2msg, windows/git-gui.sh 2014-01-18 17:06:41 +00:00
.gitattributes git-gui: set whitespace warnings appropriate to this project 2011-11-30 11:35:28 +00:00
.gitignore git-gui: Honor a config.mak in git-gui's top level 2007-10-13 22:14:14 -04:00
git-gui--askpass git-gui: ensure correct application termination in git-gui--askpass 2010-08-18 23:19:24 +01:00
git-gui.sh git-gui: fix initial git gui message encoding 2016-10-03 23:27:14 +01:00
GIT-VERSION-GEN git-gui: set version 0.20 2015-04-18 12:15:32 +01:00
Makefile git-gui: sort entries in tclIndex 2015-05-01 15:53:06 +01:00