git.oblomov.eu Git - git/blob - merge-index.c

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