Merge branch 'jm/svn-pushmergeinfo-fix' into maint

diff --git a/show-index.c b/show-index.c
index acf8d5445ad96aacf6d2c3ccc2d77a3815291228..1ead41e21131fcb3facc71c8e1d96bf5b65dbe8d 100644 (file)
--- a/show-index.c
+++ b/show-index.c
@@ -4,15 +4,13 @@
 static const char show_index_usage[] =
 "git show-index";
 
-int main(int argc, char **argv)
+int cmd_main(int argc, const char **argv)
 {
        int i;
        unsigned nr;
        unsigned int version;
        static unsigned int top_index[256];
 
-       git_setup_gettext();
-
        if (argc != 1)
                usage(show_index_usage);
        if (fread(top_index, 2 * 4, 1, stdin) != 1)