return the prune-packed progress display to the inner loop

[git.git] / git.c

diff --git a/git.c b/git.c
index b6e292e29fa63c7652db10853659441de2e89624..9eaca1d67149ee60d1fe23661b6a45139987b7a2 100644 (file)
--- a/git.c
+++ b/git.c
@@ -94,7 +94,7 @@ static int handle_options(const char*** argv, int* argc, int* envchanged)
                } else if (!strcmp(cmd, "--bare")) {
                        static char git_dir[PATH_MAX+1];
                        is_bare_repository_cfg = 1;
-                       setenv(GIT_DIR_ENVIRONMENT, getcwd(git_dir, sizeof(git_dir)), 1);
+                       setenv(GIT_DIR_ENVIRONMENT, getcwd(git_dir, sizeof(git_dir)), 0);
                        if (envchanged)
                                *envchanged = 1;
                } else {
@@ -187,19 +187,13 @@ static int handle_alias(int *argcp, const char ***argv)
        if (alias_string) {
                if (alias_string[0] == '!') {
                        if (*argcp > 1) {
-                               int i, sz = PATH_MAX;
-                               char *s = xmalloc(sz), *new_alias = s;
+                               struct strbuf buf;
 
-                               add_to_string(&s, &sz, alias_string, 0);
+                               strbuf_init(&buf, PATH_MAX);
+                               strbuf_addstr(&buf, alias_string);
+                               sq_quote_argv(&buf, (*argv) + 1, *argcp - 1, PATH_MAX);
                                free(alias_string);
-                               alias_string = new_alias;
-                               for (i = 1; i < *argcp &&
-                                       !add_to_string(&s, &sz, " ", 0) &&
-                                       !add_to_string(&s, &sz, (*argv)[i], 1)
-                                       ; i++)
-                                       ; /* do nothing */
-                               if (!sz)
-                                       die("Too many or long arguments");
+                               alias_string = buf.buf;
                        }
                        trace_printf("trace: alias to shell cmd: %s => %s\n",
                                     alias_command, alias_string + 1);
@@ -364,6 +358,7 @@ static void handle_internal_command(int argc, const char **argv)
                { "reflog", cmd_reflog, RUN_SETUP },
                { "repo-config", cmd_config },
                { "rerere", cmd_rerere, RUN_SETUP },
+               { "reset", cmd_reset, RUN_SETUP },
                { "rev-list", cmd_rev_list, RUN_SETUP },
                { "rev-parse", cmd_rev_parse, RUN_SETUP },
                { "revert", cmd_revert, RUN_SETUP | NEED_WORK_TREE },