From: Shawn O. Pearce Date: Mon, 12 Mar 2007 19:33:18 +0000 (-0400) Subject: Correct new compiler warnings in builtin-revert X-Git-Tag: v1.5.1-rc1~8^2~5 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=1a8f27413bfe438ce8f8aba56aa48f980f6144d1;p=git.git Correct new compiler warnings in builtin-revert The new builtin-revert code introduces a few new compiler errors when I'm building with my stricter set of checks enabled in CFLAGS. These all just stem from trying to store a constant string into a non-const char*. Simple fix, make the variables const char*. Signed-off-by: Shawn O. Pearce Signed-off-by: Junio C Hamano --- diff --git a/builtin-revert.c b/builtin-revert.c index 652eece5a..f3f3f5c6e 100644 --- a/builtin-revert.c +++ b/builtin-revert.c @@ -235,8 +235,8 @@ static int revert_or_cherry_pick(int argc, const char **argv) unsigned char head[20]; struct commit *base, *next; int i; - char *oneline, *encoding, *reencoded_message = NULL; - const char *message; + char *oneline, *reencoded_message = NULL; + const char *message, *encoding; git_config(git_default_config); me = action == REVERT ? "revert" : "cherry-pick"; diff --git a/cache.h b/cache.h index f172d02a6..4f1066744 100644 --- a/cache.h +++ b/cache.h @@ -449,7 +449,7 @@ extern int check_repository_format_version(const char *var, const char *value); extern char git_default_email[MAX_GITNAME]; extern char git_default_name[MAX_GITNAME]; -extern char *git_commit_encoding; +extern const char *git_commit_encoding; extern const char *git_log_output_encoding; extern int copy_fd(int ifd, int ofd); diff --git a/environment.c b/environment.c index 0151ad072..fff4a4da5 100644 --- a/environment.c +++ b/environment.c @@ -20,7 +20,7 @@ int is_bare_repository_cfg = -1; /* unspecified */ int log_all_ref_updates = -1; /* unspecified */ int warn_ambiguous_refs = 1; int repository_format_version; -char *git_commit_encoding; +const char *git_commit_encoding; const char *git_log_output_encoding; int shared_repository = PERM_UMASK; const char *apply_default_whitespace;