mailinfo: Use i18n.commitencoding
This uses i18n.commitencoding configuration item to pick up the default commit encoding for the repository when converting form e-mail encoding to commit encoding (the default is utf8). Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
parent
650e4be59b
commit
f1f909e318
17
mailinfo.c
17
mailinfo.c
@ -8,6 +8,7 @@
|
|||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <ctype.h>
|
#include <ctype.h>
|
||||||
#include <iconv.h>
|
#include <iconv.h>
|
||||||
|
#include "cache.h"
|
||||||
|
|
||||||
#ifdef NO_STRCASESTR
|
#ifdef NO_STRCASESTR
|
||||||
extern char *gitstrcasestr(const char *haystack, const char *needle);
|
extern char *gitstrcasestr(const char *haystack, const char *needle);
|
||||||
@ -718,27 +719,27 @@ static void handle_body(void)
|
|||||||
static const char mailinfo_usage[] =
|
static const char mailinfo_usage[] =
|
||||||
"git-mailinfo [-k] [-u] msg patch <mail >info";
|
"git-mailinfo [-k] [-u] msg patch <mail >info";
|
||||||
|
|
||||||
static void usage(void) {
|
|
||||||
fprintf(stderr, "%s\n", mailinfo_usage);
|
|
||||||
exit(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
int main(int argc, char **argv)
|
int main(int argc, char **argv)
|
||||||
{
|
{
|
||||||
|
/* NEEDSWORK: might want to do the optional .git/ directory
|
||||||
|
* discovery
|
||||||
|
*/
|
||||||
|
git_config(git_default_config);
|
||||||
|
|
||||||
while (1 < argc && argv[1][0] == '-') {
|
while (1 < argc && argv[1][0] == '-') {
|
||||||
if (!strcmp(argv[1], "-k"))
|
if (!strcmp(argv[1], "-k"))
|
||||||
keep_subject = 1;
|
keep_subject = 1;
|
||||||
else if (!strcmp(argv[1], "-u"))
|
else if (!strcmp(argv[1], "-u"))
|
||||||
metainfo_charset = "utf-8";
|
metainfo_charset = git_commit_encoding;
|
||||||
else if (!strncmp(argv[1], "-u=", 3))
|
else if (!strncmp(argv[1], "-u=", 3))
|
||||||
metainfo_charset = argv[1] + 3;
|
metainfo_charset = argv[1] + 3;
|
||||||
else
|
else
|
||||||
usage();
|
usage(mailinfo_usage);
|
||||||
argc--; argv++;
|
argc--; argv++;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (argc != 3)
|
if (argc != 3)
|
||||||
usage();
|
usage(mailinfo_usage);
|
||||||
cmitmsg = fopen(argv[1], "w");
|
cmitmsg = fopen(argv[1], "w");
|
||||||
if (!cmitmsg) {
|
if (!cmitmsg) {
|
||||||
perror(argv[1]);
|
perror(argv[1]);
|
||||||
|
Loading…
Reference in New Issue
Block a user