6 static const char *pgm = NULL;
7 static const char *arguments[8];
10 static void run_program(void)
12 int pid = fork(), status;
15 die("unable to fork");
17 execlp(pgm, arguments[0],
26 die("unable to execute '%s'", pgm);
28 if (waitpid(pid, &status, 0) < 0 || !WIFEXITED(status) || WEXITSTATUS(status))
32 static int merge_entry(int pos, const char *path)
37 die("merge-cache: %s not in the cache", path);
48 static char hexbuf[4][60];
49 static char ownbuf[4][60];
50 struct cache_entry *ce = active_cache[pos];
51 int stage = ce_stage(ce);
53 if (strcmp(ce->name, path))
56 strcpy(hexbuf[stage], sha1_to_hex(ce->sha1));
57 sprintf(ownbuf[stage], "%o", ntohl(ce->ce_mode) & (~S_IFMT));
58 arguments[stage] = hexbuf[stage];
59 arguments[stage + 4] = ownbuf[stage];
60 } while (++pos < active_nr);
62 die("merge-cache: %s not in the cache", path);
67 static void merge_file(const char *path)
69 int pos = cache_name_pos(path, strlen(path));
72 * If it already exists in the cache as stage0, it's
73 * already merged and there is nothing to do.
76 merge_entry(-pos-1, path);
79 static void merge_all(void)
82 for (i = 0; i < active_nr; i++) {
83 struct cache_entry *ce = active_cache[i];
86 i += merge_entry(i, ce->name)-1;
90 int main(int argc, char **argv)
92 int i, force_file = 0;
95 usage("merge-cache <merge-program> (-a | <filename>*)");
100 for (i = 2; i < argc; i++) {
102 if (!force_file && *arg == '-') {
103 if (!strcmp(arg, "--")) {
107 if (!strcmp(arg, "-a")) {
111 die("merge-cache: unknown option %s", arg);
116 die("merge program failed");