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 #include "fmt-merge-msg.h"
30 #include "gpg-interface.h"
32 #define DEFAULT_TWOHEAD (1<<0)
33 #define DEFAULT_OCTOPUS (1<<1)
34 #define NO_FAST_FORWARD (1<<2)
35 #define NO_TRIVIAL (1<<3)
42 static const char * const builtin_merge_usage
[] = {
43 N_("git merge [options] [<commit>...]"),
44 N_("git merge [options] <msg> HEAD <commit>"),
45 N_("git merge --abort"),
49 static int show_diffstat
= 1, shortlog_len
= -1, squash
;
50 static int option_commit
= 1, allow_fast_forward
= 1;
51 static int fast_forward_only
, option_edit
= -1;
52 static int allow_trivial
= 1, have_message
, verify_signatures
;
53 static int overwrite_ignore
= 1;
54 static struct strbuf merge_msg
= STRBUF_INIT
;
55 static struct strategy
**use_strategies
;
56 static size_t use_strategies_nr
, use_strategies_alloc
;
57 static const char **xopts
;
58 static size_t xopts_nr
, xopts_alloc
;
59 static const char *branch
;
60 static char *branch_mergeoptions
;
61 static int option_renormalize
;
63 static int allow_rerere_auto
;
64 static int abort_current_merge
;
65 static int show_progress
= -1;
66 static int default_to_upstream
;
67 static const char *sign_commit
;
69 static struct strategy all_strategy
[] = {
70 { "recursive", DEFAULT_TWOHEAD
| NO_TRIVIAL
},
71 { "octopus", DEFAULT_OCTOPUS
},
73 { "ours", NO_FAST_FORWARD
| NO_TRIVIAL
},
74 { "subtree", NO_FAST_FORWARD
| NO_TRIVIAL
},
77 static const char *pull_twohead
, *pull_octopus
;
79 static int option_parse_message(const struct option
*opt
,
80 const char *arg
, int unset
)
82 struct strbuf
*buf
= opt
->value
;
85 strbuf_setlen(buf
, 0);
87 strbuf_addf(buf
, "%s%s", buf
->len
? "\n\n" : "", arg
);
90 return error(_("switch `m' requires a value"));
94 static struct strategy
*get_strategy(const char *name
)
98 static struct cmdnames main_cmds
, other_cmds
;
104 for (i
= 0; i
< ARRAY_SIZE(all_strategy
); i
++)
105 if (!strcmp(name
, all_strategy
[i
].name
))
106 return &all_strategy
[i
];
109 struct cmdnames not_strategies
;
112 memset(¬_strategies
, 0, sizeof(struct cmdnames
));
113 load_command_list("git-merge-", &main_cmds
, &other_cmds
);
114 for (i
= 0; i
< main_cmds
.cnt
; i
++) {
116 struct cmdname
*ent
= main_cmds
.names
[i
];
117 for (j
= 0; j
< ARRAY_SIZE(all_strategy
); j
++)
118 if (!strncmp(ent
->name
, all_strategy
[j
].name
, ent
->len
)
119 && !all_strategy
[j
].name
[ent
->len
])
122 add_cmdname(¬_strategies
, ent
->name
, ent
->len
);
124 exclude_cmds(&main_cmds
, ¬_strategies
);
126 if (!is_in_cmdlist(&main_cmds
, name
) && !is_in_cmdlist(&other_cmds
, name
)) {
127 fprintf(stderr
, _("Could not find merge strategy '%s'.\n"), name
);
128 fprintf(stderr
, _("Available strategies are:"));
129 for (i
= 0; i
< main_cmds
.cnt
; i
++)
130 fprintf(stderr
, " %s", main_cmds
.names
[i
]->name
);
131 fprintf(stderr
, ".\n");
132 if (other_cmds
.cnt
) {
133 fprintf(stderr
, _("Available custom strategies are:"));
134 for (i
= 0; i
< other_cmds
.cnt
; i
++)
135 fprintf(stderr
, " %s", other_cmds
.names
[i
]->name
);
136 fprintf(stderr
, ".\n");
141 ret
= xcalloc(1, sizeof(struct strategy
));
142 ret
->name
= xstrdup(name
);
143 ret
->attr
= NO_TRIVIAL
;
147 static void append_strategy(struct strategy
*s
)
149 ALLOC_GROW(use_strategies
, use_strategies_nr
+ 1, use_strategies_alloc
);
150 use_strategies
[use_strategies_nr
++] = s
;
153 static int option_parse_strategy(const struct option
*opt
,
154 const char *name
, int unset
)
159 append_strategy(get_strategy(name
));
163 static int option_parse_x(const struct option
*opt
,
164 const char *arg
, int unset
)
169 ALLOC_GROW(xopts
, xopts_nr
+ 1, xopts_alloc
);
170 xopts
[xopts_nr
++] = xstrdup(arg
);
174 static int option_parse_n(const struct option
*opt
,
175 const char *arg
, int unset
)
177 show_diffstat
= unset
;
181 static struct option builtin_merge_options
[] = {
182 { OPTION_CALLBACK
, 'n', NULL
, NULL
, NULL
,
183 N_("do not show a diffstat at the end of the merge"),
184 PARSE_OPT_NOARG
, option_parse_n
},
185 OPT_BOOLEAN(0, "stat", &show_diffstat
,
186 N_("show a diffstat at the end of the merge")),
187 OPT_BOOLEAN(0, "summary", &show_diffstat
, N_("(synonym to --stat)")),
188 { OPTION_INTEGER
, 0, "log", &shortlog_len
, N_("n"),
189 N_("add (at most <n>) entries from shortlog to merge commit message"),
190 PARSE_OPT_OPTARG
, NULL
, DEFAULT_MERGE_LOG_LEN
},
191 OPT_BOOLEAN(0, "squash", &squash
,
192 N_("create a single commit instead of doing a merge")),
193 OPT_BOOLEAN(0, "commit", &option_commit
,
194 N_("perform a commit if the merge succeeds (default)")),
195 OPT_BOOL('e', "edit", &option_edit
,
196 N_("edit message before committing")),
197 OPT_BOOLEAN(0, "ff", &allow_fast_forward
,
198 N_("allow fast-forward (default)")),
199 OPT_BOOLEAN(0, "ff-only", &fast_forward_only
,
200 N_("abort if fast-forward is not possible")),
201 OPT_RERERE_AUTOUPDATE(&allow_rerere_auto
),
202 OPT_BOOL(0, "verify-signatures", &verify_signatures
,
203 N_("Verify that the named commit has a valid GPG signature")),
204 OPT_CALLBACK('s', "strategy", &use_strategies
, N_("strategy"),
205 N_("merge strategy to use"), option_parse_strategy
),
206 OPT_CALLBACK('X', "strategy-option", &xopts
, N_("option=value"),
207 N_("option for selected merge strategy"), option_parse_x
),
208 OPT_CALLBACK('m', "message", &merge_msg
, N_("message"),
209 N_("merge commit message (for a non-fast-forward merge)"),
210 option_parse_message
),
211 OPT__VERBOSITY(&verbosity
),
212 OPT_BOOLEAN(0, "abort", &abort_current_merge
,
213 N_("abort the current in-progress merge")),
214 OPT_SET_INT(0, "progress", &show_progress
, N_("force progress reporting"), 1),
215 { OPTION_STRING
, 'S', "gpg-sign", &sign_commit
, N_("key id"),
216 N_("GPG sign commit"), PARSE_OPT_OPTARG
, NULL
, (intptr_t) "" },
217 OPT_BOOLEAN(0, "overwrite-ignore", &overwrite_ignore
, N_("update ignored files (default)")),
221 /* Cleans up metadata that is uninteresting after a succeeded merge. */
222 static void drop_save(void)
224 unlink(git_path("MERGE_HEAD"));
225 unlink(git_path("MERGE_MSG"));
226 unlink(git_path("MERGE_MODE"));
229 static int save_state(unsigned char *stash
)
232 struct child_process cp
;
233 struct strbuf buffer
= STRBUF_INIT
;
234 const char *argv
[] = {"stash", "create", NULL
};
236 memset(&cp
, 0, sizeof(cp
));
241 if (start_command(&cp
))
242 die(_("could not run stash."));
243 len
= strbuf_read(&buffer
, cp
.out
, 1024);
246 if (finish_command(&cp
) || len
< 0)
247 die(_("stash failed"));
248 else if (!len
) /* no changes */
250 strbuf_setlen(&buffer
, buffer
.len
-1);
251 if (get_sha1(buffer
.buf
, stash
))
252 die(_("not a valid object: %s"), buffer
.buf
);
256 static void read_empty(unsigned const char *sha1
, int verbose
)
261 args
[i
++] = "read-tree";
266 args
[i
++] = EMPTY_TREE_SHA1_HEX
;
267 args
[i
++] = sha1_to_hex(sha1
);
270 if (run_command_v_opt(args
, RUN_GIT_CMD
))
271 die(_("read-tree failed"));
274 static void reset_hard(unsigned const char *sha1
, int verbose
)
279 args
[i
++] = "read-tree";
282 args
[i
++] = "--reset";
284 args
[i
++] = sha1_to_hex(sha1
);
287 if (run_command_v_opt(args
, RUN_GIT_CMD
))
288 die(_("read-tree failed"));
291 static void restore_state(const unsigned char *head
,
292 const unsigned char *stash
)
294 struct strbuf sb
= STRBUF_INIT
;
295 const char *args
[] = { "stash", "apply", NULL
, NULL
};
297 if (is_null_sha1(stash
))
302 args
[2] = sha1_to_hex(stash
);
305 * It is OK to ignore error here, for example when there was
306 * nothing to restore.
308 run_command_v_opt(args
, RUN_GIT_CMD
);
311 refresh_cache(REFRESH_QUIET
);
314 /* This is called when no merge was necessary. */
315 static void finish_up_to_date(const char *msg
)
318 printf("%s%s\n", squash
? _(" (nothing to squash)") : "", msg
);
322 static void squash_message(struct commit
*commit
, struct commit_list
*remoteheads
)
325 struct strbuf out
= STRBUF_INIT
;
326 struct commit_list
*j
;
327 const char *filename
;
329 struct pretty_print_context ctx
= {0};
331 printf(_("Squash commit -- not updating HEAD\n"));
332 filename
= git_path("SQUASH_MSG");
333 fd
= open(filename
, O_WRONLY
| O_CREAT
, 0666);
335 die_errno(_("Could not write to '%s'"), filename
);
337 init_revisions(&rev
, NULL
);
338 rev
.ignore_merges
= 1;
339 rev
.commit_format
= CMIT_FMT_MEDIUM
;
341 commit
->object
.flags
|= UNINTERESTING
;
342 add_pending_object(&rev
, &commit
->object
, NULL
);
344 for (j
= remoteheads
; j
; j
= j
->next
)
345 add_pending_object(&rev
, &j
->item
->object
, NULL
);
347 setup_revisions(0, NULL
, &rev
, NULL
);
348 if (prepare_revision_walk(&rev
))
349 die(_("revision walk setup failed"));
351 ctx
.abbrev
= rev
.abbrev
;
352 ctx
.date_mode
= rev
.date_mode
;
353 ctx
.fmt
= rev
.commit_format
;
355 strbuf_addstr(&out
, "Squashed commit of the following:\n");
356 while ((commit
= get_revision(&rev
)) != NULL
) {
357 strbuf_addch(&out
, '\n');
358 strbuf_addf(&out
, "commit %s\n",
359 sha1_to_hex(commit
->object
.sha1
));
360 pretty_print_commit(&ctx
, commit
, &out
);
362 if (write(fd
, out
.buf
, out
.len
) < 0)
363 die_errno(_("Writing SQUASH_MSG"));
365 die_errno(_("Finishing SQUASH_MSG"));
366 strbuf_release(&out
);
369 static void finish(struct commit
*head_commit
,
370 struct commit_list
*remoteheads
,
371 const unsigned char *new_head
, const char *msg
)
373 struct strbuf reflog_message
= STRBUF_INIT
;
374 const unsigned char *head
= head_commit
->object
.sha1
;
377 strbuf_addstr(&reflog_message
, getenv("GIT_REFLOG_ACTION"));
381 strbuf_addf(&reflog_message
, "%s: %s",
382 getenv("GIT_REFLOG_ACTION"), msg
);
385 squash_message(head_commit
, remoteheads
);
387 if (verbosity
>= 0 && !merge_msg
.len
)
388 printf(_("No merge message -- not updating HEAD\n"));
390 const char *argv_gc_auto
[] = { "gc", "--auto", NULL
};
391 update_ref(reflog_message
.buf
, "HEAD",
395 * We ignore errors in 'gc --auto', since the
396 * user should see them.
398 run_command_v_opt(argv_gc_auto
, RUN_GIT_CMD
);
401 if (new_head
&& show_diffstat
) {
402 struct diff_options opts
;
404 opts
.stat_width
= -1; /* use full terminal width */
405 opts
.stat_graph_width
= -1; /* respect statGraphWidth config */
406 opts
.output_format
|=
407 DIFF_FORMAT_SUMMARY
| DIFF_FORMAT_DIFFSTAT
;
408 opts
.detect_rename
= DIFF_DETECT_RENAME
;
409 diff_setup_done(&opts
);
410 diff_tree_sha1(head
, new_head
, "", &opts
);
415 /* Run a post-merge hook */
416 run_hook(NULL
, "post-merge", squash
? "1" : "0", NULL
);
418 strbuf_release(&reflog_message
);
421 /* Get the name for the merge commit's message. */
422 static void merge_name(const char *remote
, struct strbuf
*msg
)
424 struct commit
*remote_head
;
425 unsigned char branch_head
[20];
426 struct strbuf buf
= STRBUF_INIT
;
427 struct strbuf bname
= STRBUF_INIT
;
432 strbuf_branchname(&bname
, remote
);
435 memset(branch_head
, 0, sizeof(branch_head
));
436 remote_head
= get_merge_parent(remote
);
438 die(_("'%s' does not point to a commit"), remote
);
440 if (dwim_ref(remote
, strlen(remote
), branch_head
, &found_ref
) > 0) {
441 if (!prefixcmp(found_ref
, "refs/heads/")) {
442 strbuf_addf(msg
, "%s\t\tbranch '%s' of .\n",
443 sha1_to_hex(branch_head
), remote
);
446 if (!prefixcmp(found_ref
, "refs/tags/")) {
447 strbuf_addf(msg
, "%s\t\ttag '%s' of .\n",
448 sha1_to_hex(branch_head
), remote
);
451 if (!prefixcmp(found_ref
, "refs/remotes/")) {
452 strbuf_addf(msg
, "%s\t\tremote-tracking branch '%s' of .\n",
453 sha1_to_hex(branch_head
), remote
);
458 /* See if remote matches <name>^^^.. or <name>~<number> */
459 for (len
= 0, ptr
= remote
+ strlen(remote
);
460 remote
< ptr
&& ptr
[-1] == '^';
467 ptr
= strrchr(remote
, '~');
469 int seen_nonzero
= 0;
472 while (*++ptr
&& isdigit(*ptr
)) {
473 seen_nonzero
|= (*ptr
!= '0');
477 len
= 0; /* not ...~<number> */
478 else if (seen_nonzero
)
481 early
= 1; /* "name~" is "name~1"! */
485 struct strbuf truname
= STRBUF_INIT
;
486 strbuf_addstr(&truname
, "refs/heads/");
487 strbuf_addstr(&truname
, remote
);
488 strbuf_setlen(&truname
, truname
.len
- len
);
489 if (ref_exists(truname
.buf
)) {
491 "%s\t\tbranch '%s'%s of .\n",
492 sha1_to_hex(remote_head
->object
.sha1
),
494 (early
? " (early part)" : ""));
495 strbuf_release(&truname
);
500 if (!strcmp(remote
, "FETCH_HEAD") &&
501 !access(git_path("FETCH_HEAD"), R_OK
)) {
502 const char *filename
;
504 struct strbuf line
= STRBUF_INIT
;
507 filename
= git_path("FETCH_HEAD");
508 fp
= fopen(filename
, "r");
510 die_errno(_("could not open '%s' for reading"),
512 strbuf_getline(&line
, fp
, '\n');
514 ptr
= strstr(line
.buf
, "\tnot-for-merge\t");
516 strbuf_remove(&line
, ptr
-line
.buf
+1, 13);
517 strbuf_addbuf(msg
, &line
);
518 strbuf_release(&line
);
522 if (remote_head
->util
) {
523 struct merge_remote_desc
*desc
;
524 desc
= merge_remote_util(remote_head
);
525 if (desc
&& desc
->obj
&& desc
->obj
->type
== OBJ_TAG
) {
526 strbuf_addf(msg
, "%s\t\t%s '%s'\n",
527 sha1_to_hex(desc
->obj
->sha1
),
528 typename(desc
->obj
->type
),
534 strbuf_addf(msg
, "%s\t\tcommit '%s'\n",
535 sha1_to_hex(remote_head
->object
.sha1
), remote
);
537 strbuf_release(&buf
);
538 strbuf_release(&bname
);
541 static void parse_branch_merge_options(char *bmo
)
548 argc
= split_cmdline(bmo
, &argv
);
550 die(_("Bad branch.%s.mergeoptions string: %s"), branch
,
551 split_cmdline_strerror(argc
));
552 argv
= xrealloc(argv
, sizeof(*argv
) * (argc
+ 2));
553 memmove(argv
+ 1, argv
, sizeof(*argv
) * (argc
+ 1));
555 argv
[0] = "branch.*.mergeoptions";
556 parse_options(argc
, argv
, NULL
, builtin_merge_options
,
557 builtin_merge_usage
, 0);
561 static int git_merge_config(const char *k
, const char *v
, void *cb
)
565 if (branch
&& !prefixcmp(k
, "branch.") &&
566 !prefixcmp(k
+ 7, branch
) &&
567 !strcmp(k
+ 7 + strlen(branch
), ".mergeoptions")) {
568 free(branch_mergeoptions
);
569 branch_mergeoptions
= xstrdup(v
);
573 if (!strcmp(k
, "merge.diffstat") || !strcmp(k
, "merge.stat"))
574 show_diffstat
= git_config_bool(k
, v
);
575 else if (!strcmp(k
, "pull.twohead"))
576 return git_config_string(&pull_twohead
, k
, v
);
577 else if (!strcmp(k
, "pull.octopus"))
578 return git_config_string(&pull_octopus
, k
, v
);
579 else if (!strcmp(k
, "merge.renormalize"))
580 option_renormalize
= git_config_bool(k
, v
);
581 else if (!strcmp(k
, "merge.ff")) {
582 int boolval
= git_config_maybe_bool(k
, v
);
584 allow_fast_forward
= boolval
;
585 } else if (v
&& !strcmp(v
, "only")) {
586 allow_fast_forward
= 1;
587 fast_forward_only
= 1;
588 } /* do not barf on values from future versions of git */
590 } else if (!strcmp(k
, "merge.defaulttoupstream")) {
591 default_to_upstream
= git_config_bool(k
, v
);
595 status
= fmt_merge_msg_config(k
, v
, cb
);
598 status
= git_gpg_config(k
, v
, NULL
);
601 return git_diff_ui_config(k
, v
, cb
);
604 static int read_tree_trivial(unsigned char *common
, unsigned char *head
,
608 struct tree
*trees
[MAX_UNPACK_TREES
];
609 struct tree_desc t
[MAX_UNPACK_TREES
];
610 struct unpack_trees_options opts
;
612 memset(&opts
, 0, sizeof(opts
));
614 opts
.src_index
= &the_index
;
615 opts
.dst_index
= &the_index
;
617 opts
.verbose_update
= 1;
618 opts
.trivial_merges_only
= 1;
620 trees
[nr_trees
] = parse_tree_indirect(common
);
621 if (!trees
[nr_trees
++])
623 trees
[nr_trees
] = parse_tree_indirect(head
);
624 if (!trees
[nr_trees
++])
626 trees
[nr_trees
] = parse_tree_indirect(one
);
627 if (!trees
[nr_trees
++])
629 opts
.fn
= threeway_merge
;
630 cache_tree_free(&active_cache_tree
);
631 for (i
= 0; i
< nr_trees
; i
++) {
632 parse_tree(trees
[i
]);
633 init_tree_desc(t
+i
, trees
[i
]->buffer
, trees
[i
]->size
);
635 if (unpack_trees(nr_trees
, t
, &opts
))
640 static void write_tree_trivial(unsigned char *sha1
)
642 if (write_cache_as_tree(sha1
, 0, NULL
))
643 die(_("git write-tree failed to write a tree"));
646 static int try_merge_strategy(const char *strategy
, struct commit_list
*common
,
647 struct commit_list
*remoteheads
,
648 struct commit
*head
, const char *head_arg
)
651 struct lock_file
*lock
= xcalloc(1, sizeof(struct lock_file
));
653 index_fd
= hold_locked_index(lock
, 1);
654 refresh_cache(REFRESH_QUIET
);
655 if (active_cache_changed
&&
656 (write_cache(index_fd
, active_cache
, active_nr
) ||
657 commit_locked_index(lock
)))
658 return error(_("Unable to write index."));
659 rollback_lock_file(lock
);
661 if (!strcmp(strategy
, "recursive") || !strcmp(strategy
, "subtree")) {
663 struct commit
*result
;
664 struct lock_file
*lock
= xcalloc(1, sizeof(struct lock_file
));
666 struct commit_list
*reversed
= NULL
;
667 struct merge_options o
;
668 struct commit_list
*j
;
670 if (remoteheads
->next
) {
671 error(_("Not handling anything other than two heads merge."));
675 init_merge_options(&o
);
676 if (!strcmp(strategy
, "subtree"))
677 o
.subtree_shift
= "";
679 o
.renormalize
= option_renormalize
;
680 o
.show_rename_progress
=
681 show_progress
== -1 ? isatty(2) : show_progress
;
683 for (x
= 0; x
< xopts_nr
; x
++)
684 if (parse_merge_opt(&o
, xopts
[x
]))
685 die(_("Unknown option for merge-recursive: -X%s"), xopts
[x
]);
687 o
.branch1
= head_arg
;
688 o
.branch2
= merge_remote_util(remoteheads
->item
)->name
;
690 for (j
= common
; j
; j
= j
->next
)
691 commit_list_insert(j
->item
, &reversed
);
693 index_fd
= hold_locked_index(lock
, 1);
694 clean
= merge_recursive(&o
, head
,
695 remoteheads
->item
, reversed
, &result
);
696 if (active_cache_changed
&&
697 (write_cache(index_fd
, active_cache
, active_nr
) ||
698 commit_locked_index(lock
)))
699 die (_("unable to write %s"), get_index_file());
700 rollback_lock_file(lock
);
701 return clean
? 0 : 1;
703 return try_merge_command(strategy
, xopts_nr
, xopts
,
704 common
, head_arg
, remoteheads
);
708 static void count_diff_files(struct diff_queue_struct
*q
,
709 struct diff_options
*opt
, void *data
)
716 static int count_unmerged_entries(void)
720 for (i
= 0; i
< active_nr
; i
++)
721 if (ce_stage(active_cache
[i
]))
727 static void split_merge_strategies(const char *string
, struct strategy
**list
,
735 buf
= xstrdup(string
);
740 ALLOC_GROW(*list
, *nr
+ 1, *alloc
);
741 (*list
)[(*nr
)++].name
= xstrdup(q
);
746 ALLOC_GROW(*list
, *nr
+ 1, *alloc
);
747 (*list
)[(*nr
)++].name
= xstrdup(q
);
753 static void add_strategies(const char *string
, unsigned attr
)
755 struct strategy
*list
= NULL
;
756 int list_alloc
= 0, list_nr
= 0, i
;
758 memset(&list
, 0, sizeof(list
));
759 split_merge_strategies(string
, &list
, &list_nr
, &list_alloc
);
761 for (i
= 0; i
< list_nr
; i
++)
762 append_strategy(get_strategy(list
[i
].name
));
765 for (i
= 0; i
< ARRAY_SIZE(all_strategy
); i
++)
766 if (all_strategy
[i
].attr
& attr
)
767 append_strategy(&all_strategy
[i
]);
771 static void write_merge_msg(struct strbuf
*msg
)
773 const char *filename
= git_path("MERGE_MSG");
774 int fd
= open(filename
, O_WRONLY
| O_CREAT
, 0666);
776 die_errno(_("Could not open '%s' for writing"),
778 if (write_in_full(fd
, msg
->buf
, msg
->len
) != msg
->len
)
779 die_errno(_("Could not write to '%s'"), filename
);
783 static void read_merge_msg(struct strbuf
*msg
)
785 const char *filename
= git_path("MERGE_MSG");
787 if (strbuf_read_file(msg
, filename
, 0) < 0)
788 die_errno(_("Could not read from '%s'"), filename
);
791 static void write_merge_state(struct commit_list
*);
792 static void abort_commit(struct commit_list
*remoteheads
, const char *err_msg
)
795 error("%s", err_msg
);
797 _("Not committing merge; use 'git commit' to complete the merge.\n"));
798 write_merge_state(remoteheads
);
802 static const char merge_editor_comment
[] =
803 N_("Please enter a commit message to explain why this merge is necessary,\n"
804 "especially if it merges an updated upstream into a topic branch.\n"
806 "Lines starting with '%c' will be ignored, and an empty message aborts\n"
809 static void prepare_to_commit(struct commit_list
*remoteheads
)
811 struct strbuf msg
= STRBUF_INIT
;
812 strbuf_addbuf(&msg
, &merge_msg
);
813 strbuf_addch(&msg
, '\n');
815 strbuf_commented_addf(&msg
, _(merge_editor_comment
), comment_line_char
);
816 write_merge_msg(&msg
);
817 if (run_hook(get_index_file(), "prepare-commit-msg",
818 git_path("MERGE_MSG"), "merge", NULL
, NULL
))
819 abort_commit(remoteheads
, NULL
);
820 if (0 < option_edit
) {
821 if (launch_editor(git_path("MERGE_MSG"), NULL
, NULL
))
822 abort_commit(remoteheads
, NULL
);
824 read_merge_msg(&msg
);
825 stripspace(&msg
, 0 < option_edit
);
827 abort_commit(remoteheads
, _("Empty commit message."));
828 strbuf_release(&merge_msg
);
829 strbuf_addbuf(&merge_msg
, &msg
);
830 strbuf_release(&msg
);
833 static int merge_trivial(struct commit
*head
, struct commit_list
*remoteheads
)
835 unsigned char result_tree
[20], result_commit
[20];
836 struct commit_list
*parent
= xmalloc(sizeof(*parent
));
838 write_tree_trivial(result_tree
);
839 printf(_("Wonderful.\n"));
841 parent
->next
= xmalloc(sizeof(*parent
->next
));
842 parent
->next
->item
= remoteheads
->item
;
843 parent
->next
->next
= NULL
;
844 prepare_to_commit(remoteheads
);
845 if (commit_tree(&merge_msg
, result_tree
, parent
, result_commit
, NULL
,
847 die(_("failed to write commit object"));
848 finish(head
, remoteheads
, result_commit
, "In-index merge");
853 static int finish_automerge(struct commit
*head
,
855 struct commit_list
*common
,
856 struct commit_list
*remoteheads
,
857 unsigned char *result_tree
,
858 const char *wt_strategy
)
860 struct commit_list
*parents
= NULL
;
861 struct strbuf buf
= STRBUF_INIT
;
862 unsigned char result_commit
[20];
864 free_commit_list(common
);
865 parents
= remoteheads
;
866 if (!head_subsumed
|| !allow_fast_forward
)
867 commit_list_insert(head
, &parents
);
868 strbuf_addch(&merge_msg
, '\n');
869 prepare_to_commit(remoteheads
);
870 if (commit_tree(&merge_msg
, result_tree
, parents
, result_commit
,
872 die(_("failed to write commit object"));
873 strbuf_addf(&buf
, "Merge made by the '%s' strategy.", wt_strategy
);
874 finish(head
, remoteheads
, result_commit
, buf
.buf
);
875 strbuf_release(&buf
);
880 static int suggest_conflicts(int renormalizing
)
882 const char *filename
;
886 filename
= git_path("MERGE_MSG");
887 fp
= fopen(filename
, "a");
889 die_errno(_("Could not open '%s' for writing"), filename
);
890 fprintf(fp
, "\nConflicts:\n");
891 for (pos
= 0; pos
< active_nr
; pos
++) {
892 struct cache_entry
*ce
= active_cache
[pos
];
895 fprintf(fp
, "\t%s\n", ce
->name
);
896 while (pos
+ 1 < active_nr
&&
898 active_cache
[pos
+ 1]->name
))
903 rerere(allow_rerere_auto
);
904 printf(_("Automatic merge failed; "
905 "fix conflicts and then commit the result.\n"));
909 static struct commit
*is_old_style_invocation(int argc
, const char **argv
,
910 const unsigned char *head
)
912 struct commit
*second_token
= NULL
;
914 unsigned char second_sha1
[20];
916 if (get_sha1(argv
[1], second_sha1
))
918 second_token
= lookup_commit_reference_gently(second_sha1
, 0);
920 die(_("'%s' is not a commit"), argv
[1]);
921 if (hashcmp(second_token
->object
.sha1
, head
))
927 static int evaluate_result(void)
932 /* Check how many files differ. */
933 init_revisions(&rev
, "");
934 setup_revisions(0, NULL
, &rev
, NULL
);
935 rev
.diffopt
.output_format
|=
936 DIFF_FORMAT_CALLBACK
;
937 rev
.diffopt
.format_callback
= count_diff_files
;
938 rev
.diffopt
.format_callback_data
= &cnt
;
939 run_diff_files(&rev
, 0);
942 * Check how many unmerged entries are
945 cnt
+= count_unmerged_entries();
951 * Pretend as if the user told us to merge with the tracking
952 * branch we have for the upstream of the current branch
954 static int setup_with_upstream(const char ***argv
)
956 struct branch
*branch
= branch_get(NULL
);
961 die(_("No current branch."));
963 die(_("No remote for the current branch."));
964 if (!branch
->merge_nr
)
965 die(_("No default upstream defined for the current branch."));
967 args
= xcalloc(branch
->merge_nr
+ 1, sizeof(char *));
968 for (i
= 0; i
< branch
->merge_nr
; i
++) {
969 if (!branch
->merge
[i
]->dst
)
970 die(_("No remote tracking branch for %s from %s"),
971 branch
->merge
[i
]->src
, branch
->remote_name
);
972 args
[i
] = branch
->merge
[i
]->dst
;
979 static void write_merge_state(struct commit_list
*remoteheads
)
981 const char *filename
;
983 struct commit_list
*j
;
984 struct strbuf buf
= STRBUF_INIT
;
986 for (j
= remoteheads
; j
; j
= j
->next
) {
987 unsigned const char *sha1
;
988 struct commit
*c
= j
->item
;
989 if (c
->util
&& merge_remote_util(c
)->obj
) {
990 sha1
= merge_remote_util(c
)->obj
->sha1
;
992 sha1
= c
->object
.sha1
;
994 strbuf_addf(&buf
, "%s\n", sha1_to_hex(sha1
));
996 filename
= git_path("MERGE_HEAD");
997 fd
= open(filename
, O_WRONLY
| O_CREAT
, 0666);
999 die_errno(_("Could not open '%s' for writing"), filename
);
1000 if (write_in_full(fd
, buf
.buf
, buf
.len
) != buf
.len
)
1001 die_errno(_("Could not write to '%s'"), filename
);
1003 strbuf_addch(&merge_msg
, '\n');
1004 write_merge_msg(&merge_msg
);
1006 filename
= git_path("MERGE_MODE");
1007 fd
= open(filename
, O_WRONLY
| O_CREAT
| O_TRUNC
, 0666);
1009 die_errno(_("Could not open '%s' for writing"), filename
);
1011 if (!allow_fast_forward
)
1012 strbuf_addf(&buf
, "no-ff");
1013 if (write_in_full(fd
, buf
.buf
, buf
.len
) != buf
.len
)
1014 die_errno(_("Could not write to '%s'"), filename
);
1018 static int default_edit_option(void)
1020 static const char name
[] = "GIT_MERGE_AUTOEDIT";
1021 const char *e
= getenv(name
);
1022 struct stat st_stdin
, st_stdout
;
1025 /* an explicit -m msg without --[no-]edit */
1029 int v
= git_config_maybe_bool(name
, e
);
1031 die("Bad value '%s' in environment '%s'", e
, name
);
1035 /* Use editor if stdin and stdout are the same and is a tty */
1036 return (!fstat(0, &st_stdin
) &&
1037 !fstat(1, &st_stdout
) &&
1038 isatty(0) && isatty(1) &&
1039 st_stdin
.st_dev
== st_stdout
.st_dev
&&
1040 st_stdin
.st_ino
== st_stdout
.st_ino
&&
1041 st_stdin
.st_mode
== st_stdout
.st_mode
);
1044 static struct commit_list
*collect_parents(struct commit
*head_commit
,
1046 int argc
, const char **argv
)
1049 struct commit_list
*remoteheads
= NULL
, *parents
, *next
;
1050 struct commit_list
**remotes
= &remoteheads
;
1053 remotes
= &commit_list_insert(head_commit
, remotes
)->next
;
1054 for (i
= 0; i
< argc
; i
++) {
1055 struct commit
*commit
= get_merge_parent(argv
[i
]);
1057 die(_("%s - not something we can merge"), argv
[i
]);
1058 remotes
= &commit_list_insert(commit
, remotes
)->next
;
1062 parents
= reduce_heads(remoteheads
);
1064 *head_subsumed
= 1; /* we will flip this to 0 when we find it */
1065 for (remoteheads
= NULL
, remotes
= &remoteheads
;
1068 struct commit
*commit
= parents
->item
;
1069 next
= parents
->next
;
1070 if (commit
== head_commit
)
1073 remotes
= &commit_list_insert(commit
, remotes
)->next
;
1078 int cmd_merge(int argc
, const char **argv
, const char *prefix
)
1080 unsigned char result_tree
[20];
1081 unsigned char stash
[20];
1082 unsigned char head_sha1
[20];
1083 struct commit
*head_commit
;
1084 struct strbuf buf
= STRBUF_INIT
;
1085 const char *head_arg
;
1086 int flag
, i
, ret
= 0, head_subsumed
;
1087 int best_cnt
= -1, merge_was_ok
= 0, automerge_was_ok
= 0;
1088 struct commit_list
*common
= NULL
;
1089 const char *best_strategy
= NULL
, *wt_strategy
= NULL
;
1090 struct commit_list
*remoteheads
, *p
;
1091 void *branch_to_free
;
1093 if (argc
== 2 && !strcmp(argv
[1], "-h"))
1094 usage_with_options(builtin_merge_usage
, builtin_merge_options
);
1097 * Check if we are _not_ on a detached HEAD, i.e. if there is a
1100 branch
= branch_to_free
= resolve_refdup("HEAD", head_sha1
, 0, &flag
);
1101 if (branch
&& !prefixcmp(branch
, "refs/heads/"))
1103 if (!branch
|| is_null_sha1(head_sha1
))
1106 head_commit
= lookup_commit_or_die(head_sha1
, "HEAD");
1108 git_config(git_merge_config
, NULL
);
1110 if (branch_mergeoptions
)
1111 parse_branch_merge_options(branch_mergeoptions
);
1112 argc
= parse_options(argc
, argv
, prefix
, builtin_merge_options
,
1113 builtin_merge_usage
, 0);
1114 if (shortlog_len
< 0)
1115 shortlog_len
= (merge_log_config
> 0) ? merge_log_config
: 0;
1117 if (verbosity
< 0 && show_progress
== -1)
1120 if (abort_current_merge
) {
1122 const char *nargv
[] = {"reset", "--merge", NULL
};
1124 if (!file_exists(git_path("MERGE_HEAD")))
1125 die(_("There is no merge to abort (MERGE_HEAD missing)."));
1127 /* Invoke 'git reset --merge' */
1128 ret
= cmd_reset(nargc
, nargv
, prefix
);
1132 if (read_cache_unmerged())
1133 die_resolve_conflict("merge");
1135 if (file_exists(git_path("MERGE_HEAD"))) {
1137 * There is no unmerged entry, don't advise 'git
1138 * add/rm <file>', just 'git commit'.
1140 if (advice_resolve_conflict
)
1141 die(_("You have not concluded your merge (MERGE_HEAD exists).\n"
1142 "Please, commit your changes before you can merge."));
1144 die(_("You have not concluded your merge (MERGE_HEAD exists)."));
1146 if (file_exists(git_path("CHERRY_PICK_HEAD"))) {
1147 if (advice_resolve_conflict
)
1148 die(_("You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
1149 "Please, commit your changes before you can merge."));
1151 die(_("You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."));
1153 resolve_undo_clear();
1159 if (!allow_fast_forward
)
1160 die(_("You cannot combine --squash with --no-ff."));
1164 if (!allow_fast_forward
&& fast_forward_only
)
1165 die(_("You cannot combine --no-ff with --ff-only."));
1167 if (!abort_current_merge
) {
1169 if (default_to_upstream
)
1170 argc
= setup_with_upstream(&argv
);
1172 die(_("No commit specified and merge.defaultToUpstream not set."));
1173 } else if (argc
== 1 && !strcmp(argv
[0], "-"))
1177 usage_with_options(builtin_merge_usage
,
1178 builtin_merge_options
);
1181 * This could be traditional "merge <msg> HEAD <commit>..." and
1182 * the way we can tell it is to see if the second token is HEAD,
1183 * but some people might have misused the interface and used a
1184 * committish that is the same as HEAD there instead.
1185 * Traditional format never would have "-m" so it is an
1186 * additional safety measure to check for it.
1189 if (!have_message
&& head_commit
&&
1190 is_old_style_invocation(argc
, argv
, head_commit
->object
.sha1
)) {
1191 strbuf_addstr(&merge_msg
, argv
[0]);
1195 remoteheads
= collect_parents(head_commit
, &head_subsumed
, argc
, argv
);
1196 } else if (!head_commit
) {
1197 struct commit
*remote_head
;
1199 * If the merged head is a valid one there is no reason
1200 * to forbid "git merge" into a branch yet to be born.
1201 * We do the same for "git pull".
1204 die(_("Can merge only exactly one commit into "
1207 die(_("Squash commit into empty head not supported yet"));
1208 if (!allow_fast_forward
)
1209 die(_("Non-fast-forward commit does not make sense into "
1211 remoteheads
= collect_parents(head_commit
, &head_subsumed
, argc
, argv
);
1212 remote_head
= remoteheads
->item
;
1214 die(_("%s - not something we can merge"), argv
[0]);
1215 read_empty(remote_head
->object
.sha1
, 0);
1216 update_ref("initial pull", "HEAD", remote_head
->object
.sha1
,
1217 NULL
, 0, DIE_ON_ERR
);
1220 struct strbuf merge_names
= STRBUF_INIT
;
1222 /* We are invoked directly as the first-class UI. */
1226 * All the rest are the commits being merged; prepare
1227 * the standard merge summary message to be appended
1228 * to the given message.
1230 remoteheads
= collect_parents(head_commit
, &head_subsumed
, argc
, argv
);
1231 for (p
= remoteheads
; p
; p
= p
->next
)
1232 merge_name(merge_remote_util(p
->item
)->name
, &merge_names
);
1234 if (!have_message
|| shortlog_len
) {
1235 struct fmt_merge_msg_opts opts
;
1236 memset(&opts
, 0, sizeof(opts
));
1237 opts
.add_title
= !have_message
;
1238 opts
.shortlog_len
= shortlog_len
;
1239 opts
.credit_people
= (0 < option_edit
);
1241 fmt_merge_msg(&merge_names
, &merge_msg
, &opts
);
1243 strbuf_setlen(&merge_msg
, merge_msg
.len
- 1);
1247 if (!head_commit
|| !argc
)
1248 usage_with_options(builtin_merge_usage
,
1249 builtin_merge_options
);
1251 if (verify_signatures
) {
1252 for (p
= remoteheads
; p
; p
= p
->next
) {
1253 struct commit
*commit
= p
->item
;
1255 struct signature_check signature_check
;
1256 memset(&signature_check
, 0, sizeof(signature_check
));
1258 check_commit_signature(commit
, &signature_check
);
1260 strcpy(hex
, find_unique_abbrev(commit
->object
.sha1
, DEFAULT_ABBREV
));
1261 switch (signature_check
.result
) {
1265 die(_("Commit %s has an untrusted GPG signature, "
1266 "allegedly by %s."), hex
, signature_check
.signer
);
1268 die(_("Commit %s has a bad GPG signature "
1269 "allegedly by %s."), hex
, signature_check
.signer
);
1271 die(_("Commit %s does not have a GPG signature."), hex
);
1273 if (verbosity
>= 0 && signature_check
.result
== 'G')
1274 printf(_("Commit %s has a good GPG signature by %s\n"),
1275 hex
, signature_check
.signer
);
1277 free(signature_check
.gpg_output
);
1278 free(signature_check
.gpg_status
);
1279 free(signature_check
.signer
);
1280 free(signature_check
.key
);
1284 strbuf_addstr(&buf
, "merge");
1285 for (p
= remoteheads
; p
; p
= p
->next
)
1286 strbuf_addf(&buf
, " %s", merge_remote_util(p
->item
)->name
);
1287 setenv("GIT_REFLOG_ACTION", buf
.buf
, 0);
1290 for (p
= remoteheads
; p
; p
= p
->next
) {
1291 struct commit
*commit
= p
->item
;
1292 strbuf_addf(&buf
, "GITHEAD_%s",
1293 sha1_to_hex(commit
->object
.sha1
));
1294 setenv(buf
.buf
, merge_remote_util(commit
)->name
, 1);
1296 if (!fast_forward_only
&&
1297 merge_remote_util(commit
) &&
1298 merge_remote_util(commit
)->obj
&&
1299 merge_remote_util(commit
)->obj
->type
== OBJ_TAG
)
1300 allow_fast_forward
= 0;
1303 if (option_edit
< 0)
1304 option_edit
= default_edit_option();
1306 if (!use_strategies
) {
1308 ; /* already up-to-date */
1309 else if (!remoteheads
->next
)
1310 add_strategies(pull_twohead
, DEFAULT_TWOHEAD
);
1312 add_strategies(pull_octopus
, DEFAULT_OCTOPUS
);
1315 for (i
= 0; i
< use_strategies_nr
; i
++) {
1316 if (use_strategies
[i
]->attr
& NO_FAST_FORWARD
)
1317 allow_fast_forward
= 0;
1318 if (use_strategies
[i
]->attr
& NO_TRIVIAL
)
1323 ; /* already up-to-date */
1324 else if (!remoteheads
->next
)
1325 common
= get_merge_bases(head_commit
, remoteheads
->item
, 1);
1327 struct commit_list
*list
= remoteheads
;
1328 commit_list_insert(head_commit
, &list
);
1329 common
= get_octopus_merge_bases(list
);
1333 update_ref("updating ORIG_HEAD", "ORIG_HEAD", head_commit
->object
.sha1
,
1334 NULL
, 0, DIE_ON_ERR
);
1336 if (remoteheads
&& !common
)
1337 ; /* No common ancestors found. We need a real merge. */
1338 else if (!remoteheads
||
1339 (!remoteheads
->next
&& !common
->next
&&
1340 common
->item
== remoteheads
->item
)) {
1342 * If head can reach all the merge then we are up to date.
1343 * but first the most common case of merging one remote.
1345 finish_up_to_date("Already up-to-date.");
1347 } else if (allow_fast_forward
&& !remoteheads
->next
&&
1349 !hashcmp(common
->item
->object
.sha1
, head_commit
->object
.sha1
)) {
1350 /* Again the most common case of merging one remote. */
1351 struct strbuf msg
= STRBUF_INIT
;
1352 struct commit
*commit
;
1355 strcpy(hex
, find_unique_abbrev(head_commit
->object
.sha1
, DEFAULT_ABBREV
));
1358 printf(_("Updating %s..%s\n"),
1360 find_unique_abbrev(remoteheads
->item
->object
.sha1
,
1362 strbuf_addstr(&msg
, "Fast-forward");
1365 " (no commit created; -m option ignored)");
1366 commit
= remoteheads
->item
;
1372 if (checkout_fast_forward(head_commit
->object
.sha1
,
1373 commit
->object
.sha1
,
1374 overwrite_ignore
)) {
1379 finish(head_commit
, remoteheads
, commit
->object
.sha1
, msg
.buf
);
1382 } else if (!remoteheads
->next
&& common
->next
)
1385 * We are not doing octopus and not fast-forward. Need
1388 else if (!remoteheads
->next
&& !common
->next
&& option_commit
) {
1390 * We are not doing octopus, not fast-forward, and have
1393 refresh_cache(REFRESH_QUIET
);
1394 if (allow_trivial
&& !fast_forward_only
) {
1395 /* See if it is really trivial. */
1396 git_committer_info(IDENT_STRICT
);
1397 printf(_("Trying really trivial in-index merge...\n"));
1398 if (!read_tree_trivial(common
->item
->object
.sha1
,
1399 head_commit
->object
.sha1
,
1400 remoteheads
->item
->object
.sha1
)) {
1401 ret
= merge_trivial(head_commit
, remoteheads
);
1404 printf(_("Nope.\n"));
1408 * An octopus. If we can reach all the remote we are up
1412 struct commit_list
*j
;
1414 for (j
= remoteheads
; j
; j
= j
->next
) {
1415 struct commit_list
*common_one
;
1418 * Here we *have* to calculate the individual
1419 * merge_bases again, otherwise "git merge HEAD^
1420 * HEAD^^" would be missed.
1422 common_one
= get_merge_bases(head_commit
, j
->item
, 1);
1423 if (hashcmp(common_one
->item
->object
.sha1
,
1424 j
->item
->object
.sha1
)) {
1430 finish_up_to_date("Already up-to-date. Yeeah!");
1435 if (fast_forward_only
)
1436 die(_("Not possible to fast-forward, aborting."));
1438 /* We are going to make a new commit. */
1439 git_committer_info(IDENT_STRICT
);
1442 * At this point, we need a real merge. No matter what strategy
1443 * we use, it would operate on the index, possibly affecting the
1444 * working tree, and when resolved cleanly, have the desired
1445 * tree in the index -- this means that the index must be in
1446 * sync with the head commit. The strategies are responsible
1449 if (use_strategies_nr
== 1 ||
1451 * Stash away the local changes so that we can try more than one.
1454 hashcpy(stash
, null_sha1
);
1456 for (i
= 0; i
< use_strategies_nr
; i
++) {
1459 printf(_("Rewinding the tree to pristine...\n"));
1460 restore_state(head_commit
->object
.sha1
, stash
);
1462 if (use_strategies_nr
!= 1)
1463 printf(_("Trying merge strategy %s...\n"),
1464 use_strategies
[i
]->name
);
1466 * Remember which strategy left the state in the working
1469 wt_strategy
= use_strategies
[i
]->name
;
1471 ret
= try_merge_strategy(use_strategies
[i
]->name
,
1472 common
, remoteheads
,
1473 head_commit
, head_arg
);
1474 if (!option_commit
&& !ret
) {
1477 * This is necessary here just to avoid writing
1478 * the tree, but later we will *not* exit with
1479 * status code 1 because merge_was_ok is set.
1486 * The backend exits with 1 when conflicts are
1487 * left to be resolved, with 2 when it does not
1488 * handle the given merge at all.
1491 int cnt
= evaluate_result();
1493 if (best_cnt
<= 0 || cnt
<= best_cnt
) {
1494 best_strategy
= use_strategies
[i
]->name
;
1504 /* Automerge succeeded. */
1505 write_tree_trivial(result_tree
);
1506 automerge_was_ok
= 1;
1511 * If we have a resulting tree, that means the strategy module
1512 * auto resolved the merge cleanly.
1514 if (automerge_was_ok
) {
1515 ret
= finish_automerge(head_commit
, head_subsumed
,
1516 common
, remoteheads
,
1517 result_tree
, wt_strategy
);
1522 * Pick the result from the best strategy and have the user fix
1525 if (!best_strategy
) {
1526 restore_state(head_commit
->object
.sha1
, stash
);
1527 if (use_strategies_nr
> 1)
1529 _("No merge strategy handled the merge.\n"));
1531 fprintf(stderr
, _("Merge with strategy %s failed.\n"),
1532 use_strategies
[0]->name
);
1535 } else if (best_strategy
== wt_strategy
)
1536 ; /* We already have its result in the working tree. */
1538 printf(_("Rewinding the tree to pristine...\n"));
1539 restore_state(head_commit
->object
.sha1
, stash
);
1540 printf(_("Using the %s to prepare resolving by hand.\n"),
1542 try_merge_strategy(best_strategy
, common
, remoteheads
,
1543 head_commit
, head_arg
);
1547 finish(head_commit
, remoteheads
, NULL
, NULL
);
1549 write_merge_state(remoteheads
);
1552 fprintf(stderr
, _("Automatic merge went well; "
1553 "stopped before committing as requested\n"));
1555 ret
= suggest_conflicts(option_renormalize
);
1558 free(branch_to_free
);