1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
| | #define USE_THE_INDEX_COMPATIBILITY_MACROS
#include "builtin.h"
#include "merge-strategies.h"
#include "run-command.h"
static const char *pgm;
static int merge_one_file_spawn(struct index_state *istate,
const struct object_id *orig_blob,
const struct object_id *our_blob,
const struct object_id *their_blob, const char *path,
unsigned int orig_mode, unsigned int our_mode, unsigned int their_mode,
void *data)
{
char oids[3][GIT_MAX_HEXSZ + 1] = {{0}};
char modes[3][10] = {{0}};
const char *arguments[] = { pgm, oids[0], oids[1], oids[2],
path, modes[0], modes[1], modes[2], NULL };
if (orig_blob) {
oid_to_hex_r(oids[0], orig_blob);
xsnprintf(modes[0], sizeof(modes[0]), "%06o", orig_mode);
}
if (our_blob) {
oid_to_hex_r(oids[1], our_blob);
xsnprintf(modes[1], sizeof(modes[1]), "%06o", our_mode);
}
if (their_blob) {
oid_to_hex_r(oids[2], their_blob);
xsnprintf(modes[2], sizeof(modes[2]), "%06o", their_mode);
}
return run_command_v_opt(arguments, 0);
}
int cmd_merge_index(int argc, const char **argv, const char *prefix)
{
int i, force_file = 0, err = 0, one_shot = 0, quiet = 0;
/* Without this we cannot rely on waitpid() to tell
* what happened to our children.
*/
signal(SIGCHLD, SIG_DFL);
if (argc < 3)
usage("git merge-index [-o] [-q] <merge-program> (-a | [--] [<filename>...])");
read_cache();
i = 1;
if (!strcmp(argv[i], "-o")) {
one_shot = 1;
i++;
}
if (!strcmp(argv[i], "-q")) {
quiet = 1;
i++;
}
pgm = argv[i++];
for (; i < argc; i++) {
const char *arg = argv[i];
if (!force_file && *arg == '-') {
if (!strcmp(arg, "--")) {
force_file = 1;
continue;
}
if (!strcmp(arg, "-a")) {
err |= merge_all_index(&the_index, one_shot, quiet,
merge_one_file_spawn, NULL);
continue;
}
die("git merge-index: unknown option %s", arg);
}
err |= merge_index_path(&the_index, one_shot, quiet, arg,
merge_one_file_spawn, NULL);
}
return err;
}
|