diff options
| author | James Moger <james.moger@gitblit.com> | 2015-02-11 10:13:56 -0500 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2015-02-11 10:13:56 -0500 |
| commit | 38dbe7600e39731cc603e8adb211b81bd2fee2c0 (patch) | |
| tree | bc27dbdd2585da39e0dc7ef337ba25dfc1fa9243 | |
| parent | 605a0597d56dc4af1db4f5d33987788dde7f685f (diff) | |
| download | gitblit-38dbe7600e39731cc603e8adb211b81bd2fee2c0.tar.gz gitblit-38dbe7600e39731cc603e8adb211b81bd2fee2c0.zip | |
Add 'UTF8' encoding alias
| -rw-r--r-- | src/main/java/com/gitblit/manager/RepositoryManager.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/main/java/com/gitblit/manager/RepositoryManager.java b/src/main/java/com/gitblit/manager/RepositoryManager.java index 11a48d54..2db41323 100644 --- a/src/main/java/com/gitblit/manager/RepositoryManager.java +++ b/src/main/java/com/gitblit/manager/RepositoryManager.java @@ -1917,12 +1917,14 @@ public class RepositoryManager implements IRepositoryManager { try { // issue-486/ticket-151: UTF-9 & UTF-18 + // issue-560/ticket-237: 'UTF8' Field field = RawParseUtils.class.getDeclaredField("encodingAliases"); field.setAccessible(true); Map<String, Charset> encodingAliases = (Map<String, Charset>) field.get(null); + encodingAliases.put("'utf8'", RawParseUtils.UTF8_CHARSET); encodingAliases.put("utf-9", RawParseUtils.UTF8_CHARSET); encodingAliases.put("utf-18", RawParseUtils.UTF8_CHARSET); - logger.info("Alias UTF-9 & UTF-18 encodings as UTF-8 in JGit"); + logger.info("Alias 'UTF8', UTF-9 & UTF-18 encodings as UTF-8 in JGit"); } catch (Throwable t) { logger.error("Failed to inject UTF-9 & UTF-18 encoding aliases into JGit", t); } |