builtin/merge-base.c

   1 #include "builtin.h"
   2 #include "cache.h"
   3 #include "commit.h"
   4 #include "parse-options.h"
   5
   6 static int show_merge_base(struct commit **rev, int rev_nr, int show_all)
   7 {
   8         struct commit_list *result;
   9
  10         result = get_merge_bases_many(rev[0], rev_nr - 1, rev + 1, 0);
  11
  12         if (!result)
  13                 return 1;
  14
  15         while (result) {
  16                 printf("%s\n", sha1_to_hex(result->item->object.sha1));
  17                 if (!show_all)
  18                         return 0;
  19                 result = result->next;
  20         }
  21
  22         return 0;
  23 }
  24
  25 static const char * const merge_base_usage[] = {
  26         N_("git merge-base [-a|--all] <commit> <commit>..."),
  27         N_("git merge-base [-a|--all] --octopus <commit>..."),
  28         N_("git merge-base --independent <commit>..."),
  29         NULL
  30 };
  31
  32 static struct commit *get_commit_reference(const char *arg)
  33 {
  34         unsigned char revkey[20];
  35         struct commit *r;
  36
  37         if (get_sha1(arg, revkey))
  38                 die("Not a valid object name %s", arg);
  39         r = lookup_commit_reference(revkey);
  40         if (!r)
  41                 die("Not a valid commit name %s", arg);
  42
  43         return r;
  44 }
  45
  46 static int handle_octopus(int count, const char **args, int reduce, int show_all)
  47 {
  48         struct commit_list *revs = NULL;
  49         struct commit_list *result;
  50         int i;
  51
  52         if (reduce)
  53                 show_all = 1;
  54
  55         for (i = count - 1; i >= 0; i--)
  56                 commit_list_insert(get_commit_reference(args[i]), &revs);
  57
  58         result = reduce ? reduce_heads(revs) : get_octopus_merge_bases(revs);
  59
  60         if (!result)
  61                 return 1;
  62
  63         while (result) {
  64                 printf("%s\n", sha1_to_hex(result->item->object.sha1));
  65                 if (!show_all)
  66                         return 0;
  67                 result = result->next;
  68         }
  69
  70         return 0;
  71 }
  72
  73 int cmd_merge_base(int argc, const char **argv, const char *prefix)
  74 {
  75         struct commit **rev;
  76         int rev_nr = 0;
  77         int show_all = 0;
  78         int octopus = 0;
  79         int reduce = 0;
  80
  81         struct option options[] = {
  82                 OPT_BOOLEAN('a', "all", &show_all, N_("output all common ancestors")),
  83                 OPT_BOOLEAN(0, "octopus", &octopus, N_("find ancestors for a single n-way merge")),
  84                 OPT_BOOLEAN(0, "independent", &reduce, N_("list revs not reachable from others")),
  85                 OPT_END()
  86         };
  87
  88         git_config(git_default_config, NULL);
  89         argc = parse_options(argc, argv, prefix, options, merge_base_usage, 0);
  90         if (!octopus && !reduce && argc < 2)
  91                 usage_with_options(merge_base_usage, options);
  92         if (reduce && (show_all || octopus))
  93                 die("--independent cannot be used with other options");
  94
  95         if (octopus || reduce)
  96                 return handle_octopus(argc, argv, reduce, show_all);
  97
  98         rev = xmalloc(argc * sizeof(*rev));
  99         while (argc-- > 0)
 100                 rev[rev_nr++] = get_commit_reference(*argv++);
 101         return show_merge_base(rev, rev_nr, show_all);
 102 }