4 * Copyright (c) 2008 Miklos Vajna <vmiklos@frugalware.org>
6 * Based on git-merge.sh by Junio C Hamano.
10 #include "parse-options.h"
12 #include "run-command.h"
18 #include "unpack-trees.h"
19 #include "cache-tree.h"
26 #include "merge-recursive.h"
27 #include "resolve-undo.h"
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)
39 static const char * const builtin_merge_usage
[] = {
40 "git merge [options] <remote>...",
41 "git merge [options] <msg> HEAD <remote>",
45 static int show_diffstat
= 1, shortlog_len
, squash
;
46 static int option_commit
= 1, allow_fast_forward
= 1;
47 static int fast_forward_only
;
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
;
54 static const char **xopts
;
55 static size_t xopts_nr
, xopts_alloc
;
56 static const char *branch
;
57 static int option_renormalize
;
59 static int allow_rerere_auto
;
60 static int abort_current_merge
;
62 static struct strategy all_strategy
[] = {
63 { "recursive", DEFAULT_TWOHEAD
| NO_TRIVIAL
},
64 { "octopus", DEFAULT_OCTOPUS
},
66 { "ours", NO_FAST_FORWARD
| NO_TRIVIAL
},
67 { "subtree", NO_FAST_FORWARD
| NO_TRIVIAL
},
70 static const char *pull_twohead
, *pull_octopus
;
72 static int option_parse_message(const struct option
*opt
,
73 const char *arg
, int unset
)
75 struct strbuf
*buf
= opt
->value
;
78 strbuf_setlen(buf
, 0);
80 strbuf_addf(buf
, "%s%s", buf
->len
? "\n\n" : "", arg
);
83 return error("switch `m' requires a value");
87 static struct strategy
*get_strategy(const char *name
)
91 static struct cmdnames main_cmds
, other_cmds
;
97 for (i
= 0; i
< ARRAY_SIZE(all_strategy
); i
++)
98 if (!strcmp(name
, all_strategy
[i
].name
))
99 return &all_strategy
[i
];
102 struct cmdnames not_strategies
;
105 memset(¬_strategies
, 0, sizeof(struct cmdnames
));
106 load_command_list("git-merge-", &main_cmds
, &other_cmds
);
107 for (i
= 0; i
< main_cmds
.cnt
; i
++) {
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
])
115 add_cmdname(¬_strategies
, ent
->name
, ent
->len
);
117 exclude_cmds(&main_cmds
, ¬_strategies
);
119 if (!is_in_cmdlist(&main_cmds
, name
) && !is_in_cmdlist(&other_cmds
, name
)) {
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");
134 ret
= xcalloc(1, sizeof(struct strategy
));
135 ret
->name
= xstrdup(name
);
136 ret
->attr
= NO_TRIVIAL
;
140 static void append_strategy(struct strategy
*s
)
142 ALLOC_GROW(use_strategies
, use_strategies_nr
+ 1, use_strategies_alloc
);
143 use_strategies
[use_strategies_nr
++] = s
;
146 static int option_parse_strategy(const struct option
*opt
,
147 const char *name
, int unset
)
152 append_strategy(get_strategy(name
));
156 static int option_parse_x(const struct option
*opt
,
157 const char *arg
, int unset
)
162 ALLOC_GROW(xopts
, xopts_nr
+ 1, xopts_alloc
);
163 xopts
[xopts_nr
++] = xstrdup(arg
);
167 static int option_parse_n(const struct option
*opt
,
168 const char *arg
, int unset
)
170 show_diffstat
= unset
;
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)"),
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
},
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
,
189 "allow fast-forward (default)"),
190 OPT_BOOLEAN(0, "ff-only", &fast_forward_only
,
191 "abort if fast-forward is not possible"),
192 OPT_RERERE_AUTOUPDATE(&allow_rerere_auto
),
193 OPT_CALLBACK('s', "strategy", &use_strategies
, "strategy",
194 "merge strategy to use", option_parse_strategy
),
195 OPT_CALLBACK('X', "strategy-option", &xopts
, "option=value",
196 "option for selected merge strategy", option_parse_x
),
197 OPT_CALLBACK('m', "message", &merge_msg
, "message",
198 "message to be used for the merge commit (if any)",
199 option_parse_message
),
200 OPT__VERBOSITY(&verbosity
),
201 OPT_BOOLEAN(0, "abort", &abort_current_merge
,
202 "abort the current in-progress merge"),
206 /* Cleans up metadata that is uninteresting after a succeeded merge. */
207 static void drop_save(void)
209 unlink(git_path("MERGE_HEAD"));
210 unlink(git_path("MERGE_MSG"));
211 unlink(git_path("MERGE_MODE"));
214 static void save_state(void)
217 struct child_process cp
;
218 struct strbuf buffer
= STRBUF_INIT
;
219 const char *argv
[] = {"stash", "create", NULL
};
221 memset(&cp
, 0, sizeof(cp
));
226 if (start_command(&cp
))
227 die("could not run stash.");
228 len
= strbuf_read(&buffer
, cp
.out
, 1024);
231 if (finish_command(&cp
) || len
< 0)
235 strbuf_setlen(&buffer
, buffer
.len
-1);
236 if (get_sha1(buffer
.buf
, stash
))
237 die("not a valid object: %s", buffer
.buf
);
240 static void read_empty(unsigned const char *sha1
, int verbose
)
245 args
[i
++] = "read-tree";
250 args
[i
++] = EMPTY_TREE_SHA1_HEX
;
251 args
[i
++] = sha1_to_hex(sha1
);
254 if (run_command_v_opt(args
, RUN_GIT_CMD
))
255 die("read-tree failed");
258 static void reset_hard(unsigned const char *sha1
, int verbose
)
263 args
[i
++] = "read-tree";
266 args
[i
++] = "--reset";
268 args
[i
++] = sha1_to_hex(sha1
);
271 if (run_command_v_opt(args
, RUN_GIT_CMD
))
272 die("read-tree failed");
275 static void restore_state(void)
277 struct strbuf sb
= STRBUF_INIT
;
278 const char *args
[] = { "stash", "apply", NULL
, NULL
};
280 if (is_null_sha1(stash
))
285 args
[2] = sha1_to_hex(stash
);
288 * It is OK to ignore error here, for example when there was
289 * nothing to restore.
291 run_command_v_opt(args
, RUN_GIT_CMD
);
294 refresh_cache(REFRESH_QUIET
);
297 /* This is called when no merge was necessary. */
298 static void finish_up_to_date(const char *msg
)
301 printf("%s%s\n", squash
? " (nothing to squash)" : "", msg
);
305 static void squash_message(void)
308 struct commit
*commit
;
309 struct strbuf out
= STRBUF_INIT
;
310 struct commit_list
*j
;
312 struct pretty_print_context ctx
= {0};
314 printf("Squash commit -- not updating HEAD\n");
315 fd
= open(git_path("SQUASH_MSG"), O_WRONLY
| O_CREAT
, 0666);
317 die_errno("Could not write to '%s'", git_path("SQUASH_MSG"));
319 init_revisions(&rev
, NULL
);
320 rev
.ignore_merges
= 1;
321 rev
.commit_format
= CMIT_FMT_MEDIUM
;
323 commit
= lookup_commit(head
);
324 commit
->object
.flags
|= UNINTERESTING
;
325 add_pending_object(&rev
, &commit
->object
, NULL
);
327 for (j
= remoteheads
; j
; j
= j
->next
)
328 add_pending_object(&rev
, &j
->item
->object
, NULL
);
330 setup_revisions(0, NULL
, &rev
, NULL
);
331 if (prepare_revision_walk(&rev
))
332 die("revision walk setup failed");
334 ctx
.abbrev
= rev
.abbrev
;
335 ctx
.date_mode
= rev
.date_mode
;
336 ctx
.fmt
= rev
.commit_format
;
338 strbuf_addstr(&out
, "Squashed commit of the following:\n");
339 while ((commit
= get_revision(&rev
)) != NULL
) {
340 strbuf_addch(&out
, '\n');
341 strbuf_addf(&out
, "commit %s\n",
342 sha1_to_hex(commit
->object
.sha1
));
343 pretty_print_commit(&ctx
, commit
, &out
);
345 if (write(fd
, out
.buf
, out
.len
) < 0)
346 die_errno("Writing SQUASH_MSG");
348 die_errno("Finishing SQUASH_MSG");
349 strbuf_release(&out
);
352 static void finish(const unsigned char *new_head
, const char *msg
)
354 struct strbuf reflog_message
= STRBUF_INIT
;
357 strbuf_addstr(&reflog_message
, getenv("GIT_REFLOG_ACTION"));
361 strbuf_addf(&reflog_message
, "%s: %s",
362 getenv("GIT_REFLOG_ACTION"), msg
);
367 if (verbosity
>= 0 && !merge_msg
.len
)
368 printf("No merge message -- not updating HEAD\n");
370 const char *argv_gc_auto
[] = { "gc", "--auto", NULL
};
371 update_ref(reflog_message
.buf
, "HEAD",
375 * We ignore errors in 'gc --auto', since the
376 * user should see them.
378 run_command_v_opt(argv_gc_auto
, RUN_GIT_CMD
);
381 if (new_head
&& show_diffstat
) {
382 struct diff_options opts
;
384 opts
.output_format
|=
385 DIFF_FORMAT_SUMMARY
| DIFF_FORMAT_DIFFSTAT
;
386 opts
.detect_rename
= DIFF_DETECT_RENAME
;
387 if (diff_use_color_default
> 0)
388 DIFF_OPT_SET(&opts
, COLOR_DIFF
);
389 if (diff_setup_done(&opts
) < 0)
390 die("diff_setup_done failed");
391 diff_tree_sha1(head
, new_head
, "", &opts
);
396 /* Run a post-merge hook */
397 run_hook(NULL
, "post-merge", squash
? "1" : "0", NULL
);
399 strbuf_release(&reflog_message
);
402 /* Get the name for the merge commit's message. */
403 static void merge_name(const char *remote
, struct strbuf
*msg
)
405 struct object
*remote_head
;
406 unsigned char branch_head
[20], buf_sha
[20];
407 struct strbuf buf
= STRBUF_INIT
;
408 struct strbuf bname
= STRBUF_INIT
;
413 strbuf_branchname(&bname
, remote
);
416 memset(branch_head
, 0, sizeof(branch_head
));
417 remote_head
= peel_to_type(remote
, 0, NULL
, OBJ_COMMIT
);
419 die("'%s' does not point to a commit", remote
);
421 if (dwim_ref(remote
, strlen(remote
), branch_head
, &found_ref
) > 0) {
422 if (!prefixcmp(found_ref
, "refs/heads/")) {
423 strbuf_addf(msg
, "%s\t\tbranch '%s' of .\n",
424 sha1_to_hex(branch_head
), remote
);
427 if (!prefixcmp(found_ref
, "refs/remotes/")) {
428 strbuf_addf(msg
, "%s\t\tremote-tracking branch '%s' of .\n",
429 sha1_to_hex(branch_head
), remote
);
434 /* See if remote matches <name>^^^.. or <name>~<number> */
435 for (len
= 0, ptr
= remote
+ strlen(remote
);
436 remote
< ptr
&& ptr
[-1] == '^';
443 ptr
= strrchr(remote
, '~');
445 int seen_nonzero
= 0;
448 while (*++ptr
&& isdigit(*ptr
)) {
449 seen_nonzero
|= (*ptr
!= '0');
453 len
= 0; /* not ...~<number> */
454 else if (seen_nonzero
)
457 early
= 1; /* "name~" is "name~1"! */
461 struct strbuf truname
= STRBUF_INIT
;
462 strbuf_addstr(&truname
, "refs/heads/");
463 strbuf_addstr(&truname
, remote
);
464 strbuf_setlen(&truname
, truname
.len
- len
);
465 if (resolve_ref(truname
.buf
, buf_sha
, 1, NULL
)) {
467 "%s\t\tbranch '%s'%s of .\n",
468 sha1_to_hex(remote_head
->sha1
),
470 (early
? " (early part)" : ""));
471 strbuf_release(&truname
);
476 if (!strcmp(remote
, "FETCH_HEAD") &&
477 !access(git_path("FETCH_HEAD"), R_OK
)) {
479 struct strbuf line
= STRBUF_INIT
;
482 fp
= fopen(git_path("FETCH_HEAD"), "r");
484 die_errno("could not open '%s' for reading",
485 git_path("FETCH_HEAD"));
486 strbuf_getline(&line
, fp
, '\n');
488 ptr
= strstr(line
.buf
, "\tnot-for-merge\t");
490 strbuf_remove(&line
, ptr
-line
.buf
+1, 13);
491 strbuf_addbuf(msg
, &line
);
492 strbuf_release(&line
);
495 strbuf_addf(msg
, "%s\t\tcommit '%s'\n",
496 sha1_to_hex(remote_head
->sha1
), remote
);
498 strbuf_release(&buf
);
499 strbuf_release(&bname
);
502 static int git_merge_config(const char *k
, const char *v
, void *cb
)
504 if (branch
&& !prefixcmp(k
, "branch.") &&
505 !prefixcmp(k
+ 7, branch
) &&
506 !strcmp(k
+ 7 + strlen(branch
), ".mergeoptions")) {
512 argc
= split_cmdline(buf
, &argv
);
514 die("Bad branch.%s.mergeoptions string: %s", branch
,
515 split_cmdline_strerror(argc
));
516 argv
= xrealloc(argv
, sizeof(*argv
) * (argc
+ 2));
517 memmove(argv
+ 1, argv
, sizeof(*argv
) * (argc
+ 1));
519 parse_options(argc
, argv
, NULL
, builtin_merge_options
,
520 builtin_merge_usage
, 0);
524 if (!strcmp(k
, "merge.diffstat") || !strcmp(k
, "merge.stat"))
525 show_diffstat
= git_config_bool(k
, v
);
526 else if (!strcmp(k
, "pull.twohead"))
527 return git_config_string(&pull_twohead
, k
, v
);
528 else if (!strcmp(k
, "pull.octopus"))
529 return git_config_string(&pull_octopus
, k
, v
);
530 else if (!strcmp(k
, "merge.renormalize"))
531 option_renormalize
= git_config_bool(k
, v
);
532 else if (!strcmp(k
, "merge.log") || !strcmp(k
, "merge.summary")) {
534 shortlog_len
= git_config_bool_or_int(k
, v
, &is_bool
);
535 if (!is_bool
&& shortlog_len
< 0)
536 return error("%s: negative length %s", k
, v
);
537 if (is_bool
&& shortlog_len
)
538 shortlog_len
= DEFAULT_MERGE_LOG_LEN
;
541 return git_diff_ui_config(k
, v
, cb
);
544 static int read_tree_trivial(unsigned char *common
, unsigned char *head
,
548 struct tree
*trees
[MAX_UNPACK_TREES
];
549 struct tree_desc t
[MAX_UNPACK_TREES
];
550 struct unpack_trees_options opts
;
552 memset(&opts
, 0, sizeof(opts
));
554 opts
.src_index
= &the_index
;
555 opts
.dst_index
= &the_index
;
557 opts
.verbose_update
= 1;
558 opts
.trivial_merges_only
= 1;
560 trees
[nr_trees
] = parse_tree_indirect(common
);
561 if (!trees
[nr_trees
++])
563 trees
[nr_trees
] = parse_tree_indirect(head
);
564 if (!trees
[nr_trees
++])
566 trees
[nr_trees
] = parse_tree_indirect(one
);
567 if (!trees
[nr_trees
++])
569 opts
.fn
= threeway_merge
;
570 cache_tree_free(&active_cache_tree
);
571 for (i
= 0; i
< nr_trees
; i
++) {
572 parse_tree(trees
[i
]);
573 init_tree_desc(t
+i
, trees
[i
]->buffer
, trees
[i
]->size
);
575 if (unpack_trees(nr_trees
, t
, &opts
))
580 static void write_tree_trivial(unsigned char *sha1
)
582 if (write_cache_as_tree(sha1
, 0, NULL
))
583 die("git write-tree failed to write a tree");
586 int try_merge_command(const char *strategy
, struct commit_list
*common
,
587 const char *head_arg
, struct commit_list
*remotes
)
590 int i
= 0, x
= 0, ret
;
591 struct commit_list
*j
;
592 struct strbuf buf
= STRBUF_INIT
;
594 args
= xmalloc((4 + xopts_nr
+ commit_list_count(common
) +
595 commit_list_count(remotes
)) * sizeof(char *));
596 strbuf_addf(&buf
, "merge-%s", strategy
);
598 for (x
= 0; x
< xopts_nr
; x
++) {
599 char *s
= xmalloc(strlen(xopts
[x
])+2+1);
601 strcpy(s
+2, xopts
[x
]);
604 for (j
= common
; j
; j
= j
->next
)
605 args
[i
++] = xstrdup(sha1_to_hex(j
->item
->object
.sha1
));
607 args
[i
++] = head_arg
;
608 for (j
= remotes
; j
; j
= j
->next
)
609 args
[i
++] = xstrdup(sha1_to_hex(j
->item
->object
.sha1
));
611 ret
= run_command_v_opt(args
, RUN_GIT_CMD
);
612 strbuf_release(&buf
);
614 for (x
= 0; x
< xopts_nr
; x
++)
615 free((void *)args
[i
++]);
616 for (j
= common
; j
; j
= j
->next
)
617 free((void *)args
[i
++]);
619 for (j
= remotes
; j
; j
= j
->next
)
620 free((void *)args
[i
++]);
623 if (read_cache() < 0)
624 die("failed to read the cache");
625 resolve_undo_clear();
630 static int try_merge_strategy(const char *strategy
, struct commit_list
*common
,
631 const char *head_arg
)
634 struct lock_file
*lock
= xcalloc(1, sizeof(struct lock_file
));
636 index_fd
= hold_locked_index(lock
, 1);
637 refresh_cache(REFRESH_QUIET
);
638 if (active_cache_changed
&&
639 (write_cache(index_fd
, active_cache
, active_nr
) ||
640 commit_locked_index(lock
)))
641 return error("Unable to write index.");
642 rollback_lock_file(lock
);
644 if (!strcmp(strategy
, "recursive") || !strcmp(strategy
, "subtree")) {
646 struct commit
*result
;
647 struct lock_file
*lock
= xcalloc(1, sizeof(struct lock_file
));
649 struct commit_list
*reversed
= NULL
;
650 struct merge_options o
;
651 struct commit_list
*j
;
653 if (remoteheads
->next
) {
654 error("Not handling anything other than two heads merge.");
658 init_merge_options(&o
);
659 if (!strcmp(strategy
, "subtree"))
660 o
.subtree_shift
= "";
662 o
.renormalize
= option_renormalize
;
664 for (x
= 0; x
< xopts_nr
; x
++)
665 if (parse_merge_opt(&o
, xopts
[x
]))
666 die("Unknown option for merge-recursive: -X%s", xopts
[x
]);
668 o
.branch1
= head_arg
;
669 o
.branch2
= remoteheads
->item
->util
;
671 for (j
= common
; j
; j
= j
->next
)
672 commit_list_insert(j
->item
, &reversed
);
674 index_fd
= hold_locked_index(lock
, 1);
675 clean
= merge_recursive(&o
, lookup_commit(head
),
676 remoteheads
->item
, reversed
, &result
);
677 if (active_cache_changed
&&
678 (write_cache(index_fd
, active_cache
, active_nr
) ||
679 commit_locked_index(lock
)))
680 die ("unable to write %s", get_index_file());
681 rollback_lock_file(lock
);
682 return clean
? 0 : 1;
684 return try_merge_command(strategy
, common
, head_arg
, remoteheads
);
688 static void count_diff_files(struct diff_queue_struct
*q
,
689 struct diff_options
*opt
, void *data
)
696 static int count_unmerged_entries(void)
700 for (i
= 0; i
< active_nr
; i
++)
701 if (ce_stage(active_cache
[i
]))
707 int checkout_fast_forward(const unsigned char *head
, const unsigned char *remote
)
709 struct tree
*trees
[MAX_UNPACK_TREES
];
710 struct unpack_trees_options opts
;
711 struct tree_desc t
[MAX_UNPACK_TREES
];
712 int i
, fd
, nr_trees
= 0;
713 struct dir_struct dir
;
714 struct lock_file
*lock_file
= xcalloc(1, sizeof(struct lock_file
));
716 refresh_cache(REFRESH_QUIET
);
718 fd
= hold_locked_index(lock_file
, 1);
720 memset(&trees
, 0, sizeof(trees
));
721 memset(&opts
, 0, sizeof(opts
));
722 memset(&t
, 0, sizeof(t
));
723 memset(&dir
, 0, sizeof(dir
));
724 dir
.flags
|= DIR_SHOW_IGNORED
;
725 dir
.exclude_per_dir
= ".gitignore";
729 opts
.src_index
= &the_index
;
730 opts
.dst_index
= &the_index
;
732 opts
.verbose_update
= 1;
734 opts
.fn
= twoway_merge
;
735 setup_unpack_trees_porcelain(&opts
, "merge");
737 trees
[nr_trees
] = parse_tree_indirect(head
);
738 if (!trees
[nr_trees
++])
740 trees
[nr_trees
] = parse_tree_indirect(remote
);
741 if (!trees
[nr_trees
++])
743 for (i
= 0; i
< nr_trees
; i
++) {
744 parse_tree(trees
[i
]);
745 init_tree_desc(t
+i
, trees
[i
]->buffer
, trees
[i
]->size
);
747 if (unpack_trees(nr_trees
, t
, &opts
))
749 if (write_cache(fd
, active_cache
, active_nr
) ||
750 commit_locked_index(lock_file
))
751 die("unable to write new index file");
755 static void split_merge_strategies(const char *string
, struct strategy
**list
,
763 buf
= xstrdup(string
);
768 ALLOC_GROW(*list
, *nr
+ 1, *alloc
);
769 (*list
)[(*nr
)++].name
= xstrdup(q
);
774 ALLOC_GROW(*list
, *nr
+ 1, *alloc
);
775 (*list
)[(*nr
)++].name
= xstrdup(q
);
781 static void add_strategies(const char *string
, unsigned attr
)
783 struct strategy
*list
= NULL
;
784 int list_alloc
= 0, list_nr
= 0, i
;
786 memset(&list
, 0, sizeof(list
));
787 split_merge_strategies(string
, &list
, &list_nr
, &list_alloc
);
789 for (i
= 0; i
< list_nr
; i
++)
790 append_strategy(get_strategy(list
[i
].name
));
793 for (i
= 0; i
< ARRAY_SIZE(all_strategy
); i
++)
794 if (all_strategy
[i
].attr
& attr
)
795 append_strategy(&all_strategy
[i
]);
799 static int merge_trivial(void)
801 unsigned char result_tree
[20], result_commit
[20];
802 struct commit_list
*parent
= xmalloc(sizeof(*parent
));
804 write_tree_trivial(result_tree
);
805 printf("Wonderful.\n");
806 parent
->item
= lookup_commit(head
);
807 parent
->next
= xmalloc(sizeof(*parent
->next
));
808 parent
->next
->item
= remoteheads
->item
;
809 parent
->next
->next
= NULL
;
810 commit_tree(merge_msg
.buf
, result_tree
, parent
, result_commit
, NULL
);
811 finish(result_commit
, "In-index merge");
816 static int finish_automerge(struct commit_list
*common
,
817 unsigned char *result_tree
,
818 const char *wt_strategy
)
820 struct commit_list
*parents
= NULL
, *j
;
821 struct strbuf buf
= STRBUF_INIT
;
822 unsigned char result_commit
[20];
824 free_commit_list(common
);
825 if (allow_fast_forward
) {
826 parents
= remoteheads
;
827 commit_list_insert(lookup_commit(head
), &parents
);
828 parents
= reduce_heads(parents
);
830 struct commit_list
**pptr
= &parents
;
832 pptr
= &commit_list_insert(lookup_commit(head
),
834 for (j
= remoteheads
; j
; j
= j
->next
)
835 pptr
= &commit_list_insert(j
->item
, pptr
)->next
;
837 free_commit_list(remoteheads
);
838 strbuf_addch(&merge_msg
, '\n');
839 commit_tree(merge_msg
.buf
, result_tree
, parents
, result_commit
, NULL
);
840 strbuf_addf(&buf
, "Merge made by %s.", wt_strategy
);
841 finish(result_commit
, buf
.buf
);
842 strbuf_release(&buf
);
847 static int suggest_conflicts(int renormalizing
)
852 fp
= fopen(git_path("MERGE_MSG"), "a");
854 die_errno("Could not open '%s' for writing",
855 git_path("MERGE_MSG"));
856 fprintf(fp
, "\nConflicts:\n");
857 for (pos
= 0; pos
< active_nr
; pos
++) {
858 struct cache_entry
*ce
= active_cache
[pos
];
861 fprintf(fp
, "\t%s\n", ce
->name
);
862 while (pos
+ 1 < active_nr
&&
864 active_cache
[pos
+ 1]->name
))
869 rerere(allow_rerere_auto
);
870 printf("Automatic merge failed; "
871 "fix conflicts and then commit the result.\n");
875 static struct commit
*is_old_style_invocation(int argc
, const char **argv
)
877 struct commit
*second_token
= NULL
;
879 unsigned char second_sha1
[20];
881 if (get_sha1(argv
[1], second_sha1
))
883 second_token
= lookup_commit_reference_gently(second_sha1
, 0);
885 die("'%s' is not a commit", argv
[1]);
886 if (hashcmp(second_token
->object
.sha1
, head
))
892 static int evaluate_result(void)
897 /* Check how many files differ. */
898 init_revisions(&rev
, "");
899 setup_revisions(0, NULL
, &rev
, NULL
);
900 rev
.diffopt
.output_format
|=
901 DIFF_FORMAT_CALLBACK
;
902 rev
.diffopt
.format_callback
= count_diff_files
;
903 rev
.diffopt
.format_callback_data
= &cnt
;
904 run_diff_files(&rev
, 0);
907 * Check how many unmerged entries are
910 cnt
+= count_unmerged_entries();
915 int cmd_merge(int argc
, const char **argv
, const char *prefix
)
917 unsigned char result_tree
[20];
918 struct strbuf buf
= STRBUF_INIT
;
919 const char *head_arg
;
920 int flag
, head_invalid
= 0, i
;
921 int best_cnt
= -1, merge_was_ok
= 0, automerge_was_ok
= 0;
922 struct commit_list
*common
= NULL
;
923 const char *best_strategy
= NULL
, *wt_strategy
= NULL
;
924 struct commit_list
**remotes
= &remoteheads
;
926 if (argc
== 2 && !strcmp(argv
[1], "-h"))
927 usage_with_options(builtin_merge_usage
, builtin_merge_options
);
930 * Check if we are _not_ on a detached HEAD, i.e. if there is a
933 branch
= resolve_ref("HEAD", head
, 0, &flag
);
934 if (branch
&& !prefixcmp(branch
, "refs/heads/"))
936 if (is_null_sha1(head
))
939 git_config(git_merge_config
, NULL
);
942 if (diff_use_color_default
== -1)
943 diff_use_color_default
= git_use_color_default
;
945 argc
= parse_options(argc
, argv
, prefix
, builtin_merge_options
,
946 builtin_merge_usage
, 0);
948 if (abort_current_merge
) {
950 const char *nargv
[] = {"reset", "--merge", NULL
};
952 if (!file_exists(git_path("MERGE_HEAD")))
953 die("There is no merge to abort (MERGE_HEAD missing).");
955 /* Invoke 'git reset --merge' */
956 return cmd_reset(nargc
, nargv
, prefix
);
959 if (read_cache_unmerged())
960 die_resolve_conflict("merge");
962 if (file_exists(git_path("MERGE_HEAD"))) {
964 * There is no unmerged entry, don't advise 'git
965 * add/rm <file>', just 'git commit'.
967 if (advice_resolve_conflict
)
968 die("You have not concluded your merge (MERGE_HEAD exists).\n"
969 "Please, commit your changes before you can merge.");
971 die("You have not concluded your merge (MERGE_HEAD exists).");
973 resolve_undo_clear();
979 if (!allow_fast_forward
)
980 die("You cannot combine --squash with --no-ff.");
984 if (!allow_fast_forward
&& fast_forward_only
)
985 die("You cannot combine --no-ff with --ff-only.");
988 usage_with_options(builtin_merge_usage
,
989 builtin_merge_options
);
992 * This could be traditional "merge <msg> HEAD <commit>..." and
993 * the way we can tell it is to see if the second token is HEAD,
994 * but some people might have misused the interface and used a
995 * committish that is the same as HEAD there instead.
996 * Traditional format never would have "-m" so it is an
997 * additional safety measure to check for it.
1000 if (!have_message
&& is_old_style_invocation(argc
, argv
)) {
1001 strbuf_addstr(&merge_msg
, argv
[0]);
1005 } else if (head_invalid
) {
1006 struct object
*remote_head
;
1008 * If the merged head is a valid one there is no reason
1009 * to forbid "git merge" into a branch yet to be born.
1010 * We do the same for "git pull".
1013 die("Can merge only exactly one commit into "
1016 die("Squash commit into empty head not supported yet");
1017 if (!allow_fast_forward
)
1018 die("Non-fast-forward commit does not make sense into "
1020 remote_head
= peel_to_type(argv
[0], 0, NULL
, OBJ_COMMIT
);
1022 die("%s - not something we can merge", argv
[0]);
1023 update_ref("initial pull", "HEAD", remote_head
->sha1
, NULL
, 0,
1025 read_empty(remote_head
->sha1
, 0);
1028 struct strbuf merge_names
= STRBUF_INIT
;
1030 /* We are invoked directly as the first-class UI. */
1034 * All the rest are the commits being merged;
1035 * prepare the standard merge summary message to
1036 * be appended to the given message. If remote
1037 * is invalid we will die later in the common
1038 * codepath so we discard the error in this
1041 for (i
= 0; i
< argc
; i
++)
1042 merge_name(argv
[i
], &merge_names
);
1044 if (!have_message
|| shortlog_len
) {
1045 fmt_merge_msg(&merge_names
, &merge_msg
, !have_message
,
1048 strbuf_setlen(&merge_msg
, merge_msg
.len
- 1);
1052 if (head_invalid
|| !argc
)
1053 usage_with_options(builtin_merge_usage
,
1054 builtin_merge_options
);
1056 strbuf_addstr(&buf
, "merge");
1057 for (i
= 0; i
< argc
; i
++)
1058 strbuf_addf(&buf
, " %s", argv
[i
]);
1059 setenv("GIT_REFLOG_ACTION", buf
.buf
, 0);
1062 for (i
= 0; i
< argc
; i
++) {
1064 struct commit
*commit
;
1066 o
= peel_to_type(argv
[i
], 0, NULL
, OBJ_COMMIT
);
1068 die("%s - not something we can merge", argv
[i
]);
1069 commit
= lookup_commit(o
->sha1
);
1070 commit
->util
= (void *)argv
[i
];
1071 remotes
= &commit_list_insert(commit
, remotes
)->next
;
1073 strbuf_addf(&buf
, "GITHEAD_%s", sha1_to_hex(o
->sha1
));
1074 setenv(buf
.buf
, argv
[i
], 1);
1078 if (!use_strategies
) {
1079 if (!remoteheads
->next
)
1080 add_strategies(pull_twohead
, DEFAULT_TWOHEAD
);
1082 add_strategies(pull_octopus
, DEFAULT_OCTOPUS
);
1085 for (i
= 0; i
< use_strategies_nr
; i
++) {
1086 if (use_strategies
[i
]->attr
& NO_FAST_FORWARD
)
1087 allow_fast_forward
= 0;
1088 if (use_strategies
[i
]->attr
& NO_TRIVIAL
)
1092 if (!remoteheads
->next
)
1093 common
= get_merge_bases(lookup_commit(head
),
1094 remoteheads
->item
, 1);
1096 struct commit_list
*list
= remoteheads
;
1097 commit_list_insert(lookup_commit(head
), &list
);
1098 common
= get_octopus_merge_bases(list
);
1102 update_ref("updating ORIG_HEAD", "ORIG_HEAD", head
, NULL
, 0,
1106 ; /* No common ancestors found. We need a real merge. */
1107 else if (!remoteheads
->next
&& !common
->next
&&
1108 common
->item
== remoteheads
->item
) {
1110 * If head can reach all the merge then we are up to date.
1111 * but first the most common case of merging one remote.
1113 finish_up_to_date("Already up-to-date.");
1115 } else if (allow_fast_forward
&& !remoteheads
->next
&&
1117 !hashcmp(common
->item
->object
.sha1
, head
)) {
1118 /* Again the most common case of merging one remote. */
1119 struct strbuf msg
= STRBUF_INIT
;
1123 strcpy(hex
, find_unique_abbrev(head
, DEFAULT_ABBREV
));
1126 printf("Updating %s..%s\n",
1128 find_unique_abbrev(remoteheads
->item
->object
.sha1
,
1130 strbuf_addstr(&msg
, "Fast-forward");
1133 " (no commit created; -m option ignored)");
1134 o
= peel_to_type(sha1_to_hex(remoteheads
->item
->object
.sha1
),
1135 0, NULL
, OBJ_COMMIT
);
1139 if (checkout_fast_forward(head
, remoteheads
->item
->object
.sha1
))
1142 finish(o
->sha1
, msg
.buf
);
1145 } else if (!remoteheads
->next
&& common
->next
)
1148 * We are not doing octopus and not fast-forward. Need
1151 else if (!remoteheads
->next
&& !common
->next
&& option_commit
) {
1153 * We are not doing octopus, not fast-forward, and have
1156 refresh_cache(REFRESH_QUIET
);
1157 if (allow_trivial
&& !fast_forward_only
) {
1158 /* See if it is really trivial. */
1159 git_committer_info(IDENT_ERROR_ON_NO_NAME
);
1160 printf("Trying really trivial in-index merge...\n");
1161 if (!read_tree_trivial(common
->item
->object
.sha1
,
1162 head
, remoteheads
->item
->object
.sha1
))
1163 return merge_trivial();
1168 * An octopus. If we can reach all the remote we are up
1172 struct commit_list
*j
;
1174 for (j
= remoteheads
; j
; j
= j
->next
) {
1175 struct commit_list
*common_one
;
1178 * Here we *have* to calculate the individual
1179 * merge_bases again, otherwise "git merge HEAD^
1180 * HEAD^^" would be missed.
1182 common_one
= get_merge_bases(lookup_commit(head
),
1184 if (hashcmp(common_one
->item
->object
.sha1
,
1185 j
->item
->object
.sha1
)) {
1191 finish_up_to_date("Already up-to-date. Yeeah!");
1196 if (fast_forward_only
)
1197 die("Not possible to fast-forward, aborting.");
1199 /* We are going to make a new commit. */
1200 git_committer_info(IDENT_ERROR_ON_NO_NAME
);
1203 * At this point, we need a real merge. No matter what strategy
1204 * we use, it would operate on the index, possibly affecting the
1205 * working tree, and when resolved cleanly, have the desired
1206 * tree in the index -- this means that the index must be in
1207 * sync with the head commit. The strategies are responsible
1210 if (use_strategies_nr
!= 1) {
1212 * Stash away the local changes so that we can try more
1217 memcpy(stash
, null_sha1
, 20);
1220 for (i
= 0; i
< use_strategies_nr
; i
++) {
1223 printf("Rewinding the tree to pristine...\n");
1226 if (use_strategies_nr
!= 1)
1227 printf("Trying merge strategy %s...\n",
1228 use_strategies
[i
]->name
);
1230 * Remember which strategy left the state in the working
1233 wt_strategy
= use_strategies
[i
]->name
;
1235 ret
= try_merge_strategy(use_strategies
[i
]->name
,
1237 if (!option_commit
&& !ret
) {
1240 * This is necessary here just to avoid writing
1241 * the tree, but later we will *not* exit with
1242 * status code 1 because merge_was_ok is set.
1249 * The backend exits with 1 when conflicts are
1250 * left to be resolved, with 2 when it does not
1251 * handle the given merge at all.
1254 int cnt
= evaluate_result();
1256 if (best_cnt
<= 0 || cnt
<= best_cnt
) {
1257 best_strategy
= use_strategies
[i
]->name
;
1267 /* Automerge succeeded. */
1268 write_tree_trivial(result_tree
);
1269 automerge_was_ok
= 1;
1274 * If we have a resulting tree, that means the strategy module
1275 * auto resolved the merge cleanly.
1277 if (automerge_was_ok
)
1278 return finish_automerge(common
, result_tree
, wt_strategy
);
1281 * Pick the result from the best strategy and have the user fix
1284 if (!best_strategy
) {
1286 if (use_strategies_nr
> 1)
1288 "No merge strategy handled the merge.\n");
1290 fprintf(stderr
, "Merge with strategy %s failed.\n",
1291 use_strategies
[0]->name
);
1293 } else if (best_strategy
== wt_strategy
)
1294 ; /* We already have its result in the working tree. */
1296 printf("Rewinding the tree to pristine...\n");
1298 printf("Using the %s to prepare resolving by hand.\n",
1300 try_merge_strategy(best_strategy
, common
, head_arg
);
1307 struct commit_list
*j
;
1309 for (j
= remoteheads
; j
; j
= j
->next
)
1310 strbuf_addf(&buf
, "%s\n",
1311 sha1_to_hex(j
->item
->object
.sha1
));
1312 fd
= open(git_path("MERGE_HEAD"), O_WRONLY
| O_CREAT
, 0666);
1314 die_errno("Could not open '%s' for writing",
1315 git_path("MERGE_HEAD"));
1316 if (write_in_full(fd
, buf
.buf
, buf
.len
) != buf
.len
)
1317 die_errno("Could not write to '%s'", git_path("MERGE_HEAD"));
1319 strbuf_addch(&merge_msg
, '\n');
1320 fd
= open(git_path("MERGE_MSG"), O_WRONLY
| O_CREAT
, 0666);
1322 die_errno("Could not open '%s' for writing",
1323 git_path("MERGE_MSG"));
1324 if (write_in_full(fd
, merge_msg
.buf
, merge_msg
.len
) !=
1326 die_errno("Could not write to '%s'", git_path("MERGE_MSG"));
1328 fd
= open(git_path("MERGE_MODE"), O_WRONLY
| O_CREAT
| O_TRUNC
, 0666);
1330 die_errno("Could not open '%s' for writing",
1331 git_path("MERGE_MODE"));
1333 if (!allow_fast_forward
)
1334 strbuf_addf(&buf
, "no-ff");
1335 if (write_in_full(fd
, buf
.buf
, buf
.len
) != buf
.len
)
1336 die_errno("Could not write to '%s'", git_path("MERGE_MODE"));
1341 fprintf(stderr
, "Automatic merge went well; "
1342 "stopped before committing as requested\n");
1345 return suggest_conflicts(option_renormalize
);