Make on-disk index representation separate from in-core one
[git/git.git] / merge-index.c
CommitLineData
75118b13 1#include "cache.h"
b49809c9 2#include "run-command.h"
75118b13 3
96f1e58f 4static const char *pgm;
843d49a4 5static const char *arguments[9];
bbd14cb0 6static int one_shot, quiet;
8c59926f 7static int err;
75118b13
LT
8
9static void run_program(void)
10{
b49809c9
SP
11 struct child_process child;
12 memset(&child, 0, sizeof(child));
13 child.argv = arguments;
14 if (run_command(&child)) {
bbd14cb0 15 if (one_shot) {
2a459251 16 err++;
bbd14cb0 17 } else {
b32e986c 18 if (!quiet)
bbd14cb0
PB
19 die("merge program failed");
20 exit(1);
21 }
2a459251 22 }
75118b13
LT
23}
24
75118b13
LT
25static int merge_entry(int pos, const char *path)
26{
27 int found;
a6080a0a 28
75118b13 29 if (pos >= active_nr)
215a7ad1 30 die("git-merge-index: %s not in the cache", path);
75118b13
LT
31 arguments[0] = pgm;
32 arguments[1] = "";
33 arguments[2] = "";
34 arguments[3] = "";
35 arguments[4] = path;
e2b6a9d0
JB
36 arguments[5] = "";
37 arguments[6] = "";
38 arguments[7] = "";
843d49a4 39 arguments[8] = NULL;
75118b13
LT
40 found = 0;
41 do {
e3b4be7f 42 static char hexbuf[4][60];
e2b6a9d0 43 static char ownbuf[4][60];
75118b13
LT
44 struct cache_entry *ce = active_cache[pos];
45 int stage = ce_stage(ce);
46
47 if (strcmp(ce->name, path))
48 break;
49 found++;
e3b4be7f 50 strcpy(hexbuf[stage], sha1_to_hex(ce->sha1));
7a51ed66 51 sprintf(ownbuf[stage], "%o", ce->ce_mode);
e3b4be7f 52 arguments[stage] = hexbuf[stage];
e2b6a9d0 53 arguments[stage + 4] = ownbuf[stage];
75118b13
LT
54 } while (++pos < active_nr);
55 if (!found)
215a7ad1 56 die("git-merge-index: %s not in the cache", path);
75118b13
LT
57 run_program();
58 return found;
59}
60
61static void merge_file(const char *path)
62{
63 int pos = cache_name_pos(path, strlen(path));
64
65 /*
66 * If it already exists in the cache as stage0, it's
67 * already merged and there is nothing to do.
68 */
69 if (pos < 0)
70 merge_entry(-pos-1, path);
71}
72
73static void merge_all(void)
74{
75 int i;
76 for (i = 0; i < active_nr; i++) {
77 struct cache_entry *ce = active_cache[i];
78 if (!ce_stage(ce))
79 continue;
80 i += merge_entry(i, ce->name)-1;
81 }
82}
83
84int main(int argc, char **argv)
85{
86 int i, force_file = 0;
87
f0b7367c
JH
88 /* Without this we cannot rely on waitpid() to tell
89 * what happened to our children.
90 */
91 signal(SIGCHLD, SIG_DFL);
92
75118b13 93 if (argc < 3)
215a7ad1 94 usage("git-merge-index [-o] [-q] <merge-program> (-a | <filename>*)");
75118b13 95
53228a5f 96 setup_git_directory();
75118b13
LT
97 read_cache();
98
2a459251 99 i = 1;
bbd14cb0 100 if (!strcmp(argv[i], "-o")) {
2a459251
PB
101 one_shot = 1;
102 i++;
103 }
bbd14cb0
PB
104 if (!strcmp(argv[i], "-q")) {
105 quiet = 1;
106 i++;
107 }
2a459251
PB
108 pgm = argv[i++];
109 for (; i < argc; i++) {
75118b13
LT
110 char *arg = argv[i];
111 if (!force_file && *arg == '-') {
112 if (!strcmp(arg, "--")) {
113 force_file = 1;
114 continue;
115 }
116 if (!strcmp(arg, "-a")) {
117 merge_all();
118 continue;
119 }
215a7ad1 120 die("git-merge-index: unknown option %s", arg);
75118b13
LT
121 }
122 merge_file(arg);
123 }
b32e986c 124 if (err && !quiet)
8c59926f 125 die("merge program failed");
bbd14cb0 126 return err;
75118b13 127}