Merge branch 'sb/merge-commit-msg-hook' into next

diff --git a/shell.c b/shell.c
index 5e70acb9a6c8bd60be59854598bb9f1fb60fb643..fe2d314593ba5ee3b985b778c2e7ebfdcd9da44c 100644 (file)
--- a/shell.c
+++ b/shell.c
@@ -13,7 +13,7 @@ static int do_generic_cmd(const char *me, char *arg)
        const char *my_argv[4];
 
        setup_path();
-       if (!arg || !(arg = sq_dequote(arg)))
+       if (!arg || !(arg = sq_dequote(arg)) || *arg == '-')
                die("bad argument");
        if (!starts_with(me, "git-"))
                die("bad command");
@@ -145,8 +145,6 @@ int cmd_main(int argc, const char **argv)
        struct commands *cmd;
        int count;
 
-       git_setup_gettext();
-
        /*
         * Special hack to pretend to be a CVS server
         */