summaryrefslogtreecommitdiff
path: root/builtin-revert.c
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2007-03-12 19:33:18 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-03-13 06:40:18 (GMT)
commit1a8f27413bfe438ce8f8aba56aa48f980f6144d1 (patch)
treea52d78c5a16873d90044a970f9e57eba2c9e9442 /builtin-revert.c
parentb1daf300d0f56a01e5800a3d989b4cb150d99140 (diff)
downloadgit-1a8f27413bfe438ce8f8aba56aa48f980f6144d1.zip
git-1a8f27413bfe438ce8f8aba56aa48f980f6144d1.tar.gz
git-1a8f27413bfe438ce8f8aba56aa48f980f6144d1.tar.bz2
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.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin-revert.c b/builtin-revert.c
index 652eece..f3f3f5c 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";