diff options
author | Shawn O. Pearce <spearce@spearce.org> | 2007-03-12 15:33:18 -0400 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2007-03-12 23:40:18 -0700 |
commit | 1a8f27413bfe438ce8f8aba56aa48f980f6144d1 (patch) | |
tree | a52d78c5a16873d90044a970f9e57eba2c9e9442 /builtin-revert.c | |
parent | b1daf300d0f56a01e5800a3d989b4cb150d99140 (diff) | |
download | git-1a8f27413bfe438ce8f8aba56aa48f980f6144d1.tar.gz git-1a8f27413bfe438ce8f8aba56aa48f980f6144d1.tar.xz |
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 <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'builtin-revert.c')
-rw-r--r-- | builtin-revert.c | 4 |
1 files changed, 2 insertions, 2 deletions
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"; |