Skip to content

Commit

Permalink
mailinfo: Use i18n.commitencoding
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Junio C Hamano committed Nov 28, 2005
1 parent 650e4be commit f1f909e
Showing 1 changed file with 9 additions and 8 deletions.
17 changes: 9 additions & 8 deletions mailinfo.c
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
#include <string.h>
#include <ctype.h>
#include <iconv.h>
#include "cache.h"

#ifdef NO_STRCASESTR
extern char *gitstrcasestr(const char *haystack, const char *needle);
Expand Down Expand Up @@ -718,27 +719,27 @@ static void handle_body(void)
static const char mailinfo_usage[] =
"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)
{
/* NEEDSWORK: might want to do the optional .git/ directory
* discovery
*/
git_config(git_default_config);

while (1 < argc && argv[1][0] == '-') {
if (!strcmp(argv[1], "-k"))
keep_subject = 1;
else if (!strcmp(argv[1], "-u"))
metainfo_charset = "utf-8";
metainfo_charset = git_commit_encoding;
else if (!strncmp(argv[1], "-u=", 3))
metainfo_charset = argv[1] + 3;
else
usage();
usage(mailinfo_usage);
argc--; argv++;
}

if (argc != 3)
usage();
usage(mailinfo_usage);
cmitmsg = fopen(argv[1], "w");
if (!cmitmsg) {
perror(argv[1]);
Expand Down

0 comments on commit f1f909e

Please sign in to comment.