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