Signed-off-by: James Bowes <jbowes@xxxxxxxxxxxxxxxxxx>
---
This is a blatant copy of Shawn's patch. I don't know if there's a reason these
are still strdup. If there is, please ignore this patch :)
builtin-log.c | 2 +-
commit.c | 2 +-
revision.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/builtin-log.c b/builtin-log.c
index 865832c..71df957 100644
--- a/builtin-log.c
+++ b/builtin-log.c
@@ -35,7 +35,7 @@ static void cmd_log_init(int argc, const char **argv, const char *prefix,
if (!prefixcmp(arg, "--encoding=")) {
arg += 11;
if (strcmp(arg, "none"))
- git_log_output_encoding = strdup(arg);
+ git_log_output_encoding = xstrdup(arg);
else
git_log_output_encoding = "";
}
diff --git a/commit.c b/commit.c
index 5b9234e..718e568 100644
--- a/commit.c
+++ b/commit.c
@@ -706,7 +706,7 @@ static char *logmsg_reencode(const struct commit *commit,
encoding = get_header(commit, "encoding");
use_encoding = encoding ? encoding : utf8;
if (!strcmp(use_encoding, output_encoding))
- out = strdup(commit->buffer);
+ out = xstrdup(commit->buffer);
else
out = reencode_string(commit->buffer,
output_encoding, use_encoding);
diff --git a/revision.c b/revision.c
index bcdb6a1..c680dcb 100644
--- a/revision.c
+++ b/revision.c
@@ -1038,7 +1038,7 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch
if (!prefixcmp(arg, "--encoding=")) {
arg += 11;
if (strcmp(arg, "none"))
- git_log_output_encoding = strdup(arg);
+ git_log_output_encoding = xstrdup(arg);
else
git_log_output_encoding = "";
continue;
--
1.5.1.rc1.1.g504b
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html