diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-12-20 10:14:54 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-12-20 10:14:55 -0800 |
| commit | 66e959f4316dcfd5eca8fcd3e0072415277753ea (patch) | |
| tree | e4fe76592881ba5c3a2f4d63b1de7b1fccb56d2c /convert.h | |
| parent | 2b9cbc6d01ba3e54de09efde1dd2ed46c2d36e94 (diff) | |
| parent | ea8f9494aba052fd531f674f78dba55f084bdc34 (diff) | |
| download | git-66e959f4316dcfd5eca8fcd3e0072415277753ea.tar.gz | |
Merge branch 'jk/config-cleanup'
Code clean-up around use of configuration variables.
* jk/config-cleanup:
sequencer: simplify away extra git_config_string() call
gpg-interface: drop pointless config_error_nonbool() checks
push: drop confusing configset/callback redundancy
config: use git_config_string() for core.checkRoundTripEncoding
diff: give more detailed messages for bogus diff.* config
config: use config_error_nonbool() instead of custom messages
imap-send: don't use git_die_config() inside callback
git_xmerge_config(): prefer error() to die()
config: reject bogus values for core.checkstat
Diffstat (limited to 'convert.h')
| -rw-r--r-- | convert.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -92,7 +92,7 @@ void convert_attrs(struct index_state *istate, struct conv_attrs *ca, const char *path); extern enum eol core_eol; -extern char *check_roundtrip_encoding; +extern const char *check_roundtrip_encoding; const char *get_cached_convert_stats_ascii(struct index_state *istate, const char *path); const char *get_wt_convert_stats_ascii(const char *path); |