git-add--interactive: Allow Ctrl-D to exit

diff --git a/merge-index.c b/merge-index.c
index a9983dd78ad5cd1e364f0e00c259bdb7e6f151f0..fa719cb0b1bd227423587c9e41eed77c755465a4 100644 (file)
--- a/merge-index.c
+++ b/merge-index.c
@@ -1,30 +1,17 @@
 #include "cache.h"
+#include "run-command.h"
 
 static const char *pgm;
-static const char *arguments[8];
+static const char *arguments[9];
 static int one_shot, quiet;
 static int err;
 
 static void run_program(void)
 {
-       pid_t pid = fork();
-       int 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 {
@@ -38,7 +25,7 @@ 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);
        arguments[0] = pgm;
@@ -49,6 +36,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];
@@ -60,7 +48,7 @@ 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", ntohl(ce->ce_mode));
                arguments[stage] = hexbuf[stage];
                arguments[stage + 4] = ownbuf[stage];
        } while (++pos < active_nr);