Silence compiler complaints about opt array initialized with local variables which was declared const. --- builtin-cat-file.c | 2 +- builtin-reset.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/builtin-cat-file.c b/builtin-cat-file.c index 7441a56..d954c09 100644 --- a/builtin-cat-file.c +++ b/builtin-cat-file.c @@ -212,7 +212,7 @@ int cmd_cat_file(int argc, const char **argv, const char *prefix) int opt = 0, batch = 0; const char *exp_type = NULL, *obj_name = NULL; - const struct option options[] = { + struct option options[] = { OPT_GROUP("<type> can be one of: blob, tree, commit, tag"), OPT_SET_INT('t', NULL, &opt, "show object type", 't'), OPT_SET_INT('s', NULL, &opt, "show object size", 's'), diff --git a/builtin-reset.c b/builtin-reset.c index 4d246c3..28b633f 100644 --- a/builtin-reset.c +++ b/builtin-reset.c @@ -176,7 +176,7 @@ int cmd_reset(int argc, const char **argv, const char *prefix) *old_orig = NULL, sha1_old_orig[20]; struct commit *commit; char *reflog_action, msg[1024]; - const struct option options[] = { + struct option options[] = { OPT_SET_INT(0, "mixed", &reset_type, "reset HEAD and index", MIXED), OPT_SET_INT(0, "soft", &reset_type, "reset only HEAD", SOFT), -- 1.6.0.11.gecc7e -- 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