stat_tracking_info(): only count real commits

diff --git a/merge-index.c b/merge-index.c
index 0498a6f45e53947e356c6a390869d3f8194f05b7..aa9cf23a39ae271a53d1a0c05ac99be0e832b46a 100644 (file)
--- a/merge-index.c
+++ b/merge-index.c
@@ -1,33 +1,18 @@
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <signal.h>
-
 #include "cache.h"
+#include "run-command.h"
+#include "exec_cmd.h"
 
-static const char *pgm = NULL;
-static const char *arguments[8];
+static const char *pgm;
+static const char *arguments[9];
 static int one_shot, quiet;
 static int err;
 
 static void run_program(void)
 {
-       int pid = fork(), status;
-
-       if (pid < 0)
-               die("unable to fork");
-       if (!pid) {
-               execlp(pgm, arguments[0],
-                           arguments[1],
-                           arguments[2],
-                           arguments[3],
-                           arguments[4],
-                           arguments[5],
-                           arguments[6],
-                           arguments[7],
-                           NULL);
-               die("unable to execute '%s'", pgm);
-       }
-       if (waitpid(pid, &status, 0) < 0 || !WIFEXITED(status) || WEXITSTATUS(status)) {
+       struct child_process child;
+       memset(&child, 0, sizeof(child));
+       child.argv = arguments;
+       if (run_command(&child)) {
                if (one_shot) {
                        err++;
                } else {
@@ -41,9 +26,9 @@ static void run_program(void)
 static int merge_entry(int pos, const char *path)
 {
        int found;
-       
+
        if (pos >= active_nr)
-               die("git-merge-index: %s not in the cache", path);
+               die("git merge-index: %s not in the cache", path);
        arguments[0] = pgm;
        arguments[1] = "";
        arguments[2] = "";
@@ -52,6 +37,7 @@ static int merge_entry(int pos, const char *path)
        arguments[5] = "";
        arguments[6] = "";
        arguments[7] = "";
+       arguments[8] = NULL;
        found = 0;
        do {
                static char hexbuf[4][60];
@@ -63,12 +49,12 @@ static int merge_entry(int pos, const char *path)
                        break;
                found++;
                strcpy(hexbuf[stage], sha1_to_hex(ce->sha1));
-               sprintf(ownbuf[stage], "%o", ntohl(ce->ce_mode) & (~S_IFMT));
+               sprintf(ownbuf[stage], "%o", ce->ce_mode);
                arguments[stage] = hexbuf[stage];
                arguments[stage + 4] = ownbuf[stage];
        } while (++pos < active_nr);
        if (!found)
-               die("git-merge-index: %s not in the cache", path);
+               die("git merge-index: %s not in the cache", path);
        run_program();
        return found;
 }
@@ -106,7 +92,9 @@ int main(int argc, char **argv)
        signal(SIGCHLD, SIG_DFL);
 
        if (argc < 3)
-               usage("git-merge-index [-o] [-q] <merge-program> (-a | <filename>*)");
+               usage("git merge-index [-o] [-q] <merge-program> (-a | [--] <filename>*)");
+
+       git_extract_argv0_path(argv[0]);
 
        setup_git_directory();
        read_cache();
@@ -132,7 +120,7 @@ int main(int argc, char **argv)
                                merge_all();
                                continue;
                        }
-                       die("git-merge-index: unknown option %s", arg);
+                       die("git merge-index: unknown option %s", arg);
                }
                merge_file(arg);
        }