Miklos Vajna | 1c7b76b | 2008-07-07 19:24:20 +0200 | [diff] [blame] | 1 | /* |
| 2 | * Builtin "git merge" |
| 3 | * |
| 4 | * Copyright (c) 2008 Miklos Vajna <vmiklos@frugalware.org> |
| 5 | * |
| 6 | * Based on git-merge.sh by Junio C Hamano. |
| 7 | */ |
| 8 | |
| 9 | #include "cache.h" |
| 10 | #include "parse-options.h" |
| 11 | #include "builtin.h" |
| 12 | #include "run-command.h" |
| 13 | #include "diff.h" |
| 14 | #include "refs.h" |
| 15 | #include "commit.h" |
| 16 | #include "diffcore.h" |
| 17 | #include "revision.h" |
| 18 | #include "unpack-trees.h" |
| 19 | #include "cache-tree.h" |
| 20 | #include "dir.h" |
| 21 | #include "utf8.h" |
| 22 | #include "log-tree.h" |
| 23 | #include "color.h" |
Junio C Hamano | fcab40a | 2008-07-15 19:09:46 -0700 | [diff] [blame] | 24 | #include "rerere.h" |
Miklos Vajna | 87091b4 | 2008-07-30 01:16:59 +0200 | [diff] [blame] | 25 | #include "help.h" |
Miklos Vajna | 18668f5 | 2008-08-28 15:43:00 +0200 | [diff] [blame] | 26 | #include "merge-recursive.h" |
Junio C Hamano | cfc5789 | 2009-12-25 00:30:51 -0800 | [diff] [blame] | 27 | #include "resolve-undo.h" |
Miklos Vajna | 1c7b76b | 2008-07-07 19:24:20 +0200 | [diff] [blame] | 28 | |
| 29 | #define DEFAULT_TWOHEAD (1<<0) |
| 30 | #define DEFAULT_OCTOPUS (1<<1) |
| 31 | #define NO_FAST_FORWARD (1<<2) |
| 32 | #define NO_TRIVIAL (1<<3) |
| 33 | |
| 34 | struct strategy { |
| 35 | const char *name; |
| 36 | unsigned attr; |
| 37 | }; |
| 38 | |
| 39 | static const char * const builtin_merge_usage[] = { |
Alexander Potashev | 34263de | 2009-01-04 21:39:27 +0300 | [diff] [blame] | 40 | "git merge [options] <remote>...", |
| 41 | "git merge [options] <msg> HEAD <remote>", |
Miklos Vajna | 1c7b76b | 2008-07-07 19:24:20 +0200 | [diff] [blame] | 42 | NULL |
| 43 | }; |
| 44 | |
Ramkumar Ramachandra | 96e9420 | 2010-09-08 23:29:54 +0530 | [diff] [blame] | 45 | static int show_diffstat = 1, shortlog_len, squash; |
Miklos Vajna | 1c7b76b | 2008-07-07 19:24:20 +0200 | [diff] [blame] | 46 | static int option_commit = 1, allow_fast_forward = 1; |
Björn Gustavsson | 1347483 | 2009-10-29 23:08:31 +0100 | [diff] [blame] | 47 | static int fast_forward_only; |
Miklos Vajna | 1c7b76b | 2008-07-07 19:24:20 +0200 | [diff] [blame] | 48 | static int allow_trivial = 1, have_message; |
| 49 | static struct strbuf merge_msg; |
| 50 | static struct commit_list *remoteheads; |
| 51 | static unsigned char head[20], stash[20]; |
| 52 | static struct strategy **use_strategies; |
| 53 | static size_t use_strategies_nr, use_strategies_alloc; |
Avery Pennarun | 8cc5b29 | 2009-11-25 21:23:55 -0500 | [diff] [blame] | 54 | static const char **xopts; |
| 55 | static size_t xopts_nr, xopts_alloc; |
Miklos Vajna | 1c7b76b | 2008-07-07 19:24:20 +0200 | [diff] [blame] | 56 | static const char *branch; |
Jonathan Nieder | 7610fa5 | 2010-08-05 06:32:41 -0500 | [diff] [blame] | 57 | static int option_renormalize; |
Tuncer Ayaz | 7f87aff | 2008-11-15 01:14:24 +0100 | [diff] [blame] | 58 | static int verbosity; |
Junio C Hamano | cb6020b | 2009-12-04 00:20:48 -0800 | [diff] [blame] | 59 | static int allow_rerere_auto; |
Johan Herland | 35d2fff | 2010-11-09 22:49:59 +0100 | [diff] [blame] | 60 | static int abort_current_merge; |
Miklos Vajna | 1c7b76b | 2008-07-07 19:24:20 +0200 | [diff] [blame] | 61 | |
| 62 | static struct strategy all_strategy[] = { |
Miklos Vajna | 1c7b76b | 2008-07-07 19:24:20 +0200 | [diff] [blame] | 63 | { "recursive", DEFAULT_TWOHEAD | NO_TRIVIAL }, |
| 64 | { "octopus", DEFAULT_OCTOPUS }, |
| 65 | { "resolve", 0 }, |
Miklos Vajna | 1c7b76b | 2008-07-07 19:24:20 +0200 | [diff] [blame] | 66 | { "ours", NO_FAST_FORWARD | NO_TRIVIAL }, |
| 67 | { "subtree", NO_FAST_FORWARD | NO_TRIVIAL }, |
| 68 | }; |
| 69 | |
| 70 | static const char *pull_twohead, *pull_octopus; |
| 71 | |
| 72 | static int option_parse_message(const struct option *opt, |
| 73 | const char *arg, int unset) |
| 74 | { |
| 75 | struct strbuf *buf = opt->value; |
| 76 | |
| 77 | if (unset) |
| 78 | strbuf_setlen(buf, 0); |
Michele Ballabio | 74f5b7f | 2008-07-20 14:34:47 +0200 | [diff] [blame] | 79 | else if (arg) { |
Junio C Hamano | ce9d823 | 2009-12-02 10:00:58 -0800 | [diff] [blame] | 80 | strbuf_addf(buf, "%s%s", buf->len ? "\n\n" : "", arg); |
Miklos Vajna | 1c7b76b | 2008-07-07 19:24:20 +0200 | [diff] [blame] | 81 | have_message = 1; |
Michele Ballabio | 74f5b7f | 2008-07-20 14:34:47 +0200 | [diff] [blame] | 82 | } else |
| 83 | return error("switch `m' requires a value"); |
Miklos Vajna | 1c7b76b | 2008-07-07 19:24:20 +0200 | [diff] [blame] | 84 | return 0; |
| 85 | } |
| 86 | |
| 87 | static struct strategy *get_strategy(const char *name) |
| 88 | { |
| 89 | int i; |
Miklos Vajna | 87091b4 | 2008-07-30 01:16:59 +0200 | [diff] [blame] | 90 | struct strategy *ret; |
| 91 | static struct cmdnames main_cmds, other_cmds; |
Alex Riesen | e321180 | 2008-08-28 19:15:33 +0200 | [diff] [blame] | 92 | static int loaded; |
Miklos Vajna | 1c7b76b | 2008-07-07 19:24:20 +0200 | [diff] [blame] | 93 | |
| 94 | if (!name) |
| 95 | return NULL; |
| 96 | |
| 97 | for (i = 0; i < ARRAY_SIZE(all_strategy); i++) |
| 98 | if (!strcmp(name, all_strategy[i].name)) |
| 99 | return &all_strategy[i]; |
Miklos Vajna | 1719b5e | 2008-07-21 18:10:47 +0200 | [diff] [blame] | 100 | |
Alex Riesen | e321180 | 2008-08-28 19:15:33 +0200 | [diff] [blame] | 101 | if (!loaded) { |
Miklos Vajna | 87091b4 | 2008-07-30 01:16:59 +0200 | [diff] [blame] | 102 | struct cmdnames not_strategies; |
Alex Riesen | e321180 | 2008-08-28 19:15:33 +0200 | [diff] [blame] | 103 | loaded = 1; |
Miklos Vajna | 87091b4 | 2008-07-30 01:16:59 +0200 | [diff] [blame] | 104 | |
Miklos Vajna | 87091b4 | 2008-07-30 01:16:59 +0200 | [diff] [blame] | 105 | memset(¬_strategies, 0, sizeof(struct cmdnames)); |
Alex Riesen | e321180 | 2008-08-28 19:15:33 +0200 | [diff] [blame] | 106 | load_command_list("git-merge-", &main_cmds, &other_cmds); |
Miklos Vajna | 87091b4 | 2008-07-30 01:16:59 +0200 | [diff] [blame] | 107 | for (i = 0; i < main_cmds.cnt; i++) { |
| 108 | int j, found = 0; |
| 109 | struct cmdname *ent = main_cmds.names[i]; |
| 110 | for (j = 0; j < ARRAY_SIZE(all_strategy); j++) |
| 111 | if (!strncmp(ent->name, all_strategy[j].name, ent->len) |
| 112 | && !all_strategy[j].name[ent->len]) |
| 113 | found = 1; |
| 114 | if (!found) |
| 115 | add_cmdname(¬_strategies, ent->name, ent->len); |
Miklos Vajna | 87091b4 | 2008-07-30 01:16:59 +0200 | [diff] [blame] | 116 | } |
Avery Pennarun | ed87465 | 2009-11-25 21:23:54 -0500 | [diff] [blame] | 117 | exclude_cmds(&main_cmds, ¬_strategies); |
Miklos Vajna | 87091b4 | 2008-07-30 01:16:59 +0200 | [diff] [blame] | 118 | } |
| 119 | if (!is_in_cmdlist(&main_cmds, name) && !is_in_cmdlist(&other_cmds, name)) { |
Junio C Hamano | 131f9a1 | 2008-08-20 22:07:55 -0700 | [diff] [blame] | 120 | fprintf(stderr, "Could not find merge strategy '%s'.\n", name); |
| 121 | fprintf(stderr, "Available strategies are:"); |
| 122 | for (i = 0; i < main_cmds.cnt; i++) |
| 123 | fprintf(stderr, " %s", main_cmds.names[i]->name); |
| 124 | fprintf(stderr, ".\n"); |
| 125 | if (other_cmds.cnt) { |
| 126 | fprintf(stderr, "Available custom strategies are:"); |
| 127 | for (i = 0; i < other_cmds.cnt; i++) |
| 128 | fprintf(stderr, " %s", other_cmds.names[i]->name); |
| 129 | fprintf(stderr, ".\n"); |
| 130 | } |
Miklos Vajna | 87091b4 | 2008-07-30 01:16:59 +0200 | [diff] [blame] | 131 | exit(1); |
| 132 | } |
| 133 | |
Brandon Casey | 19d4b41 | 2008-10-06 18:39:10 -0500 | [diff] [blame] | 134 | ret = xcalloc(1, sizeof(struct strategy)); |
Miklos Vajna | 87091b4 | 2008-07-30 01:16:59 +0200 | [diff] [blame] | 135 | ret->name = xstrdup(name); |
Jonathan Nieder | 52b48ef | 2010-08-15 20:11:06 -0500 | [diff] [blame] | 136 | ret->attr = NO_TRIVIAL; |
Miklos Vajna | 87091b4 | 2008-07-30 01:16:59 +0200 | [diff] [blame] | 137 | return ret; |
Miklos Vajna | 1c7b76b | 2008-07-07 19:24:20 +0200 | [diff] [blame] | 138 | } |
| 139 | |
| 140 | static void append_strategy(struct strategy *s) |
| 141 | { |
| 142 | ALLOC_GROW(use_strategies, use_strategies_nr + 1, use_strategies_alloc); |
| 143 | use_strategies[use_strategies_nr++] = s; |
| 144 | } |
| 145 | |
| 146 | static int option_parse_strategy(const struct option *opt, |
| 147 | const char *name, int unset) |
| 148 | { |
Miklos Vajna | 1c7b76b | 2008-07-07 19:24:20 +0200 | [diff] [blame] | 149 | if (unset) |
| 150 | return 0; |
| 151 | |
Miklos Vajna | 1719b5e | 2008-07-21 18:10:47 +0200 | [diff] [blame] | 152 | append_strategy(get_strategy(name)); |
Miklos Vajna | 1c7b76b | 2008-07-07 19:24:20 +0200 | [diff] [blame] | 153 | return 0; |
| 154 | } |
| 155 | |
Avery Pennarun | 8cc5b29 | 2009-11-25 21:23:55 -0500 | [diff] [blame] | 156 | static int option_parse_x(const struct option *opt, |
| 157 | const char *arg, int unset) |
| 158 | { |
| 159 | if (unset) |
| 160 | return 0; |
| 161 | |
| 162 | ALLOC_GROW(xopts, xopts_nr + 1, xopts_alloc); |
| 163 | xopts[xopts_nr++] = xstrdup(arg); |
| 164 | return 0; |
| 165 | } |
| 166 | |
Miklos Vajna | 1c7b76b | 2008-07-07 19:24:20 +0200 | [diff] [blame] | 167 | static int option_parse_n(const struct option *opt, |
| 168 | const char *arg, int unset) |
| 169 | { |
| 170 | show_diffstat = unset; |
| 171 | return 0; |
| 172 | } |
| 173 | |
| 174 | static struct option builtin_merge_options[] = { |
| 175 | { OPTION_CALLBACK, 'n', NULL, NULL, NULL, |
| 176 | "do not show a diffstat at the end of the merge", |
| 177 | PARSE_OPT_NOARG, option_parse_n }, |
| 178 | OPT_BOOLEAN(0, "stat", &show_diffstat, |
| 179 | "show a diffstat at the end of the merge"), |
| 180 | OPT_BOOLEAN(0, "summary", &show_diffstat, "(synonym to --stat)"), |
Ramkumar Ramachandra | 96e9420 | 2010-09-08 23:29:54 +0530 | [diff] [blame] | 181 | { OPTION_INTEGER, 0, "log", &shortlog_len, "n", |
| 182 | "add (at most <n>) entries from shortlog to merge commit message", |
| 183 | PARSE_OPT_OPTARG, NULL, DEFAULT_MERGE_LOG_LEN }, |
Miklos Vajna | 1c7b76b | 2008-07-07 19:24:20 +0200 | [diff] [blame] | 184 | OPT_BOOLEAN(0, "squash", &squash, |
| 185 | "create a single commit instead of doing a merge"), |
| 186 | OPT_BOOLEAN(0, "commit", &option_commit, |
| 187 | "perform a commit if the merge succeeds (default)"), |
| 188 | OPT_BOOLEAN(0, "ff", &allow_fast_forward, |
Felipe Contreras | a75d7b5 | 2009-10-24 11:31:32 +0300 | [diff] [blame] | 189 | "allow fast-forward (default)"), |
Björn Gustavsson | 1347483 | 2009-10-29 23:08:31 +0100 | [diff] [blame] | 190 | OPT_BOOLEAN(0, "ff-only", &fast_forward_only, |
Junio C Hamano | 4d8c325 | 2009-11-15 16:41:02 -0800 | [diff] [blame] | 191 | "abort if fast-forward is not possible"), |
Junio C Hamano | cb6020b | 2009-12-04 00:20:48 -0800 | [diff] [blame] | 192 | OPT_RERERE_AUTOUPDATE(&allow_rerere_auto), |
Miklos Vajna | 1c7b76b | 2008-07-07 19:24:20 +0200 | [diff] [blame] | 193 | OPT_CALLBACK('s', "strategy", &use_strategies, "strategy", |
| 194 | "merge strategy to use", option_parse_strategy), |
Avery Pennarun | 8cc5b29 | 2009-11-25 21:23:55 -0500 | [diff] [blame] | 195 | OPT_CALLBACK('X', "strategy-option", &xopts, "option=value", |
| 196 | "option for selected merge strategy", option_parse_x), |
Miklos Vajna | 1c7b76b | 2008-07-07 19:24:20 +0200 | [diff] [blame] | 197 | OPT_CALLBACK('m', "message", &merge_msg, "message", |
| 198 | "message to be used for the merge commit (if any)", |
| 199 | option_parse_message), |
Tuncer Ayaz | 7f87aff | 2008-11-15 01:14:24 +0100 | [diff] [blame] | 200 | OPT__VERBOSITY(&verbosity), |
Johan Herland | 35d2fff | 2010-11-09 22:49:59 +0100 | [diff] [blame] | 201 | OPT_BOOLEAN(0, "abort", &abort_current_merge, |
| 202 | "abort the current in-progress merge"), |
Miklos Vajna | 1c7b76b | 2008-07-07 19:24:20 +0200 | [diff] [blame] | 203 | OPT_END() |
| 204 | }; |
| 205 | |
| 206 | /* Cleans up metadata that is uninteresting after a succeeded merge. */ |
| 207 | static void drop_save(void) |
| 208 | { |
| 209 | unlink(git_path("MERGE_HEAD")); |
| 210 | unlink(git_path("MERGE_MSG")); |
Miklos Vajna | cf10f9f | 2008-10-03 14:04:47 +0200 | [diff] [blame] | 211 | unlink(git_path("MERGE_MODE")); |
Miklos Vajna | 1c7b76b | 2008-07-07 19:24:20 +0200 | [diff] [blame] | 212 | } |
| 213 | |
| 214 | static void save_state(void) |
| 215 | { |
| 216 | int len; |
| 217 | struct child_process cp; |
| 218 | struct strbuf buffer = STRBUF_INIT; |
| 219 | const char *argv[] = {"stash", "create", NULL}; |
| 220 | |
| 221 | memset(&cp, 0, sizeof(cp)); |
| 222 | cp.argv = argv; |
| 223 | cp.out = -1; |
| 224 | cp.git_cmd = 1; |
| 225 | |
| 226 | if (start_command(&cp)) |
| 227 | die("could not run stash."); |
| 228 | len = strbuf_read(&buffer, cp.out, 1024); |
| 229 | close(cp.out); |
| 230 | |
| 231 | if (finish_command(&cp) || len < 0) |
| 232 | die("stash failed"); |
| 233 | else if (!len) |
| 234 | return; |
| 235 | strbuf_setlen(&buffer, buffer.len-1); |
| 236 | if (get_sha1(buffer.buf, stash)) |
| 237 | die("not a valid object: %s", buffer.buf); |
| 238 | } |
| 239 | |
Clemens Buchacher | 172b642 | 2010-11-14 23:07:49 +0100 | [diff] [blame] | 240 | static void read_empty(unsigned const char *sha1, int verbose) |
| 241 | { |
| 242 | int i = 0; |
| 243 | const char *args[7]; |
| 244 | |
| 245 | args[i++] = "read-tree"; |
| 246 | if (verbose) |
| 247 | args[i++] = "-v"; |
| 248 | args[i++] = "-m"; |
| 249 | args[i++] = "-u"; |
| 250 | args[i++] = EMPTY_TREE_SHA1_HEX; |
| 251 | args[i++] = sha1_to_hex(sha1); |
| 252 | args[i] = NULL; |
| 253 | |
| 254 | if (run_command_v_opt(args, RUN_GIT_CMD)) |
| 255 | die("read-tree failed"); |
| 256 | } |
| 257 | |
Miklos Vajna | 1c7b76b | 2008-07-07 19:24:20 +0200 | [diff] [blame] | 258 | static void reset_hard(unsigned const char *sha1, int verbose) |
| 259 | { |
| 260 | int i = 0; |
| 261 | const char *args[6]; |
| 262 | |
| 263 | args[i++] = "read-tree"; |
| 264 | if (verbose) |
| 265 | args[i++] = "-v"; |
| 266 | args[i++] = "--reset"; |
| 267 | args[i++] = "-u"; |
| 268 | args[i++] = sha1_to_hex(sha1); |
| 269 | args[i] = NULL; |
| 270 | |
| 271 | if (run_command_v_opt(args, RUN_GIT_CMD)) |
| 272 | die("read-tree failed"); |
| 273 | } |
| 274 | |
| 275 | static void restore_state(void) |
| 276 | { |
Brandon Casey | f285a2d | 2008-10-09 14:12:12 -0500 | [diff] [blame] | 277 | struct strbuf sb = STRBUF_INIT; |
Miklos Vajna | 1c7b76b | 2008-07-07 19:24:20 +0200 | [diff] [blame] | 278 | const char *args[] = { "stash", "apply", NULL, NULL }; |
| 279 | |
| 280 | if (is_null_sha1(stash)) |
| 281 | return; |
| 282 | |
| 283 | reset_hard(head, 1); |
| 284 | |
Miklos Vajna | 1c7b76b | 2008-07-07 19:24:20 +0200 | [diff] [blame] | 285 | args[2] = sha1_to_hex(stash); |
| 286 | |
| 287 | /* |
| 288 | * It is OK to ignore error here, for example when there was |
| 289 | * nothing to restore. |
| 290 | */ |
| 291 | run_command_v_opt(args, RUN_GIT_CMD); |
| 292 | |
| 293 | strbuf_release(&sb); |
| 294 | refresh_cache(REFRESH_QUIET); |
| 295 | } |
| 296 | |
| 297 | /* This is called when no merge was necessary. */ |
| 298 | static void finish_up_to_date(const char *msg) |
| 299 | { |
Tuncer Ayaz | 7f87aff | 2008-11-15 01:14:24 +0100 | [diff] [blame] | 300 | if (verbosity >= 0) |
| 301 | printf("%s%s\n", squash ? " (nothing to squash)" : "", msg); |
Miklos Vajna | 1c7b76b | 2008-07-07 19:24:20 +0200 | [diff] [blame] | 302 | drop_save(); |
| 303 | } |
| 304 | |
| 305 | static void squash_message(void) |
| 306 | { |
| 307 | struct rev_info rev; |
| 308 | struct commit *commit; |
Brandon Casey | f285a2d | 2008-10-09 14:12:12 -0500 | [diff] [blame] | 309 | struct strbuf out = STRBUF_INIT; |
Miklos Vajna | 1c7b76b | 2008-07-07 19:24:20 +0200 | [diff] [blame] | 310 | struct commit_list *j; |
| 311 | int fd; |
Thomas Rast | dd2e794 | 2009-10-19 17:48:08 +0200 | [diff] [blame] | 312 | struct pretty_print_context ctx = {0}; |
Miklos Vajna | 1c7b76b | 2008-07-07 19:24:20 +0200 | [diff] [blame] | 313 | |
| 314 | printf("Squash commit -- not updating HEAD\n"); |
| 315 | fd = open(git_path("SQUASH_MSG"), O_WRONLY | O_CREAT, 0666); |
| 316 | if (fd < 0) |
Thomas Rast | 0721c31 | 2009-06-27 17:58:47 +0200 | [diff] [blame] | 317 | die_errno("Could not write to '%s'", git_path("SQUASH_MSG")); |
Miklos Vajna | 1c7b76b | 2008-07-07 19:24:20 +0200 | [diff] [blame] | 318 | |
| 319 | init_revisions(&rev, NULL); |
| 320 | rev.ignore_merges = 1; |
| 321 | rev.commit_format = CMIT_FMT_MEDIUM; |
| 322 | |
| 323 | commit = lookup_commit(head); |
| 324 | commit->object.flags |= UNINTERESTING; |
| 325 | add_pending_object(&rev, &commit->object, NULL); |
| 326 | |
| 327 | for (j = remoteheads; j; j = j->next) |
| 328 | add_pending_object(&rev, &j->item->object, NULL); |
| 329 | |
| 330 | setup_revisions(0, NULL, &rev, NULL); |
| 331 | if (prepare_revision_walk(&rev)) |
| 332 | die("revision walk setup failed"); |
| 333 | |
Thomas Rast | dd2e794 | 2009-10-19 17:48:08 +0200 | [diff] [blame] | 334 | ctx.abbrev = rev.abbrev; |
| 335 | ctx.date_mode = rev.date_mode; |
| 336 | |
Miklos Vajna | 1c7b76b | 2008-07-07 19:24:20 +0200 | [diff] [blame] | 337 | strbuf_addstr(&out, "Squashed commit of the following:\n"); |
| 338 | while ((commit = get_revision(&rev)) != NULL) { |
| 339 | strbuf_addch(&out, '\n'); |
| 340 | strbuf_addf(&out, "commit %s\n", |
| 341 | sha1_to_hex(commit->object.sha1)); |
Thomas Rast | dd2e794 | 2009-10-19 17:48:08 +0200 | [diff] [blame] | 342 | pretty_print_commit(rev.commit_format, commit, &out, &ctx); |
Miklos Vajna | 1c7b76b | 2008-07-07 19:24:20 +0200 | [diff] [blame] | 343 | } |
Alex Riesen | 47d32af | 2008-12-05 01:35:48 +0100 | [diff] [blame] | 344 | if (write(fd, out.buf, out.len) < 0) |
Thomas Rast | d824cbb | 2009-06-27 17:58:46 +0200 | [diff] [blame] | 345 | die_errno("Writing SQUASH_MSG"); |
Alex Riesen | 47d32af | 2008-12-05 01:35:48 +0100 | [diff] [blame] | 346 | if (close(fd)) |
Thomas Rast | d824cbb | 2009-06-27 17:58:46 +0200 | [diff] [blame] | 347 | die_errno("Finishing SQUASH_MSG"); |
Miklos Vajna | 1c7b76b | 2008-07-07 19:24:20 +0200 | [diff] [blame] | 348 | strbuf_release(&out); |
| 349 | } |
| 350 | |
Miklos Vajna | 1c7b76b | 2008-07-07 19:24:20 +0200 | [diff] [blame] | 351 | static void finish(const unsigned char *new_head, const char *msg) |
| 352 | { |
Brandon Casey | f285a2d | 2008-10-09 14:12:12 -0500 | [diff] [blame] | 353 | struct strbuf reflog_message = STRBUF_INIT; |
Miklos Vajna | 1c7b76b | 2008-07-07 19:24:20 +0200 | [diff] [blame] | 354 | |
Miklos Vajna | 1c7b76b | 2008-07-07 19:24:20 +0200 | [diff] [blame] | 355 | if (!msg) |
| 356 | strbuf_addstr(&reflog_message, getenv("GIT_REFLOG_ACTION")); |
| 357 | else { |
Tuncer Ayaz | 7f87aff | 2008-11-15 01:14:24 +0100 | [diff] [blame] | 358 | if (verbosity >= 0) |
| 359 | printf("%s\n", msg); |
Miklos Vajna | 1c7b76b | 2008-07-07 19:24:20 +0200 | [diff] [blame] | 360 | strbuf_addf(&reflog_message, "%s: %s", |
| 361 | getenv("GIT_REFLOG_ACTION"), msg); |
| 362 | } |
| 363 | if (squash) { |
| 364 | squash_message(); |
| 365 | } else { |
Tuncer Ayaz | 7f87aff | 2008-11-15 01:14:24 +0100 | [diff] [blame] | 366 | if (verbosity >= 0 && !merge_msg.len) |
Miklos Vajna | 1c7b76b | 2008-07-07 19:24:20 +0200 | [diff] [blame] | 367 | printf("No merge message -- not updating HEAD\n"); |
| 368 | else { |
| 369 | const char *argv_gc_auto[] = { "gc", "--auto", NULL }; |
| 370 | update_ref(reflog_message.buf, "HEAD", |
| 371 | new_head, head, 0, |
| 372 | DIE_ON_ERR); |
| 373 | /* |
| 374 | * We ignore errors in 'gc --auto', since the |
| 375 | * user should see them. |
| 376 | */ |
| 377 | run_command_v_opt(argv_gc_auto, RUN_GIT_CMD); |
| 378 | } |
| 379 | } |
| 380 | if (new_head && show_diffstat) { |
| 381 | struct diff_options opts; |
| 382 | diff_setup(&opts); |
| 383 | opts.output_format |= |
| 384 | DIFF_FORMAT_SUMMARY | DIFF_FORMAT_DIFFSTAT; |
| 385 | opts.detect_rename = DIFF_DETECT_RENAME; |
| 386 | if (diff_use_color_default > 0) |
| 387 | DIFF_OPT_SET(&opts, COLOR_DIFF); |
| 388 | if (diff_setup_done(&opts) < 0) |
| 389 | die("diff_setup_done failed"); |
| 390 | diff_tree_sha1(head, new_head, "", &opts); |
| 391 | diffcore_std(&opts); |
| 392 | diff_flush(&opts); |
| 393 | } |
| 394 | |
| 395 | /* Run a post-merge hook */ |
Stephan Beyer | ae98a00 | 2009-01-16 20:09:59 +0100 | [diff] [blame] | 396 | run_hook(NULL, "post-merge", squash ? "1" : "0", NULL); |
Miklos Vajna | 1c7b76b | 2008-07-07 19:24:20 +0200 | [diff] [blame] | 397 | |
| 398 | strbuf_release(&reflog_message); |
| 399 | } |
| 400 | |
| 401 | /* Get the name for the merge commit's message. */ |
| 402 | static void merge_name(const char *remote, struct strbuf *msg) |
| 403 | { |
| 404 | struct object *remote_head; |
| 405 | unsigned char branch_head[20], buf_sha[20]; |
Brandon Casey | f285a2d | 2008-10-09 14:12:12 -0500 | [diff] [blame] | 406 | struct strbuf buf = STRBUF_INIT; |
Junio C Hamano | c9717ee | 2009-02-13 23:26:12 -0800 | [diff] [blame] | 407 | struct strbuf bname = STRBUF_INIT; |
Miklos Vajna | 1c7b76b | 2008-07-07 19:24:20 +0200 | [diff] [blame] | 408 | const char *ptr; |
Jeff King | 751c597 | 2009-08-09 06:02:24 -0400 | [diff] [blame] | 409 | char *found_ref; |
Miklos Vajna | 1c7b76b | 2008-07-07 19:24:20 +0200 | [diff] [blame] | 410 | int len, early; |
| 411 | |
Junio C Hamano | a552de7 | 2009-03-21 13:17:30 -0700 | [diff] [blame] | 412 | strbuf_branchname(&bname, remote); |
| 413 | remote = bname.buf; |
Junio C Hamano | c9717ee | 2009-02-13 23:26:12 -0800 | [diff] [blame] | 414 | |
Miklos Vajna | 1c7b76b | 2008-07-07 19:24:20 +0200 | [diff] [blame] | 415 | memset(branch_head, 0, sizeof(branch_head)); |
| 416 | remote_head = peel_to_type(remote, 0, NULL, OBJ_COMMIT); |
| 417 | if (!remote_head) |
| 418 | die("'%s' does not point to a commit", remote); |
| 419 | |
Jeff King | 751c597 | 2009-08-09 06:02:24 -0400 | [diff] [blame] | 420 | if (dwim_ref(remote, strlen(remote), branch_head, &found_ref) > 0) { |
| 421 | if (!prefixcmp(found_ref, "refs/heads/")) { |
| 422 | strbuf_addf(msg, "%s\t\tbranch '%s' of .\n", |
| 423 | sha1_to_hex(branch_head), remote); |
| 424 | goto cleanup; |
| 425 | } |
Jeff King | 69a8b7c | 2009-08-09 06:02:51 -0400 | [diff] [blame] | 426 | if (!prefixcmp(found_ref, "refs/remotes/")) { |
Matthieu Moy | 1393123 | 2010-11-02 16:31:25 +0100 | [diff] [blame] | 427 | strbuf_addf(msg, "%s\t\tremote-tracking branch '%s' of .\n", |
Jeff King | 69a8b7c | 2009-08-09 06:02:51 -0400 | [diff] [blame] | 428 | sha1_to_hex(branch_head), remote); |
| 429 | goto cleanup; |
| 430 | } |
Miklos Vajna | 1c7b76b | 2008-07-07 19:24:20 +0200 | [diff] [blame] | 431 | } |
| 432 | |
| 433 | /* See if remote matches <name>^^^.. or <name>~<number> */ |
| 434 | for (len = 0, ptr = remote + strlen(remote); |
| 435 | remote < ptr && ptr[-1] == '^'; |
| 436 | ptr--) |
| 437 | len++; |
| 438 | if (len) |
| 439 | early = 1; |
| 440 | else { |
| 441 | early = 0; |
| 442 | ptr = strrchr(remote, '~'); |
| 443 | if (ptr) { |
| 444 | int seen_nonzero = 0; |
| 445 | |
| 446 | len++; /* count ~ */ |
| 447 | while (*++ptr && isdigit(*ptr)) { |
| 448 | seen_nonzero |= (*ptr != '0'); |
| 449 | len++; |
| 450 | } |
| 451 | if (*ptr) |
| 452 | len = 0; /* not ...~<number> */ |
| 453 | else if (seen_nonzero) |
| 454 | early = 1; |
| 455 | else if (len == 1) |
| 456 | early = 1; /* "name~" is "name~1"! */ |
| 457 | } |
| 458 | } |
| 459 | if (len) { |
| 460 | struct strbuf truname = STRBUF_INIT; |
| 461 | strbuf_addstr(&truname, "refs/heads/"); |
| 462 | strbuf_addstr(&truname, remote); |
Junio C Hamano | 9b6bf4d | 2008-07-30 01:12:19 -0700 | [diff] [blame] | 463 | strbuf_setlen(&truname, truname.len - len); |
Jonathan Nieder | b81f925 | 2010-08-17 01:52:48 -0500 | [diff] [blame] | 464 | if (resolve_ref(truname.buf, buf_sha, 1, NULL)) { |
Miklos Vajna | 1c7b76b | 2008-07-07 19:24:20 +0200 | [diff] [blame] | 465 | strbuf_addf(msg, |
| 466 | "%s\t\tbranch '%s'%s of .\n", |
| 467 | sha1_to_hex(remote_head->sha1), |
Junio C Hamano | 9b6bf4d | 2008-07-30 01:12:19 -0700 | [diff] [blame] | 468 | truname.buf + 11, |
Miklos Vajna | 1c7b76b | 2008-07-07 19:24:20 +0200 | [diff] [blame] | 469 | (early ? " (early part)" : "")); |
Junio C Hamano | c9717ee | 2009-02-13 23:26:12 -0800 | [diff] [blame] | 470 | strbuf_release(&truname); |
| 471 | goto cleanup; |
Miklos Vajna | 1c7b76b | 2008-07-07 19:24:20 +0200 | [diff] [blame] | 472 | } |
| 473 | } |
| 474 | |
| 475 | if (!strcmp(remote, "FETCH_HEAD") && |
| 476 | !access(git_path("FETCH_HEAD"), R_OK)) { |
| 477 | FILE *fp; |
Brandon Casey | f285a2d | 2008-10-09 14:12:12 -0500 | [diff] [blame] | 478 | struct strbuf line = STRBUF_INIT; |
Miklos Vajna | 1c7b76b | 2008-07-07 19:24:20 +0200 | [diff] [blame] | 479 | char *ptr; |
| 480 | |
Miklos Vajna | 1c7b76b | 2008-07-07 19:24:20 +0200 | [diff] [blame] | 481 | fp = fopen(git_path("FETCH_HEAD"), "r"); |
| 482 | if (!fp) |
Thomas Rast | d824cbb | 2009-06-27 17:58:46 +0200 | [diff] [blame] | 483 | die_errno("could not open '%s' for reading", |
| 484 | git_path("FETCH_HEAD")); |
Miklos Vajna | 1c7b76b | 2008-07-07 19:24:20 +0200 | [diff] [blame] | 485 | strbuf_getline(&line, fp, '\n'); |
| 486 | fclose(fp); |
| 487 | ptr = strstr(line.buf, "\tnot-for-merge\t"); |
| 488 | if (ptr) |
| 489 | strbuf_remove(&line, ptr-line.buf+1, 13); |
| 490 | strbuf_addbuf(msg, &line); |
| 491 | strbuf_release(&line); |
Junio C Hamano | c9717ee | 2009-02-13 23:26:12 -0800 | [diff] [blame] | 492 | goto cleanup; |
Miklos Vajna | 1c7b76b | 2008-07-07 19:24:20 +0200 | [diff] [blame] | 493 | } |
| 494 | strbuf_addf(msg, "%s\t\tcommit '%s'\n", |
| 495 | sha1_to_hex(remote_head->sha1), remote); |
Junio C Hamano | c9717ee | 2009-02-13 23:26:12 -0800 | [diff] [blame] | 496 | cleanup: |
| 497 | strbuf_release(&buf); |
| 498 | strbuf_release(&bname); |
Miklos Vajna | 1c7b76b | 2008-07-07 19:24:20 +0200 | [diff] [blame] | 499 | } |
| 500 | |
Stephan Beyer | 186458b | 2008-07-24 01:09:35 +0200 | [diff] [blame] | 501 | static int git_merge_config(const char *k, const char *v, void *cb) |
Miklos Vajna | 1c7b76b | 2008-07-07 19:24:20 +0200 | [diff] [blame] | 502 | { |
| 503 | if (branch && !prefixcmp(k, "branch.") && |
| 504 | !prefixcmp(k + 7, branch) && |
| 505 | !strcmp(k + 7 + strlen(branch), ".mergeoptions")) { |
| 506 | const char **argv; |
| 507 | int argc; |
| 508 | char *buf; |
| 509 | |
| 510 | buf = xstrdup(v); |
| 511 | argc = split_cmdline(buf, &argv); |
Deskin Miller | dc4179f | 2008-09-22 11:06:41 -0400 | [diff] [blame] | 512 | if (argc < 0) |
Greg Brockman | ad9ac6d | 2010-08-07 01:13:39 -0400 | [diff] [blame] | 513 | die("Bad branch.%s.mergeoptions string: %s", branch, |
| 514 | split_cmdline_strerror(argc)); |
Miklos Vajna | 1c7b76b | 2008-07-07 19:24:20 +0200 | [diff] [blame] | 515 | argv = xrealloc(argv, sizeof(*argv) * (argc + 2)); |
| 516 | memmove(argv + 1, argv, sizeof(*argv) * (argc + 1)); |
| 517 | argc++; |
Stephen Boyd | 3778292 | 2009-05-23 11:53:12 -0700 | [diff] [blame] | 518 | parse_options(argc, argv, NULL, builtin_merge_options, |
Miklos Vajna | 1c7b76b | 2008-07-07 19:24:20 +0200 | [diff] [blame] | 519 | builtin_merge_usage, 0); |
| 520 | free(buf); |
| 521 | } |
| 522 | |
| 523 | if (!strcmp(k, "merge.diffstat") || !strcmp(k, "merge.stat")) |
| 524 | show_diffstat = git_config_bool(k, v); |
| 525 | else if (!strcmp(k, "pull.twohead")) |
| 526 | return git_config_string(&pull_twohead, k, v); |
| 527 | else if (!strcmp(k, "pull.octopus")) |
| 528 | return git_config_string(&pull_octopus, k, v); |
Jonathan Nieder | 7610fa5 | 2010-08-05 06:32:41 -0500 | [diff] [blame] | 529 | else if (!strcmp(k, "merge.renormalize")) |
| 530 | option_renormalize = git_config_bool(k, v); |
Ramkumar Ramachandra | 96e9420 | 2010-09-08 23:29:54 +0530 | [diff] [blame] | 531 | else if (!strcmp(k, "merge.log") || !strcmp(k, "merge.summary")) { |
Ramkumar Ramachandra | bda3b8f | 2010-09-08 23:29:55 +0530 | [diff] [blame] | 532 | int is_bool; |
| 533 | shortlog_len = git_config_bool_or_int(k, v, &is_bool); |
| 534 | if (!is_bool && shortlog_len < 0) |
| 535 | return error("%s: negative length %s", k, v); |
| 536 | if (is_bool && shortlog_len) |
| 537 | shortlog_len = DEFAULT_MERGE_LOG_LEN; |
Ramkumar Ramachandra | 96e9420 | 2010-09-08 23:29:54 +0530 | [diff] [blame] | 538 | return 0; |
| 539 | } |
Miklos Vajna | 1c7b76b | 2008-07-07 19:24:20 +0200 | [diff] [blame] | 540 | return git_diff_ui_config(k, v, cb); |
| 541 | } |
| 542 | |
| 543 | static int read_tree_trivial(unsigned char *common, unsigned char *head, |
| 544 | unsigned char *one) |
| 545 | { |
| 546 | int i, nr_trees = 0; |
| 547 | struct tree *trees[MAX_UNPACK_TREES]; |
| 548 | struct tree_desc t[MAX_UNPACK_TREES]; |
| 549 | struct unpack_trees_options opts; |
| 550 | |
| 551 | memset(&opts, 0, sizeof(opts)); |
| 552 | opts.head_idx = 2; |
| 553 | opts.src_index = &the_index; |
| 554 | opts.dst_index = &the_index; |
| 555 | opts.update = 1; |
| 556 | opts.verbose_update = 1; |
| 557 | opts.trivial_merges_only = 1; |
| 558 | opts.merge = 1; |
| 559 | trees[nr_trees] = parse_tree_indirect(common); |
| 560 | if (!trees[nr_trees++]) |
| 561 | return -1; |
| 562 | trees[nr_trees] = parse_tree_indirect(head); |
| 563 | if (!trees[nr_trees++]) |
| 564 | return -1; |
| 565 | trees[nr_trees] = parse_tree_indirect(one); |
| 566 | if (!trees[nr_trees++]) |
| 567 | return -1; |
| 568 | opts.fn = threeway_merge; |
| 569 | cache_tree_free(&active_cache_tree); |
| 570 | for (i = 0; i < nr_trees; i++) { |
| 571 | parse_tree(trees[i]); |
| 572 | init_tree_desc(t+i, trees[i]->buffer, trees[i]->size); |
| 573 | } |
| 574 | if (unpack_trees(nr_trees, t, &opts)) |
| 575 | return -1; |
| 576 | return 0; |
| 577 | } |
| 578 | |
| 579 | static void write_tree_trivial(unsigned char *sha1) |
| 580 | { |
| 581 | if (write_cache_as_tree(sha1, 0, NULL)) |
| 582 | die("git write-tree failed to write a tree"); |
| 583 | } |
| 584 | |
Christian Couder | c674d05 | 2010-03-31 21:22:07 +0200 | [diff] [blame] | 585 | int try_merge_command(const char *strategy, struct commit_list *common, |
| 586 | const char *head_arg, struct commit_list *remotes) |
Miklos Vajna | 1c7b76b | 2008-07-07 19:24:20 +0200 | [diff] [blame] | 587 | { |
| 588 | const char **args; |
Avery Pennarun | 8cc5b29 | 2009-11-25 21:23:55 -0500 | [diff] [blame] | 589 | int i = 0, x = 0, ret; |
Miklos Vajna | 1c7b76b | 2008-07-07 19:24:20 +0200 | [diff] [blame] | 590 | struct commit_list *j; |
Brandon Casey | f285a2d | 2008-10-09 14:12:12 -0500 | [diff] [blame] | 591 | struct strbuf buf = STRBUF_INIT; |
Christian Couder | 3f9083c | 2010-03-31 21:22:06 +0200 | [diff] [blame] | 592 | |
| 593 | args = xmalloc((4 + xopts_nr + commit_list_count(common) + |
| 594 | commit_list_count(remotes)) * sizeof(char *)); |
| 595 | strbuf_addf(&buf, "merge-%s", strategy); |
| 596 | args[i++] = buf.buf; |
| 597 | for (x = 0; x < xopts_nr; x++) { |
| 598 | char *s = xmalloc(strlen(xopts[x])+2+1); |
| 599 | strcpy(s, "--"); |
| 600 | strcpy(s+2, xopts[x]); |
| 601 | args[i++] = s; |
| 602 | } |
| 603 | for (j = common; j; j = j->next) |
| 604 | args[i++] = xstrdup(sha1_to_hex(j->item->object.sha1)); |
| 605 | args[i++] = "--"; |
| 606 | args[i++] = head_arg; |
| 607 | for (j = remotes; j; j = j->next) |
| 608 | args[i++] = xstrdup(sha1_to_hex(j->item->object.sha1)); |
| 609 | args[i] = NULL; |
| 610 | ret = run_command_v_opt(args, RUN_GIT_CMD); |
| 611 | strbuf_release(&buf); |
| 612 | i = 1; |
| 613 | for (x = 0; x < xopts_nr; x++) |
| 614 | free((void *)args[i++]); |
| 615 | for (j = common; j; j = j->next) |
| 616 | free((void *)args[i++]); |
| 617 | i += 2; |
| 618 | for (j = remotes; j; j = j->next) |
| 619 | free((void *)args[i++]); |
| 620 | free(args); |
| 621 | discard_cache(); |
| 622 | if (read_cache() < 0) |
| 623 | die("failed to read the cache"); |
| 624 | resolve_undo_clear(); |
| 625 | |
| 626 | return ret; |
| 627 | } |
| 628 | |
| 629 | static int try_merge_strategy(const char *strategy, struct commit_list *common, |
| 630 | const char *head_arg) |
| 631 | { |
Miklos Vajna | 668f26f | 2008-10-03 15:02:31 +0200 | [diff] [blame] | 632 | int index_fd; |
| 633 | struct lock_file *lock = xcalloc(1, sizeof(struct lock_file)); |
| 634 | |
| 635 | index_fd = hold_locked_index(lock, 1); |
| 636 | refresh_cache(REFRESH_QUIET); |
| 637 | if (active_cache_changed && |
| 638 | (write_cache(index_fd, active_cache, active_nr) || |
| 639 | commit_locked_index(lock))) |
| 640 | return error("Unable to write index."); |
| 641 | rollback_lock_file(lock); |
Miklos Vajna | 1c7b76b | 2008-07-07 19:24:20 +0200 | [diff] [blame] | 642 | |
Miklos Vajna | 18668f5 | 2008-08-28 15:43:00 +0200 | [diff] [blame] | 643 | if (!strcmp(strategy, "recursive") || !strcmp(strategy, "subtree")) { |
Christian Couder | 3f9083c | 2010-03-31 21:22:06 +0200 | [diff] [blame] | 644 | int clean, x; |
Miklos Vajna | 18668f5 | 2008-08-28 15:43:00 +0200 | [diff] [blame] | 645 | struct commit *result; |
| 646 | struct lock_file *lock = xcalloc(1, sizeof(struct lock_file)); |
| 647 | int index_fd; |
| 648 | struct commit_list *reversed = NULL; |
| 649 | struct merge_options o; |
Christian Couder | 3f9083c | 2010-03-31 21:22:06 +0200 | [diff] [blame] | 650 | struct commit_list *j; |
Miklos Vajna | 18668f5 | 2008-08-28 15:43:00 +0200 | [diff] [blame] | 651 | |
| 652 | if (remoteheads->next) { |
| 653 | error("Not handling anything other than two heads merge."); |
| 654 | return 2; |
| 655 | } |
| 656 | |
| 657 | init_merge_options(&o); |
| 658 | if (!strcmp(strategy, "subtree")) |
Junio C Hamano | 85e51b7 | 2008-06-30 22:18:57 -0700 | [diff] [blame] | 659 | o.subtree_shift = ""; |
Avery Pennarun | 8cc5b29 | 2009-11-25 21:23:55 -0500 | [diff] [blame] | 660 | |
Jonathan Nieder | 7610fa5 | 2010-08-05 06:32:41 -0500 | [diff] [blame] | 661 | o.renormalize = option_renormalize; |
| 662 | |
Jonathan Nieder | 635a7bb | 2010-08-26 00:47:58 -0500 | [diff] [blame] | 663 | for (x = 0; x < xopts_nr; x++) |
| 664 | if (parse_merge_opt(&o, xopts[x])) |
Avery Pennarun | 8cc5b29 | 2009-11-25 21:23:55 -0500 | [diff] [blame] | 665 | die("Unknown option for merge-recursive: -X%s", xopts[x]); |
Miklos Vajna | 18668f5 | 2008-08-28 15:43:00 +0200 | [diff] [blame] | 666 | |
| 667 | o.branch1 = head_arg; |
| 668 | o.branch2 = remoteheads->item->util; |
| 669 | |
| 670 | for (j = common; j; j = j->next) |
| 671 | commit_list_insert(j->item, &reversed); |
| 672 | |
| 673 | index_fd = hold_locked_index(lock, 1); |
| 674 | clean = merge_recursive(&o, lookup_commit(head), |
| 675 | remoteheads->item, reversed, &result); |
| 676 | if (active_cache_changed && |
| 677 | (write_cache(index_fd, active_cache, active_nr) || |
| 678 | commit_locked_index(lock))) |
| 679 | die ("unable to write %s", get_index_file()); |
Miklos Vajna | 4271666 | 2008-09-06 18:29:49 +0200 | [diff] [blame] | 680 | rollback_lock_file(lock); |
Miklos Vajna | 18668f5 | 2008-08-28 15:43:00 +0200 | [diff] [blame] | 681 | return clean ? 0 : 1; |
| 682 | } else { |
Christian Couder | 3f9083c | 2010-03-31 21:22:06 +0200 | [diff] [blame] | 683 | return try_merge_command(strategy, common, head_arg, remoteheads); |
Miklos Vajna | 18668f5 | 2008-08-28 15:43:00 +0200 | [diff] [blame] | 684 | } |
Miklos Vajna | 1c7b76b | 2008-07-07 19:24:20 +0200 | [diff] [blame] | 685 | } |
| 686 | |
| 687 | static void count_diff_files(struct diff_queue_struct *q, |
| 688 | struct diff_options *opt, void *data) |
| 689 | { |
| 690 | int *count = data; |
| 691 | |
| 692 | (*count) += q->nr; |
| 693 | } |
| 694 | |
| 695 | static int count_unmerged_entries(void) |
| 696 | { |
Miklos Vajna | 1c7b76b | 2008-07-07 19:24:20 +0200 | [diff] [blame] | 697 | int i, ret = 0; |
| 698 | |
Junio C Hamano | be6ff81 | 2009-12-17 22:23:54 -0800 | [diff] [blame] | 699 | for (i = 0; i < active_nr; i++) |
| 700 | if (ce_stage(active_cache[i])) |
Miklos Vajna | 1c7b76b | 2008-07-07 19:24:20 +0200 | [diff] [blame] | 701 | ret++; |
| 702 | |
| 703 | return ret; |
| 704 | } |
| 705 | |
Junio C Hamano | cac42b2 | 2010-03-06 21:34:41 +0100 | [diff] [blame] | 706 | int checkout_fast_forward(const unsigned char *head, const unsigned char *remote) |
Miklos Vajna | 1c7b76b | 2008-07-07 19:24:20 +0200 | [diff] [blame] | 707 | { |
| 708 | struct tree *trees[MAX_UNPACK_TREES]; |
| 709 | struct unpack_trees_options opts; |
| 710 | struct tree_desc t[MAX_UNPACK_TREES]; |
| 711 | int i, fd, nr_trees = 0; |
| 712 | struct dir_struct dir; |
| 713 | struct lock_file *lock_file = xcalloc(1, sizeof(struct lock_file)); |
| 714 | |
Junio C Hamano | 9ca8f60 | 2008-08-20 15:09:28 -0700 | [diff] [blame] | 715 | refresh_cache(REFRESH_QUIET); |
Miklos Vajna | 1c7b76b | 2008-07-07 19:24:20 +0200 | [diff] [blame] | 716 | |
| 717 | fd = hold_locked_index(lock_file, 1); |
| 718 | |
| 719 | memset(&trees, 0, sizeof(trees)); |
| 720 | memset(&opts, 0, sizeof(opts)); |
| 721 | memset(&t, 0, sizeof(t)); |
Pierre Habouzit | 5d2299d | 2008-07-21 22:32:53 -0700 | [diff] [blame] | 722 | memset(&dir, 0, sizeof(dir)); |
Johannes Schindelin | 7c4c97c | 2009-02-16 13:20:25 +0100 | [diff] [blame] | 723 | dir.flags |= DIR_SHOW_IGNORED; |
Miklos Vajna | 1c7b76b | 2008-07-07 19:24:20 +0200 | [diff] [blame] | 724 | dir.exclude_per_dir = ".gitignore"; |
| 725 | opts.dir = &dir; |
| 726 | |
| 727 | opts.head_idx = 1; |
| 728 | opts.src_index = &the_index; |
| 729 | opts.dst_index = &the_index; |
| 730 | opts.update = 1; |
| 731 | opts.verbose_update = 1; |
| 732 | opts.merge = 1; |
| 733 | opts.fn = twoway_merge; |
Matthieu Moy | e294030 | 2010-09-02 13:57:34 +0200 | [diff] [blame] | 734 | setup_unpack_trees_porcelain(&opts, "merge"); |
Miklos Vajna | 1c7b76b | 2008-07-07 19:24:20 +0200 | [diff] [blame] | 735 | |
| 736 | trees[nr_trees] = parse_tree_indirect(head); |
| 737 | if (!trees[nr_trees++]) |
| 738 | return -1; |
| 739 | trees[nr_trees] = parse_tree_indirect(remote); |
| 740 | if (!trees[nr_trees++]) |
| 741 | return -1; |
| 742 | for (i = 0; i < nr_trees; i++) { |
| 743 | parse_tree(trees[i]); |
| 744 | init_tree_desc(t+i, trees[i]->buffer, trees[i]->size); |
| 745 | } |
| 746 | if (unpack_trees(nr_trees, t, &opts)) |
| 747 | return -1; |
| 748 | if (write_cache(fd, active_cache, active_nr) || |
| 749 | commit_locked_index(lock_file)) |
| 750 | die("unable to write new index file"); |
| 751 | return 0; |
| 752 | } |
| 753 | |
| 754 | static void split_merge_strategies(const char *string, struct strategy **list, |
| 755 | int *nr, int *alloc) |
| 756 | { |
| 757 | char *p, *q, *buf; |
| 758 | |
| 759 | if (!string) |
| 760 | return; |
| 761 | |
| 762 | buf = xstrdup(string); |
| 763 | q = buf; |
| 764 | for (;;) { |
| 765 | p = strchr(q, ' '); |
| 766 | if (!p) { |
| 767 | ALLOC_GROW(*list, *nr + 1, *alloc); |
| 768 | (*list)[(*nr)++].name = xstrdup(q); |
| 769 | free(buf); |
| 770 | return; |
| 771 | } else { |
| 772 | *p = '\0'; |
| 773 | ALLOC_GROW(*list, *nr + 1, *alloc); |
| 774 | (*list)[(*nr)++].name = xstrdup(q); |
| 775 | q = ++p; |
| 776 | } |
| 777 | } |
| 778 | } |
| 779 | |
| 780 | static void add_strategies(const char *string, unsigned attr) |
| 781 | { |
| 782 | struct strategy *list = NULL; |
| 783 | int list_alloc = 0, list_nr = 0, i; |
| 784 | |
| 785 | memset(&list, 0, sizeof(list)); |
| 786 | split_merge_strategies(string, &list, &list_nr, &list_alloc); |
Miklos Vajna | 1719b5e | 2008-07-21 18:10:47 +0200 | [diff] [blame] | 787 | if (list) { |
| 788 | for (i = 0; i < list_nr; i++) |
| 789 | append_strategy(get_strategy(list[i].name)); |
Miklos Vajna | 1c7b76b | 2008-07-07 19:24:20 +0200 | [diff] [blame] | 790 | return; |
| 791 | } |
| 792 | for (i = 0; i < ARRAY_SIZE(all_strategy); i++) |
| 793 | if (all_strategy[i].attr & attr) |
| 794 | append_strategy(&all_strategy[i]); |
| 795 | |
| 796 | } |
| 797 | |
| 798 | static int merge_trivial(void) |
| 799 | { |
| 800 | unsigned char result_tree[20], result_commit[20]; |
Brandon Casey | 36e4053 | 2008-10-08 19:07:54 -0500 | [diff] [blame] | 801 | struct commit_list *parent = xmalloc(sizeof(*parent)); |
Miklos Vajna | 1c7b76b | 2008-07-07 19:24:20 +0200 | [diff] [blame] | 802 | |
| 803 | write_tree_trivial(result_tree); |
| 804 | printf("Wonderful.\n"); |
Junio C Hamano | 446247d | 2008-08-23 12:56:57 -0700 | [diff] [blame] | 805 | parent->item = lookup_commit(head); |
Brandon Casey | 36e4053 | 2008-10-08 19:07:54 -0500 | [diff] [blame] | 806 | parent->next = xmalloc(sizeof(*parent->next)); |
Junio C Hamano | 446247d | 2008-08-23 12:56:57 -0700 | [diff] [blame] | 807 | parent->next->item = remoteheads->item; |
| 808 | parent->next->next = NULL; |
Miklos Vajna | ee20a12 | 2008-09-10 22:10:31 +0200 | [diff] [blame] | 809 | commit_tree(merge_msg.buf, result_tree, parent, result_commit, NULL); |
Miklos Vajna | 1c7b76b | 2008-07-07 19:24:20 +0200 | [diff] [blame] | 810 | finish(result_commit, "In-index merge"); |
| 811 | drop_save(); |
| 812 | return 0; |
| 813 | } |
| 814 | |
| 815 | static int finish_automerge(struct commit_list *common, |
| 816 | unsigned char *result_tree, |
| 817 | const char *wt_strategy) |
| 818 | { |
| 819 | struct commit_list *parents = NULL, *j; |
| 820 | struct strbuf buf = STRBUF_INIT; |
| 821 | unsigned char result_commit[20]; |
| 822 | |
| 823 | free_commit_list(common); |
| 824 | if (allow_fast_forward) { |
| 825 | parents = remoteheads; |
| 826 | commit_list_insert(lookup_commit(head), &parents); |
| 827 | parents = reduce_heads(parents); |
| 828 | } else { |
| 829 | struct commit_list **pptr = &parents; |
| 830 | |
| 831 | pptr = &commit_list_insert(lookup_commit(head), |
| 832 | pptr)->next; |
| 833 | for (j = remoteheads; j; j = j->next) |
| 834 | pptr = &commit_list_insert(j->item, pptr)->next; |
| 835 | } |
| 836 | free_commit_list(remoteheads); |
| 837 | strbuf_addch(&merge_msg, '\n'); |
Miklos Vajna | ee20a12 | 2008-09-10 22:10:31 +0200 | [diff] [blame] | 838 | commit_tree(merge_msg.buf, result_tree, parents, result_commit, NULL); |
Miklos Vajna | 1c7b76b | 2008-07-07 19:24:20 +0200 | [diff] [blame] | 839 | strbuf_addf(&buf, "Merge made by %s.", wt_strategy); |
| 840 | finish(result_commit, buf.buf); |
| 841 | strbuf_release(&buf); |
| 842 | drop_save(); |
| 843 | return 0; |
| 844 | } |
| 845 | |
Jonathan Nieder | 7610fa5 | 2010-08-05 06:32:41 -0500 | [diff] [blame] | 846 | static int suggest_conflicts(int renormalizing) |
Miklos Vajna | 1c7b76b | 2008-07-07 19:24:20 +0200 | [diff] [blame] | 847 | { |
| 848 | FILE *fp; |
| 849 | int pos; |
| 850 | |
| 851 | fp = fopen(git_path("MERGE_MSG"), "a"); |
| 852 | if (!fp) |
Thomas Rast | 0721c31 | 2009-06-27 17:58:47 +0200 | [diff] [blame] | 853 | die_errno("Could not open '%s' for writing", |
| 854 | git_path("MERGE_MSG")); |
Miklos Vajna | 1c7b76b | 2008-07-07 19:24:20 +0200 | [diff] [blame] | 855 | fprintf(fp, "\nConflicts:\n"); |
| 856 | for (pos = 0; pos < active_nr; pos++) { |
| 857 | struct cache_entry *ce = active_cache[pos]; |
| 858 | |
| 859 | if (ce_stage(ce)) { |
| 860 | fprintf(fp, "\t%s\n", ce->name); |
| 861 | while (pos + 1 < active_nr && |
| 862 | !strcmp(ce->name, |
| 863 | active_cache[pos + 1]->name)) |
| 864 | pos++; |
| 865 | } |
| 866 | } |
| 867 | fclose(fp); |
Junio C Hamano | cb6020b | 2009-12-04 00:20:48 -0800 | [diff] [blame] | 868 | rerere(allow_rerere_auto); |
Miklos Vajna | 1c7b76b | 2008-07-07 19:24:20 +0200 | [diff] [blame] | 869 | printf("Automatic merge failed; " |
| 870 | "fix conflicts and then commit the result.\n"); |
| 871 | return 1; |
| 872 | } |
| 873 | |
| 874 | static struct commit *is_old_style_invocation(int argc, const char **argv) |
| 875 | { |
| 876 | struct commit *second_token = NULL; |
Junio C Hamano | 76bf488 | 2009-12-02 09:59:35 -0800 | [diff] [blame] | 877 | if (argc > 2) { |
Miklos Vajna | 1c7b76b | 2008-07-07 19:24:20 +0200 | [diff] [blame] | 878 | unsigned char second_sha1[20]; |
| 879 | |
| 880 | if (get_sha1(argv[1], second_sha1)) |
| 881 | return NULL; |
| 882 | second_token = lookup_commit_reference_gently(second_sha1, 0); |
| 883 | if (!second_token) |
| 884 | die("'%s' is not a commit", argv[1]); |
| 885 | if (hashcmp(second_token->object.sha1, head)) |
| 886 | return NULL; |
| 887 | } |
| 888 | return second_token; |
| 889 | } |
| 890 | |
| 891 | static int evaluate_result(void) |
| 892 | { |
| 893 | int cnt = 0; |
| 894 | struct rev_info rev; |
| 895 | |
Miklos Vajna | 1c7b76b | 2008-07-07 19:24:20 +0200 | [diff] [blame] | 896 | /* Check how many files differ. */ |
| 897 | init_revisions(&rev, ""); |
| 898 | setup_revisions(0, NULL, &rev, NULL); |
| 899 | rev.diffopt.output_format |= |
| 900 | DIFF_FORMAT_CALLBACK; |
| 901 | rev.diffopt.format_callback = count_diff_files; |
| 902 | rev.diffopt.format_callback_data = &cnt; |
| 903 | run_diff_files(&rev, 0); |
| 904 | |
| 905 | /* |
| 906 | * Check how many unmerged entries are |
| 907 | * there. |
| 908 | */ |
| 909 | cnt += count_unmerged_entries(); |
| 910 | |
| 911 | return cnt; |
| 912 | } |
| 913 | |
| 914 | int cmd_merge(int argc, const char **argv, const char *prefix) |
| 915 | { |
| 916 | unsigned char result_tree[20]; |
Brandon Casey | f285a2d | 2008-10-09 14:12:12 -0500 | [diff] [blame] | 917 | struct strbuf buf = STRBUF_INIT; |
Miklos Vajna | 1c7b76b | 2008-07-07 19:24:20 +0200 | [diff] [blame] | 918 | const char *head_arg; |
| 919 | int flag, head_invalid = 0, i; |
| 920 | int best_cnt = -1, merge_was_ok = 0, automerge_was_ok = 0; |
| 921 | struct commit_list *common = NULL; |
| 922 | const char *best_strategy = NULL, *wt_strategy = NULL; |
| 923 | struct commit_list **remotes = &remoteheads; |
| 924 | |
Nguyễn Thái Ngọc Duy | da53eec | 2010-10-22 01:49:45 -0500 | [diff] [blame] | 925 | if (argc == 2 && !strcmp(argv[1], "-h")) |
| 926 | usage_with_options(builtin_merge_usage, builtin_merge_options); |
Miklos Vajna | 1c7b76b | 2008-07-07 19:24:20 +0200 | [diff] [blame] | 927 | |
Miklos Vajna | 1c7b76b | 2008-07-07 19:24:20 +0200 | [diff] [blame] | 928 | /* |
| 929 | * Check if we are _not_ on a detached HEAD, i.e. if there is a |
| 930 | * current branch. |
| 931 | */ |
| 932 | branch = resolve_ref("HEAD", head, 0, &flag); |
| 933 | if (branch && !prefixcmp(branch, "refs/heads/")) |
| 934 | branch += 11; |
| 935 | if (is_null_sha1(head)) |
| 936 | head_invalid = 1; |
| 937 | |
| 938 | git_config(git_merge_config, NULL); |
| 939 | |
| 940 | /* for color.ui */ |
| 941 | if (diff_use_color_default == -1) |
| 942 | diff_use_color_default = git_use_color_default; |
| 943 | |
Stephen Boyd | 3778292 | 2009-05-23 11:53:12 -0700 | [diff] [blame] | 944 | argc = parse_options(argc, argv, prefix, builtin_merge_options, |
Miklos Vajna | 1c7b76b | 2008-07-07 19:24:20 +0200 | [diff] [blame] | 945 | builtin_merge_usage, 0); |
Johan Herland | 2a22c1b | 2010-11-09 22:49:58 +0100 | [diff] [blame] | 946 | |
Johan Herland | 35d2fff | 2010-11-09 22:49:59 +0100 | [diff] [blame] | 947 | if (abort_current_merge) { |
| 948 | int nargc = 2; |
| 949 | const char *nargv[] = {"reset", "--merge", NULL}; |
| 950 | |
| 951 | if (!file_exists(git_path("MERGE_HEAD"))) |
| 952 | die("There is no merge to abort (MERGE_HEAD missing)."); |
| 953 | |
| 954 | /* Invoke 'git reset --merge' */ |
| 955 | return cmd_reset(nargc, nargv, prefix); |
| 956 | } |
| 957 | |
Johan Herland | 2a22c1b | 2010-11-09 22:49:58 +0100 | [diff] [blame] | 958 | if (read_cache_unmerged()) |
| 959 | die_resolve_conflict("merge"); |
| 960 | |
| 961 | if (file_exists(git_path("MERGE_HEAD"))) { |
| 962 | /* |
| 963 | * There is no unmerged entry, don't advise 'git |
| 964 | * add/rm <file>', just 'git commit'. |
| 965 | */ |
| 966 | if (advice_resolve_conflict) |
| 967 | die("You have not concluded your merge (MERGE_HEAD exists).\n" |
| 968 | "Please, commit your changes before you can merge."); |
| 969 | else |
| 970 | die("You have not concluded your merge (MERGE_HEAD exists)."); |
| 971 | } |
| 972 | resolve_undo_clear(); |
| 973 | |
Tuncer Ayaz | 7f87aff | 2008-11-15 01:14:24 +0100 | [diff] [blame] | 974 | if (verbosity < 0) |
| 975 | show_diffstat = 0; |
Miklos Vajna | 1c7b76b | 2008-07-07 19:24:20 +0200 | [diff] [blame] | 976 | |
| 977 | if (squash) { |
| 978 | if (!allow_fast_forward) |
| 979 | die("You cannot combine --squash with --no-ff."); |
| 980 | option_commit = 0; |
| 981 | } |
| 982 | |
Björn Gustavsson | 1347483 | 2009-10-29 23:08:31 +0100 | [diff] [blame] | 983 | if (!allow_fast_forward && fast_forward_only) |
| 984 | die("You cannot combine --no-ff with --ff-only."); |
| 985 | |
Miklos Vajna | 1c7b76b | 2008-07-07 19:24:20 +0200 | [diff] [blame] | 986 | if (!argc) |
| 987 | usage_with_options(builtin_merge_usage, |
| 988 | builtin_merge_options); |
| 989 | |
| 990 | /* |
| 991 | * This could be traditional "merge <msg> HEAD <commit>..." and |
| 992 | * the way we can tell it is to see if the second token is HEAD, |
| 993 | * but some people might have misused the interface and used a |
| 994 | * committish that is the same as HEAD there instead. |
| 995 | * Traditional format never would have "-m" so it is an |
| 996 | * additional safety measure to check for it. |
| 997 | */ |
Miklos Vajna | 1c7b76b | 2008-07-07 19:24:20 +0200 | [diff] [blame] | 998 | |
| 999 | if (!have_message && is_old_style_invocation(argc, argv)) { |
| 1000 | strbuf_addstr(&merge_msg, argv[0]); |
| 1001 | head_arg = argv[1]; |
| 1002 | argv += 2; |
| 1003 | argc -= 2; |
| 1004 | } else if (head_invalid) { |
| 1005 | struct object *remote_head; |
| 1006 | /* |
| 1007 | * If the merged head is a valid one there is no reason |
| 1008 | * to forbid "git merge" into a branch yet to be born. |
| 1009 | * We do the same for "git pull". |
| 1010 | */ |
| 1011 | if (argc != 1) |
| 1012 | die("Can merge only exactly one commit into " |
| 1013 | "empty head"); |
Paolo Bonzini | 4be636f | 2008-08-21 14:14:18 +0200 | [diff] [blame] | 1014 | if (squash) |
| 1015 | die("Squash commit into empty head not supported yet"); |
| 1016 | if (!allow_fast_forward) |
| 1017 | die("Non-fast-forward commit does not make sense into " |
| 1018 | "an empty head"); |
Miklos Vajna | 1c7b76b | 2008-07-07 19:24:20 +0200 | [diff] [blame] | 1019 | remote_head = peel_to_type(argv[0], 0, NULL, OBJ_COMMIT); |
| 1020 | if (!remote_head) |
| 1021 | die("%s - not something we can merge", argv[0]); |
| 1022 | update_ref("initial pull", "HEAD", remote_head->sha1, NULL, 0, |
| 1023 | DIE_ON_ERR); |
Clemens Buchacher | 172b642 | 2010-11-14 23:07:49 +0100 | [diff] [blame] | 1024 | read_empty(remote_head->sha1, 0); |
Miklos Vajna | 1c7b76b | 2008-07-07 19:24:20 +0200 | [diff] [blame] | 1025 | return 0; |
| 1026 | } else { |
Tay Ray Chuan | 97d45bc | 2010-05-11 01:17:48 +0800 | [diff] [blame] | 1027 | struct strbuf merge_names = STRBUF_INIT; |
Miklos Vajna | 1c7b76b | 2008-07-07 19:24:20 +0200 | [diff] [blame] | 1028 | |
| 1029 | /* We are invoked directly as the first-class UI. */ |
| 1030 | head_arg = "HEAD"; |
| 1031 | |
| 1032 | /* |
| 1033 | * All the rest are the commits being merged; |
| 1034 | * prepare the standard merge summary message to |
| 1035 | * be appended to the given message. If remote |
| 1036 | * is invalid we will die later in the common |
| 1037 | * codepath so we discard the error in this |
| 1038 | * loop. |
| 1039 | */ |
Tay Ray Chuan | f0ecac2 | 2010-05-11 01:17:52 +0800 | [diff] [blame] | 1040 | for (i = 0; i < argc; i++) |
| 1041 | merge_name(argv[i], &merge_names); |
| 1042 | |
Ramkumar Ramachandra | 96e9420 | 2010-09-08 23:29:54 +0530 | [diff] [blame] | 1043 | if (!have_message || shortlog_len) { |
Ramkumar Ramachandra | 1876166 | 2010-09-08 23:29:53 +0530 | [diff] [blame] | 1044 | fmt_merge_msg(&merge_names, &merge_msg, !have_message, |
Ramkumar Ramachandra | 96e9420 | 2010-09-08 23:29:54 +0530 | [diff] [blame] | 1045 | shortlog_len); |
Ramkumar Ramachandra | 1876166 | 2010-09-08 23:29:53 +0530 | [diff] [blame] | 1046 | if (merge_msg.len) |
| 1047 | strbuf_setlen(&merge_msg, merge_msg.len - 1); |
| 1048 | } |
Miklos Vajna | 1c7b76b | 2008-07-07 19:24:20 +0200 | [diff] [blame] | 1049 | } |
| 1050 | |
| 1051 | if (head_invalid || !argc) |
| 1052 | usage_with_options(builtin_merge_usage, |
| 1053 | builtin_merge_options); |
| 1054 | |
| 1055 | strbuf_addstr(&buf, "merge"); |
| 1056 | for (i = 0; i < argc; i++) |
| 1057 | strbuf_addf(&buf, " %s", argv[i]); |
| 1058 | setenv("GIT_REFLOG_ACTION", buf.buf, 0); |
| 1059 | strbuf_reset(&buf); |
| 1060 | |
| 1061 | for (i = 0; i < argc; i++) { |
| 1062 | struct object *o; |
Miklos Vajna | 18668f5 | 2008-08-28 15:43:00 +0200 | [diff] [blame] | 1063 | struct commit *commit; |
Miklos Vajna | 1c7b76b | 2008-07-07 19:24:20 +0200 | [diff] [blame] | 1064 | |
| 1065 | o = peel_to_type(argv[i], 0, NULL, OBJ_COMMIT); |
| 1066 | if (!o) |
| 1067 | die("%s - not something we can merge", argv[i]); |
Miklos Vajna | 18668f5 | 2008-08-28 15:43:00 +0200 | [diff] [blame] | 1068 | commit = lookup_commit(o->sha1); |
| 1069 | commit->util = (void *)argv[i]; |
| 1070 | remotes = &commit_list_insert(commit, remotes)->next; |
Miklos Vajna | 1c7b76b | 2008-07-07 19:24:20 +0200 | [diff] [blame] | 1071 | |
| 1072 | strbuf_addf(&buf, "GITHEAD_%s", sha1_to_hex(o->sha1)); |
| 1073 | setenv(buf.buf, argv[i], 1); |
| 1074 | strbuf_reset(&buf); |
| 1075 | } |
| 1076 | |
| 1077 | if (!use_strategies) { |
| 1078 | if (!remoteheads->next) |
| 1079 | add_strategies(pull_twohead, DEFAULT_TWOHEAD); |
| 1080 | else |
| 1081 | add_strategies(pull_octopus, DEFAULT_OCTOPUS); |
| 1082 | } |
| 1083 | |
| 1084 | for (i = 0; i < use_strategies_nr; i++) { |
| 1085 | if (use_strategies[i]->attr & NO_FAST_FORWARD) |
| 1086 | allow_fast_forward = 0; |
| 1087 | if (use_strategies[i]->attr & NO_TRIVIAL) |
| 1088 | allow_trivial = 0; |
| 1089 | } |
| 1090 | |
| 1091 | if (!remoteheads->next) |
| 1092 | common = get_merge_bases(lookup_commit(head), |
| 1093 | remoteheads->item, 1); |
| 1094 | else { |
| 1095 | struct commit_list *list = remoteheads; |
| 1096 | commit_list_insert(lookup_commit(head), &list); |
| 1097 | common = get_octopus_merge_bases(list); |
| 1098 | free(list); |
| 1099 | } |
| 1100 | |
| 1101 | update_ref("updating ORIG_HEAD", "ORIG_HEAD", head, NULL, 0, |
| 1102 | DIE_ON_ERR); |
| 1103 | |
| 1104 | if (!common) |
| 1105 | ; /* No common ancestors found. We need a real merge. */ |
| 1106 | else if (!remoteheads->next && !common->next && |
| 1107 | common->item == remoteheads->item) { |
| 1108 | /* |
| 1109 | * If head can reach all the merge then we are up to date. |
| 1110 | * but first the most common case of merging one remote. |
| 1111 | */ |
| 1112 | finish_up_to_date("Already up-to-date."); |
| 1113 | return 0; |
| 1114 | } else if (allow_fast_forward && !remoteheads->next && |
| 1115 | !common->next && |
| 1116 | !hashcmp(common->item->object.sha1, head)) { |
| 1117 | /* Again the most common case of merging one remote. */ |
Brandon Casey | f285a2d | 2008-10-09 14:12:12 -0500 | [diff] [blame] | 1118 | struct strbuf msg = STRBUF_INIT; |
Miklos Vajna | 1c7b76b | 2008-07-07 19:24:20 +0200 | [diff] [blame] | 1119 | struct object *o; |
| 1120 | char hex[41]; |
| 1121 | |
| 1122 | strcpy(hex, find_unique_abbrev(head, DEFAULT_ABBREV)); |
| 1123 | |
Tuncer Ayaz | 7f87aff | 2008-11-15 01:14:24 +0100 | [diff] [blame] | 1124 | if (verbosity >= 0) |
| 1125 | printf("Updating %s..%s\n", |
| 1126 | hex, |
| 1127 | find_unique_abbrev(remoteheads->item->object.sha1, |
| 1128 | DEFAULT_ABBREV)); |
Felipe Contreras | a75d7b5 | 2009-10-24 11:31:32 +0300 | [diff] [blame] | 1129 | strbuf_addstr(&msg, "Fast-forward"); |
Miklos Vajna | 1c7b76b | 2008-07-07 19:24:20 +0200 | [diff] [blame] | 1130 | if (have_message) |
| 1131 | strbuf_addstr(&msg, |
| 1132 | " (no commit created; -m option ignored)"); |
| 1133 | o = peel_to_type(sha1_to_hex(remoteheads->item->object.sha1), |
| 1134 | 0, NULL, OBJ_COMMIT); |
| 1135 | if (!o) |
| 1136 | return 1; |
| 1137 | |
| 1138 | if (checkout_fast_forward(head, remoteheads->item->object.sha1)) |
| 1139 | return 1; |
| 1140 | |
| 1141 | finish(o->sha1, msg.buf); |
| 1142 | drop_save(); |
| 1143 | return 0; |
| 1144 | } else if (!remoteheads->next && common->next) |
| 1145 | ; |
| 1146 | /* |
Felipe Contreras | a75d7b5 | 2009-10-24 11:31:32 +0300 | [diff] [blame] | 1147 | * We are not doing octopus and not fast-forward. Need |
Miklos Vajna | 1c7b76b | 2008-07-07 19:24:20 +0200 | [diff] [blame] | 1148 | * a real merge. |
| 1149 | */ |
| 1150 | else if (!remoteheads->next && !common->next && option_commit) { |
| 1151 | /* |
Felipe Contreras | a75d7b5 | 2009-10-24 11:31:32 +0300 | [diff] [blame] | 1152 | * We are not doing octopus, not fast-forward, and have |
Miklos Vajna | 1c7b76b | 2008-07-07 19:24:20 +0200 | [diff] [blame] | 1153 | * only one common. |
| 1154 | */ |
| 1155 | refresh_cache(REFRESH_QUIET); |
Björn Gustavsson | 1347483 | 2009-10-29 23:08:31 +0100 | [diff] [blame] | 1156 | if (allow_trivial && !fast_forward_only) { |
Miklos Vajna | 1c7b76b | 2008-07-07 19:24:20 +0200 | [diff] [blame] | 1157 | /* See if it is really trivial. */ |
| 1158 | git_committer_info(IDENT_ERROR_ON_NO_NAME); |
| 1159 | printf("Trying really trivial in-index merge...\n"); |
| 1160 | if (!read_tree_trivial(common->item->object.sha1, |
| 1161 | head, remoteheads->item->object.sha1)) |
| 1162 | return merge_trivial(); |
| 1163 | printf("Nope.\n"); |
| 1164 | } |
| 1165 | } else { |
| 1166 | /* |
| 1167 | * An octopus. If we can reach all the remote we are up |
| 1168 | * to date. |
| 1169 | */ |
| 1170 | int up_to_date = 1; |
| 1171 | struct commit_list *j; |
| 1172 | |
| 1173 | for (j = remoteheads; j; j = j->next) { |
| 1174 | struct commit_list *common_one; |
| 1175 | |
| 1176 | /* |
| 1177 | * Here we *have* to calculate the individual |
| 1178 | * merge_bases again, otherwise "git merge HEAD^ |
| 1179 | * HEAD^^" would be missed. |
| 1180 | */ |
| 1181 | common_one = get_merge_bases(lookup_commit(head), |
| 1182 | j->item, 1); |
| 1183 | if (hashcmp(common_one->item->object.sha1, |
| 1184 | j->item->object.sha1)) { |
| 1185 | up_to_date = 0; |
| 1186 | break; |
| 1187 | } |
| 1188 | } |
| 1189 | if (up_to_date) { |
| 1190 | finish_up_to_date("Already up-to-date. Yeeah!"); |
| 1191 | return 0; |
| 1192 | } |
| 1193 | } |
| 1194 | |
Björn Gustavsson | 1347483 | 2009-10-29 23:08:31 +0100 | [diff] [blame] | 1195 | if (fast_forward_only) |
Junio C Hamano | 4d8c325 | 2009-11-15 16:41:02 -0800 | [diff] [blame] | 1196 | die("Not possible to fast-forward, aborting."); |
Björn Gustavsson | 1347483 | 2009-10-29 23:08:31 +0100 | [diff] [blame] | 1197 | |
Miklos Vajna | 1c7b76b | 2008-07-07 19:24:20 +0200 | [diff] [blame] | 1198 | /* We are going to make a new commit. */ |
| 1199 | git_committer_info(IDENT_ERROR_ON_NO_NAME); |
| 1200 | |
| 1201 | /* |
| 1202 | * At this point, we need a real merge. No matter what strategy |
| 1203 | * we use, it would operate on the index, possibly affecting the |
| 1204 | * working tree, and when resolved cleanly, have the desired |
| 1205 | * tree in the index -- this means that the index must be in |
| 1206 | * sync with the head commit. The strategies are responsible |
| 1207 | * to ensure this. |
| 1208 | */ |
| 1209 | if (use_strategies_nr != 1) { |
| 1210 | /* |
| 1211 | * Stash away the local changes so that we can try more |
| 1212 | * than one. |
| 1213 | */ |
| 1214 | save_state(); |
| 1215 | } else { |
| 1216 | memcpy(stash, null_sha1, 20); |
| 1217 | } |
| 1218 | |
| 1219 | for (i = 0; i < use_strategies_nr; i++) { |
| 1220 | int ret; |
| 1221 | if (i) { |
| 1222 | printf("Rewinding the tree to pristine...\n"); |
| 1223 | restore_state(); |
| 1224 | } |
| 1225 | if (use_strategies_nr != 1) |
| 1226 | printf("Trying merge strategy %s...\n", |
| 1227 | use_strategies[i]->name); |
| 1228 | /* |
| 1229 | * Remember which strategy left the state in the working |
| 1230 | * tree. |
| 1231 | */ |
| 1232 | wt_strategy = use_strategies[i]->name; |
| 1233 | |
| 1234 | ret = try_merge_strategy(use_strategies[i]->name, |
| 1235 | common, head_arg); |
| 1236 | if (!option_commit && !ret) { |
| 1237 | merge_was_ok = 1; |
| 1238 | /* |
| 1239 | * This is necessary here just to avoid writing |
| 1240 | * the tree, but later we will *not* exit with |
| 1241 | * status code 1 because merge_was_ok is set. |
| 1242 | */ |
| 1243 | ret = 1; |
| 1244 | } |
| 1245 | |
| 1246 | if (ret) { |
| 1247 | /* |
| 1248 | * The backend exits with 1 when conflicts are |
| 1249 | * left to be resolved, with 2 when it does not |
| 1250 | * handle the given merge at all. |
| 1251 | */ |
| 1252 | if (ret == 1) { |
| 1253 | int cnt = evaluate_result(); |
| 1254 | |
| 1255 | if (best_cnt <= 0 || cnt <= best_cnt) { |
| 1256 | best_strategy = use_strategies[i]->name; |
| 1257 | best_cnt = cnt; |
| 1258 | } |
| 1259 | } |
| 1260 | if (merge_was_ok) |
| 1261 | break; |
| 1262 | else |
| 1263 | continue; |
| 1264 | } |
| 1265 | |
| 1266 | /* Automerge succeeded. */ |
Miklos Vajna | 1c7b76b | 2008-07-07 19:24:20 +0200 | [diff] [blame] | 1267 | write_tree_trivial(result_tree); |
| 1268 | automerge_was_ok = 1; |
| 1269 | break; |
| 1270 | } |
| 1271 | |
| 1272 | /* |
| 1273 | * If we have a resulting tree, that means the strategy module |
| 1274 | * auto resolved the merge cleanly. |
| 1275 | */ |
| 1276 | if (automerge_was_ok) |
| 1277 | return finish_automerge(common, result_tree, wt_strategy); |
| 1278 | |
| 1279 | /* |
| 1280 | * Pick the result from the best strategy and have the user fix |
| 1281 | * it up. |
| 1282 | */ |
| 1283 | if (!best_strategy) { |
| 1284 | restore_state(); |
| 1285 | if (use_strategies_nr > 1) |
| 1286 | fprintf(stderr, |
| 1287 | "No merge strategy handled the merge.\n"); |
| 1288 | else |
| 1289 | fprintf(stderr, "Merge with strategy %s failed.\n", |
| 1290 | use_strategies[0]->name); |
| 1291 | return 2; |
| 1292 | } else if (best_strategy == wt_strategy) |
| 1293 | ; /* We already have its result in the working tree. */ |
| 1294 | else { |
| 1295 | printf("Rewinding the tree to pristine...\n"); |
| 1296 | restore_state(); |
| 1297 | printf("Using the %s to prepare resolving by hand.\n", |
| 1298 | best_strategy); |
| 1299 | try_merge_strategy(best_strategy, common, head_arg); |
| 1300 | } |
| 1301 | |
| 1302 | if (squash) |
| 1303 | finish(NULL, NULL); |
| 1304 | else { |
| 1305 | int fd; |
| 1306 | struct commit_list *j; |
| 1307 | |
| 1308 | for (j = remoteheads; j; j = j->next) |
| 1309 | strbuf_addf(&buf, "%s\n", |
| 1310 | sha1_to_hex(j->item->object.sha1)); |
| 1311 | fd = open(git_path("MERGE_HEAD"), O_WRONLY | O_CREAT, 0666); |
| 1312 | if (fd < 0) |
Thomas Rast | 0721c31 | 2009-06-27 17:58:47 +0200 | [diff] [blame] | 1313 | die_errno("Could not open '%s' for writing", |
| 1314 | git_path("MERGE_HEAD")); |
Miklos Vajna | 1c7b76b | 2008-07-07 19:24:20 +0200 | [diff] [blame] | 1315 | if (write_in_full(fd, buf.buf, buf.len) != buf.len) |
Thomas Rast | 0721c31 | 2009-06-27 17:58:47 +0200 | [diff] [blame] | 1316 | die_errno("Could not write to '%s'", git_path("MERGE_HEAD")); |
Miklos Vajna | 1c7b76b | 2008-07-07 19:24:20 +0200 | [diff] [blame] | 1317 | close(fd); |
| 1318 | strbuf_addch(&merge_msg, '\n'); |
| 1319 | fd = open(git_path("MERGE_MSG"), O_WRONLY | O_CREAT, 0666); |
| 1320 | if (fd < 0) |
Thomas Rast | 0721c31 | 2009-06-27 17:58:47 +0200 | [diff] [blame] | 1321 | die_errno("Could not open '%s' for writing", |
| 1322 | git_path("MERGE_MSG")); |
Miklos Vajna | 1c7b76b | 2008-07-07 19:24:20 +0200 | [diff] [blame] | 1323 | if (write_in_full(fd, merge_msg.buf, merge_msg.len) != |
| 1324 | merge_msg.len) |
Thomas Rast | 0721c31 | 2009-06-27 17:58:47 +0200 | [diff] [blame] | 1325 | die_errno("Could not write to '%s'", git_path("MERGE_MSG")); |
Miklos Vajna | 1c7b76b | 2008-07-07 19:24:20 +0200 | [diff] [blame] | 1326 | close(fd); |
Miklos Vajna | cf10f9f | 2008-10-03 14:04:47 +0200 | [diff] [blame] | 1327 | fd = open(git_path("MERGE_MODE"), O_WRONLY | O_CREAT | O_TRUNC, 0666); |
| 1328 | if (fd < 0) |
Thomas Rast | 0721c31 | 2009-06-27 17:58:47 +0200 | [diff] [blame] | 1329 | die_errno("Could not open '%s' for writing", |
| 1330 | git_path("MERGE_MODE")); |
Miklos Vajna | cf10f9f | 2008-10-03 14:04:47 +0200 | [diff] [blame] | 1331 | strbuf_reset(&buf); |
| 1332 | if (!allow_fast_forward) |
| 1333 | strbuf_addf(&buf, "no-ff"); |
| 1334 | if (write_in_full(fd, buf.buf, buf.len) != buf.len) |
Thomas Rast | 0721c31 | 2009-06-27 17:58:47 +0200 | [diff] [blame] | 1335 | die_errno("Could not write to '%s'", git_path("MERGE_MODE")); |
Miklos Vajna | cf10f9f | 2008-10-03 14:04:47 +0200 | [diff] [blame] | 1336 | close(fd); |
Miklos Vajna | 1c7b76b | 2008-07-07 19:24:20 +0200 | [diff] [blame] | 1337 | } |
| 1338 | |
| 1339 | if (merge_was_ok) { |
| 1340 | fprintf(stderr, "Automatic merge went well; " |
| 1341 | "stopped before committing as requested\n"); |
| 1342 | return 0; |
| 1343 | } else |
Jonathan Nieder | 7610fa5 | 2010-08-05 06:32:41 -0500 | [diff] [blame] | 1344 | return suggest_conflicts(option_renormalize); |
Miklos Vajna | 1c7b76b | 2008-07-07 19:24:20 +0200 | [diff] [blame] | 1345 | } |