Make the MSVC projects use PDB/IDB files named after the project
[git/dscho.git] / merge-index.c
blob19ddd03e0b2a57d03d85b1e5ca73b0bd4a0d6981
1 #include "cache.h"
2 #include "run-command.h"
3 #include "exec_cmd.h"
5 static const char *pgm;
6 static int one_shot, quiet;
7 static int err;
9 static int merge_entry(int pos, const char *path)
11 int found;
12 const char *arguments[] = { pgm, "", "", "", path, "", "", "", NULL };
13 char hexbuf[4][60];
14 char ownbuf[4][60];
16 if (pos >= active_nr)
17 die("git merge-index: %s not in the cache", path);
18 found = 0;
19 do {
20 struct cache_entry *ce = active_cache[pos];
21 int stage = ce_stage(ce);
23 if (strcmp(ce->name, path))
24 break;
25 found++;
26 strcpy(hexbuf[stage], sha1_to_hex(ce->sha1));
27 sprintf(ownbuf[stage], "%o", ce->ce_mode);
28 arguments[stage] = hexbuf[stage];
29 arguments[stage + 4] = ownbuf[stage];
30 } while (++pos < active_nr);
31 if (!found)
32 die("git merge-index: %s not in the cache", path);
34 if (run_command_v_opt(arguments, 0)) {
35 if (one_shot)
36 err++;
37 else {
38 if (!quiet)
39 die("merge program failed");
40 exit(1);
43 return found;
46 static void merge_file(const char *path)
48 int pos = cache_name_pos(path, strlen(path));
51 * If it already exists in the cache as stage0, it's
52 * already merged and there is nothing to do.
54 if (pos < 0)
55 merge_entry(-pos-1, path);
58 static void merge_all(void)
60 int i;
61 for (i = 0; i < active_nr; i++) {
62 struct cache_entry *ce = active_cache[i];
63 if (!ce_stage(ce))
64 continue;
65 i += merge_entry(i, ce->name)-1;
69 int main(int argc, char **argv)
71 int i, force_file = 0;
73 /* Without this we cannot rely on waitpid() to tell
74 * what happened to our children.
76 signal(SIGCHLD, SIG_DFL);
78 if (argc < 3)
79 usage("git merge-index [-o] [-q] <merge-program> (-a | [--] <filename>*)");
81 git_extract_argv0_path(argv[0]);
83 setup_git_directory();
84 read_cache();
86 i = 1;
87 if (!strcmp(argv[i], "-o")) {
88 one_shot = 1;
89 i++;
91 if (!strcmp(argv[i], "-q")) {
92 quiet = 1;
93 i++;
95 pgm = argv[i++];
96 for (; i < argc; i++) {
97 char *arg = argv[i];
98 if (!force_file && *arg == '-') {
99 if (!strcmp(arg, "--")) {
100 force_file = 1;
101 continue;
103 if (!strcmp(arg, "-a")) {
104 merge_all();
105 continue;
107 die("git merge-index: unknown option %s", arg);
109 merge_file(arg);
111 if (err && !quiet)
112 die("merge program failed");
113 return err;