Merge branch 'jc/format-patch'

diff --git a/git.c b/git.c
index 96e596b1a385266a5c0e0638b0e682b06c55c506..930998bbe542cbaa92b3f16a6b0dc0d6ad43b874 100644 (file)
--- a/git.c
+++ b/git.c
@@ -92,7 +92,7 @@ static int handle_options(const char*** argv, int* argc)
 }
 
 static const char *alias_command;
-static char *alias_string = NULL;
+static char *alias_string;
 
 static int git_alias_config(const char *var, const char *value)
 {
@@ -252,7 +252,7 @@ static void handle_internal_command(int argc, const char **argv, char **envp)
                { "pack-objects", cmd_pack_objects, RUN_SETUP },
                { "prune", cmd_prune, RUN_SETUP },
                { "prune-packed", cmd_prune_packed, RUN_SETUP },
-               { "push", cmd_push },
+               { "push", cmd_push, RUN_SETUP },
                { "read-tree", cmd_read_tree, RUN_SETUP },
                { "repo-config", cmd_repo_config },
                { "rev-list", cmd_rev_list, RUN_SETUP },
@@ -270,6 +270,7 @@ static void handle_internal_command(int argc, const char **argv, char **envp)
                { "version", cmd_version },
                { "whatchanged", cmd_whatchanged, RUN_SETUP | USE_PAGER },
                { "write-tree", cmd_write_tree, RUN_SETUP },
+               { "verify-pack", cmd_verify_pack },
        };
        int i;