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;
51 static int 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
= 1;
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
;
85 static enum ff_type fast_forward
= FF_ALLOW
;
87 static int option_parse_message(const struct option
*opt
,
88 const char *arg
, int unset
)
90 struct strbuf
*buf
= opt
->value
;
93 strbuf_setlen(buf
, 0);
95 strbuf_addf(buf
, "%s%s", buf
->len
? "\n\n" : "", arg
);
98 return error(_("switch `m' requires a value"));
102 static struct strategy
*get_strategy(const char *name
)
105 struct strategy
*ret
;
106 static struct cmdnames main_cmds
, other_cmds
;
112 for (i
= 0; i
< ARRAY_SIZE(all_strategy
); i
++)
113 if (!strcmp(name
, all_strategy
[i
].name
))
114 return &all_strategy
[i
];
117 struct cmdnames not_strategies
;
120 memset(¬_strategies
, 0, sizeof(struct cmdnames
));
121 load_command_list("git-merge-", &main_cmds
, &other_cmds
);
122 for (i
= 0; i
< main_cmds
.cnt
; i
++) {
124 struct cmdname
*ent
= main_cmds
.names
[i
];
125 for (j
= 0; j
< ARRAY_SIZE(all_strategy
); j
++)
126 if (!strncmp(ent
->name
, all_strategy
[j
].name
, ent
->len
)
127 && !all_strategy
[j
].name
[ent
->len
])
130 add_cmdname(¬_strategies
, ent
->name
, ent
->len
);
132 exclude_cmds(&main_cmds
, ¬_strategies
);
134 if (!is_in_cmdlist(&main_cmds
, name
) && !is_in_cmdlist(&other_cmds
, name
)) {
135 fprintf(stderr
, _("Could not find merge strategy '%s'.\n"), name
);
136 fprintf(stderr
, _("Available strategies are:"));
137 for (i
= 0; i
< main_cmds
.cnt
; i
++)
138 fprintf(stderr
, " %s", main_cmds
.names
[i
]->name
);
139 fprintf(stderr
, ".\n");
140 if (other_cmds
.cnt
) {
141 fprintf(stderr
, _("Available custom strategies are:"));
142 for (i
= 0; i
< other_cmds
.cnt
; i
++)
143 fprintf(stderr
, " %s", other_cmds
.names
[i
]->name
);
144 fprintf(stderr
, ".\n");
149 ret
= xcalloc(1, sizeof(struct strategy
));
150 ret
->name
= xstrdup(name
);
151 ret
->attr
= NO_TRIVIAL
;
155 static void append_strategy(struct strategy
*s
)
157 ALLOC_GROW(use_strategies
, use_strategies_nr
+ 1, use_strategies_alloc
);
158 use_strategies
[use_strategies_nr
++] = s
;
161 static int option_parse_strategy(const struct option
*opt
,
162 const char *name
, int unset
)
167 append_strategy(get_strategy(name
));
171 static int option_parse_x(const struct option
*opt
,
172 const char *arg
, int unset
)
177 ALLOC_GROW(xopts
, xopts_nr
+ 1, xopts_alloc
);
178 xopts
[xopts_nr
++] = xstrdup(arg
);
182 static int option_parse_n(const struct option
*opt
,
183 const char *arg
, int unset
)
185 show_diffstat
= unset
;
189 static struct option builtin_merge_options
[] = {
190 { OPTION_CALLBACK
, 'n', NULL
, NULL
, NULL
,
191 N_("do not show a diffstat at the end of the merge"),
192 PARSE_OPT_NOARG
, option_parse_n
},
193 OPT_BOOL(0, "stat", &show_diffstat
,
194 N_("show a diffstat at the end of the merge")),
195 OPT_BOOL(0, "summary", &show_diffstat
, N_("(synonym to --stat)")),
196 { OPTION_INTEGER
, 0, "log", &shortlog_len
, N_("n"),
197 N_("add (at most <n>) entries from shortlog to merge commit message"),
198 PARSE_OPT_OPTARG
, NULL
, DEFAULT_MERGE_LOG_LEN
},
199 OPT_BOOL(0, "squash", &squash
,
200 N_("create a single commit instead of doing a merge")),
201 OPT_BOOL(0, "commit", &option_commit
,
202 N_("perform a commit if the merge succeeds (default)")),
203 OPT_BOOL('e', "edit", &option_edit
,
204 N_("edit message before committing")),
205 OPT_SET_INT(0, "ff", &fast_forward
, N_("allow fast-forward (default)"), FF_ALLOW
),
206 { OPTION_SET_INT
, 0, "ff-only", &fast_forward
, NULL
,
207 N_("abort if fast-forward is not possible"),
208 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
, NULL
, FF_ONLY
},
209 OPT_RERERE_AUTOUPDATE(&allow_rerere_auto
),
210 OPT_BOOL(0, "verify-signatures", &verify_signatures
,
211 N_("Verify that the named commit has a valid GPG signature")),
212 OPT_CALLBACK('s', "strategy", &use_strategies
, N_("strategy"),
213 N_("merge strategy to use"), option_parse_strategy
),
214 OPT_CALLBACK('X', "strategy-option", &xopts
, N_("option=value"),
215 N_("option for selected merge strategy"), option_parse_x
),
216 OPT_CALLBACK('m', "message", &merge_msg
, N_("message"),
217 N_("merge commit message (for a non-fast-forward merge)"),
218 option_parse_message
),
219 OPT__VERBOSITY(&verbosity
),
220 OPT_BOOL(0, "abort", &abort_current_merge
,
221 N_("abort the current in-progress merge")),
222 OPT_SET_INT(0, "progress", &show_progress
, N_("force progress reporting"), 1),
223 { OPTION_STRING
, 'S', "gpg-sign", &sign_commit
, N_("key-id"),
224 N_("GPG sign commit"), PARSE_OPT_OPTARG
, NULL
, (intptr_t) "" },
225 OPT_BOOL(0, "overwrite-ignore", &overwrite_ignore
, N_("update ignored files (default)")),
229 /* Cleans up metadata that is uninteresting after a succeeded merge. */
230 static void drop_save(void)
232 unlink(git_path("MERGE_HEAD"));
233 unlink(git_path("MERGE_MSG"));
234 unlink(git_path("MERGE_MODE"));
237 static int save_state(unsigned char *stash
)
240 struct child_process cp
= CHILD_PROCESS_INIT
;
241 struct strbuf buffer
= STRBUF_INIT
;
242 const char *argv
[] = {"stash", "create", NULL
};
248 if (start_command(&cp
))
249 die(_("could not run stash."));
250 len
= strbuf_read(&buffer
, cp
.out
, 1024);
253 if (finish_command(&cp
) || len
< 0)
254 die(_("stash failed"));
255 else if (!len
) /* no changes */
257 strbuf_setlen(&buffer
, buffer
.len
-1);
258 if (get_sha1(buffer
.buf
, stash
))
259 die(_("not a valid object: %s"), buffer
.buf
);
263 static void read_empty(unsigned const char *sha1
, int verbose
)
268 args
[i
++] = "read-tree";
273 args
[i
++] = EMPTY_TREE_SHA1_HEX
;
274 args
[i
++] = sha1_to_hex(sha1
);
277 if (run_command_v_opt(args
, RUN_GIT_CMD
))
278 die(_("read-tree failed"));
281 static void reset_hard(unsigned const char *sha1
, int verbose
)
286 args
[i
++] = "read-tree";
289 args
[i
++] = "--reset";
291 args
[i
++] = sha1_to_hex(sha1
);
294 if (run_command_v_opt(args
, RUN_GIT_CMD
))
295 die(_("read-tree failed"));
298 static void restore_state(const unsigned char *head
,
299 const unsigned char *stash
)
301 struct strbuf sb
= STRBUF_INIT
;
302 const char *args
[] = { "stash", "apply", NULL
, NULL
};
304 if (is_null_sha1(stash
))
309 args
[2] = sha1_to_hex(stash
);
312 * It is OK to ignore error here, for example when there was
313 * nothing to restore.
315 run_command_v_opt(args
, RUN_GIT_CMD
);
318 refresh_cache(REFRESH_QUIET
);
321 /* This is called when no merge was necessary. */
322 static void finish_up_to_date(const char *msg
)
325 printf("%s%s\n", squash
? _(" (nothing to squash)") : "", msg
);
329 static void squash_message(struct commit
*commit
, struct commit_list
*remoteheads
)
332 struct strbuf out
= STRBUF_INIT
;
333 struct commit_list
*j
;
334 const char *filename
;
336 struct pretty_print_context ctx
= {0};
338 printf(_("Squash commit -- not updating HEAD\n"));
339 filename
= git_path("SQUASH_MSG");
340 fd
= open(filename
, O_WRONLY
| O_CREAT
, 0666);
342 die_errno(_("Could not write to '%s'"), filename
);
344 init_revisions(&rev
, NULL
);
345 rev
.ignore_merges
= 1;
346 rev
.commit_format
= CMIT_FMT_MEDIUM
;
348 commit
->object
.flags
|= UNINTERESTING
;
349 add_pending_object(&rev
, &commit
->object
, NULL
);
351 for (j
= remoteheads
; j
; j
= j
->next
)
352 add_pending_object(&rev
, &j
->item
->object
, NULL
);
354 setup_revisions(0, NULL
, &rev
, NULL
);
355 if (prepare_revision_walk(&rev
))
356 die(_("revision walk setup failed"));
358 ctx
.abbrev
= rev
.abbrev
;
359 ctx
.date_mode
= rev
.date_mode
;
360 ctx
.fmt
= rev
.commit_format
;
362 strbuf_addstr(&out
, "Squashed commit of the following:\n");
363 while ((commit
= get_revision(&rev
)) != NULL
) {
364 strbuf_addch(&out
, '\n');
365 strbuf_addf(&out
, "commit %s\n",
366 sha1_to_hex(commit
->object
.sha1
));
367 pretty_print_commit(&ctx
, commit
, &out
);
369 if (write_in_full(fd
, out
.buf
, out
.len
) != out
.len
)
370 die_errno(_("Writing SQUASH_MSG"));
372 die_errno(_("Finishing SQUASH_MSG"));
373 strbuf_release(&out
);
376 static void finish(struct commit
*head_commit
,
377 struct commit_list
*remoteheads
,
378 const unsigned char *new_head
, const char *msg
)
380 struct strbuf reflog_message
= STRBUF_INIT
;
381 const unsigned char *head
= head_commit
->object
.sha1
;
384 strbuf_addstr(&reflog_message
, getenv("GIT_REFLOG_ACTION"));
388 strbuf_addf(&reflog_message
, "%s: %s",
389 getenv("GIT_REFLOG_ACTION"), msg
);
392 squash_message(head_commit
, remoteheads
);
394 if (verbosity
>= 0 && !merge_msg
.len
)
395 printf(_("No merge message -- not updating HEAD\n"));
397 const char *argv_gc_auto
[] = { "gc", "--auto", NULL
};
398 update_ref(reflog_message
.buf
, "HEAD",
400 UPDATE_REFS_DIE_ON_ERR
);
402 * We ignore errors in 'gc --auto', since the
403 * user should see them.
405 run_command_v_opt(argv_gc_auto
, RUN_GIT_CMD
);
408 if (new_head
&& show_diffstat
) {
409 struct diff_options opts
;
411 opts
.stat_width
= -1; /* use full terminal width */
412 opts
.stat_graph_width
= -1; /* respect statGraphWidth config */
413 opts
.output_format
|=
414 DIFF_FORMAT_SUMMARY
| DIFF_FORMAT_DIFFSTAT
;
415 opts
.detect_rename
= DIFF_DETECT_RENAME
;
416 diff_setup_done(&opts
);
417 diff_tree_sha1(head
, new_head
, "", &opts
);
422 /* Run a post-merge hook */
423 run_hook_le(NULL
, "post-merge", squash
? "1" : "0", NULL
);
425 strbuf_release(&reflog_message
);
428 /* Get the name for the merge commit's message. */
429 static void merge_name(const char *remote
, struct strbuf
*msg
)
431 struct commit
*remote_head
;
432 unsigned char branch_head
[20];
433 struct strbuf buf
= STRBUF_INIT
;
434 struct strbuf bname
= STRBUF_INIT
;
439 strbuf_branchname(&bname
, remote
);
442 memset(branch_head
, 0, sizeof(branch_head
));
443 remote_head
= get_merge_parent(remote
);
445 die(_("'%s' does not point to a commit"), remote
);
447 if (dwim_ref(remote
, strlen(remote
), branch_head
, &found_ref
) > 0) {
448 if (starts_with(found_ref
, "refs/heads/")) {
449 strbuf_addf(msg
, "%s\t\tbranch '%s' of .\n",
450 sha1_to_hex(branch_head
), remote
);
453 if (starts_with(found_ref
, "refs/tags/")) {
454 strbuf_addf(msg
, "%s\t\ttag '%s' of .\n",
455 sha1_to_hex(branch_head
), remote
);
458 if (starts_with(found_ref
, "refs/remotes/")) {
459 strbuf_addf(msg
, "%s\t\tremote-tracking branch '%s' of .\n",
460 sha1_to_hex(branch_head
), remote
);
465 /* See if remote matches <name>^^^.. or <name>~<number> */
466 for (len
= 0, ptr
= remote
+ strlen(remote
);
467 remote
< ptr
&& ptr
[-1] == '^';
474 ptr
= strrchr(remote
, '~');
476 int seen_nonzero
= 0;
479 while (*++ptr
&& isdigit(*ptr
)) {
480 seen_nonzero
|= (*ptr
!= '0');
484 len
= 0; /* not ...~<number> */
485 else if (seen_nonzero
)
488 early
= 1; /* "name~" is "name~1"! */
492 struct strbuf truname
= STRBUF_INIT
;
493 strbuf_addstr(&truname
, "refs/heads/");
494 strbuf_addstr(&truname
, remote
);
495 strbuf_setlen(&truname
, truname
.len
- len
);
496 if (ref_exists(truname
.buf
)) {
498 "%s\t\tbranch '%s'%s of .\n",
499 sha1_to_hex(remote_head
->object
.sha1
),
501 (early
? " (early part)" : ""));
502 strbuf_release(&truname
);
507 if (!strcmp(remote
, "FETCH_HEAD") &&
508 !access(git_path("FETCH_HEAD"), R_OK
)) {
509 const char *filename
;
511 struct strbuf line
= STRBUF_INIT
;
514 filename
= git_path("FETCH_HEAD");
515 fp
= fopen(filename
, "r");
517 die_errno(_("could not open '%s' for reading"),
519 strbuf_getline(&line
, fp
, '\n');
521 ptr
= strstr(line
.buf
, "\tnot-for-merge\t");
523 strbuf_remove(&line
, ptr
-line
.buf
+1, 13);
524 strbuf_addbuf(msg
, &line
);
525 strbuf_release(&line
);
529 if (remote_head
->util
) {
530 struct merge_remote_desc
*desc
;
531 desc
= merge_remote_util(remote_head
);
532 if (desc
&& desc
->obj
&& desc
->obj
->type
== OBJ_TAG
) {
533 strbuf_addf(msg
, "%s\t\t%s '%s'\n",
534 sha1_to_hex(desc
->obj
->sha1
),
535 typename(desc
->obj
->type
),
541 strbuf_addf(msg
, "%s\t\tcommit '%s'\n",
542 sha1_to_hex(remote_head
->object
.sha1
), remote
);
544 strbuf_release(&buf
);
545 strbuf_release(&bname
);
548 static void parse_branch_merge_options(char *bmo
)
555 argc
= split_cmdline(bmo
, &argv
);
557 die(_("Bad branch.%s.mergeoptions string: %s"), branch
,
558 split_cmdline_strerror(argc
));
559 REALLOC_ARRAY(argv
, argc
+ 2);
560 memmove(argv
+ 1, argv
, sizeof(*argv
) * (argc
+ 1));
562 argv
[0] = "branch.*.mergeoptions";
563 parse_options(argc
, argv
, NULL
, builtin_merge_options
,
564 builtin_merge_usage
, 0);
568 static int git_merge_config(const char *k
, const char *v
, void *cb
)
572 if (branch
&& starts_with(k
, "branch.") &&
573 starts_with(k
+ 7, branch
) &&
574 !strcmp(k
+ 7 + strlen(branch
), ".mergeoptions")) {
575 free(branch_mergeoptions
);
576 branch_mergeoptions
= xstrdup(v
);
580 if (!strcmp(k
, "merge.diffstat") || !strcmp(k
, "merge.stat"))
581 show_diffstat
= git_config_bool(k
, v
);
582 else if (!strcmp(k
, "pull.twohead"))
583 return git_config_string(&pull_twohead
, k
, v
);
584 else if (!strcmp(k
, "pull.octopus"))
585 return git_config_string(&pull_octopus
, k
, v
);
586 else if (!strcmp(k
, "merge.renormalize"))
587 option_renormalize
= git_config_bool(k
, v
);
588 else if (!strcmp(k
, "merge.ff")) {
589 int boolval
= git_config_maybe_bool(k
, v
);
591 fast_forward
= boolval
? FF_ALLOW
: FF_NO
;
592 } else if (v
&& !strcmp(v
, "only")) {
593 fast_forward
= FF_ONLY
;
594 } /* do not barf on values from future versions of git */
596 } else if (!strcmp(k
, "merge.defaulttoupstream")) {
597 default_to_upstream
= git_config_bool(k
, v
);
599 } else if (!strcmp(k
, "commit.gpgsign")) {
600 sign_commit
= git_config_bool(k
, v
) ? "" : NULL
;
604 status
= fmt_merge_msg_config(k
, v
, cb
);
607 status
= git_gpg_config(k
, v
, NULL
);
610 return git_diff_ui_config(k
, v
, cb
);
613 static int read_tree_trivial(unsigned char *common
, unsigned char *head
,
617 struct tree
*trees
[MAX_UNPACK_TREES
];
618 struct tree_desc t
[MAX_UNPACK_TREES
];
619 struct unpack_trees_options opts
;
621 memset(&opts
, 0, sizeof(opts
));
623 opts
.src_index
= &the_index
;
624 opts
.dst_index
= &the_index
;
626 opts
.verbose_update
= 1;
627 opts
.trivial_merges_only
= 1;
629 trees
[nr_trees
] = parse_tree_indirect(common
);
630 if (!trees
[nr_trees
++])
632 trees
[nr_trees
] = parse_tree_indirect(head
);
633 if (!trees
[nr_trees
++])
635 trees
[nr_trees
] = parse_tree_indirect(one
);
636 if (!trees
[nr_trees
++])
638 opts
.fn
= threeway_merge
;
639 cache_tree_free(&active_cache_tree
);
640 for (i
= 0; i
< nr_trees
; i
++) {
641 parse_tree(trees
[i
]);
642 init_tree_desc(t
+i
, trees
[i
]->buffer
, trees
[i
]->size
);
644 if (unpack_trees(nr_trees
, t
, &opts
))
649 static void write_tree_trivial(unsigned char *sha1
)
651 if (write_cache_as_tree(sha1
, 0, NULL
))
652 die(_("git write-tree failed to write a tree"));
655 static int try_merge_strategy(const char *strategy
, struct commit_list
*common
,
656 struct commit_list
*remoteheads
,
657 struct commit
*head
, const char *head_arg
)
659 struct lock_file
*lock
= xcalloc(1, sizeof(struct lock_file
));
661 hold_locked_index(lock
, 1);
662 refresh_cache(REFRESH_QUIET
);
663 if (active_cache_changed
&&
664 write_locked_index(&the_index
, lock
, COMMIT_LOCK
))
665 return error(_("Unable to write index."));
666 rollback_lock_file(lock
);
668 if (!strcmp(strategy
, "recursive") || !strcmp(strategy
, "subtree")) {
670 struct commit
*result
;
671 struct commit_list
*reversed
= NULL
;
672 struct merge_options o
;
673 struct commit_list
*j
;
675 if (remoteheads
->next
) {
676 error(_("Not handling anything other than two heads merge."));
680 init_merge_options(&o
);
681 if (!strcmp(strategy
, "subtree"))
682 o
.subtree_shift
= "";
684 o
.renormalize
= option_renormalize
;
685 o
.show_rename_progress
=
686 show_progress
== -1 ? isatty(2) : show_progress
;
688 for (x
= 0; x
< xopts_nr
; x
++)
689 if (parse_merge_opt(&o
, xopts
[x
]))
690 die(_("Unknown option for merge-recursive: -X%s"), xopts
[x
]);
692 o
.branch1
= head_arg
;
693 o
.branch2
= merge_remote_util(remoteheads
->item
)->name
;
695 for (j
= common
; j
; j
= j
->next
)
696 commit_list_insert(j
->item
, &reversed
);
698 hold_locked_index(lock
, 1);
699 clean
= merge_recursive(&o
, head
,
700 remoteheads
->item
, reversed
, &result
);
701 if (active_cache_changed
&&
702 write_locked_index(&the_index
, lock
, COMMIT_LOCK
))
703 die (_("unable to write %s"), get_index_file());
704 rollback_lock_file(lock
);
705 return clean
? 0 : 1;
707 return try_merge_command(strategy
, xopts_nr
, xopts
,
708 common
, head_arg
, remoteheads
);
712 static void count_diff_files(struct diff_queue_struct
*q
,
713 struct diff_options
*opt
, void *data
)
720 static int count_unmerged_entries(void)
724 for (i
= 0; i
< active_nr
; i
++)
725 if (ce_stage(active_cache
[i
]))
731 static void split_merge_strategies(const char *string
, struct strategy
**list
,
739 buf
= xstrdup(string
);
744 ALLOC_GROW(*list
, *nr
+ 1, *alloc
);
745 (*list
)[(*nr
)++].name
= xstrdup(q
);
750 ALLOC_GROW(*list
, *nr
+ 1, *alloc
);
751 (*list
)[(*nr
)++].name
= xstrdup(q
);
757 static void add_strategies(const char *string
, unsigned attr
)
759 struct strategy
*list
= NULL
;
760 int list_alloc
= 0, list_nr
= 0, i
;
762 memset(&list
, 0, sizeof(list
));
763 split_merge_strategies(string
, &list
, &list_nr
, &list_alloc
);
765 for (i
= 0; i
< list_nr
; i
++)
766 append_strategy(get_strategy(list
[i
].name
));
769 for (i
= 0; i
< ARRAY_SIZE(all_strategy
); i
++)
770 if (all_strategy
[i
].attr
& attr
)
771 append_strategy(&all_strategy
[i
]);
775 static void write_merge_msg(struct strbuf
*msg
)
777 const char *filename
= git_path("MERGE_MSG");
778 int fd
= open(filename
, O_WRONLY
| O_CREAT
, 0666);
780 die_errno(_("Could not open '%s' for writing"),
782 if (write_in_full(fd
, msg
->buf
, msg
->len
) != msg
->len
)
783 die_errno(_("Could not write to '%s'"), filename
);
787 static void read_merge_msg(struct strbuf
*msg
)
789 const char *filename
= git_path("MERGE_MSG");
791 if (strbuf_read_file(msg
, filename
, 0) < 0)
792 die_errno(_("Could not read from '%s'"), filename
);
795 static void write_merge_state(struct commit_list
*);
796 static void abort_commit(struct commit_list
*remoteheads
, const char *err_msg
)
799 error("%s", err_msg
);
801 _("Not committing merge; use 'git commit' to complete the merge.\n"));
802 write_merge_state(remoteheads
);
806 static const char merge_editor_comment
[] =
807 N_("Please enter a commit message to explain why this merge is necessary,\n"
808 "especially if it merges an updated upstream into a topic branch.\n"
810 "Lines starting with '%c' will be ignored, and an empty message aborts\n"
813 static void prepare_to_commit(struct commit_list
*remoteheads
)
815 struct strbuf msg
= STRBUF_INIT
;
816 strbuf_addbuf(&msg
, &merge_msg
);
817 strbuf_addch(&msg
, '\n');
819 strbuf_commented_addf(&msg
, _(merge_editor_comment
), comment_line_char
);
820 write_merge_msg(&msg
);
821 if (run_commit_hook(0 < option_edit
, get_index_file(), "prepare-commit-msg",
822 git_path("MERGE_MSG"), "merge", NULL
))
823 abort_commit(remoteheads
, NULL
);
824 if (0 < option_edit
) {
825 if (launch_editor(git_path("MERGE_MSG"), NULL
, NULL
))
826 abort_commit(remoteheads
, NULL
);
828 read_merge_msg(&msg
);
829 stripspace(&msg
, 0 < option_edit
);
831 abort_commit(remoteheads
, _("Empty commit message."));
832 strbuf_release(&merge_msg
);
833 strbuf_addbuf(&merge_msg
, &msg
);
834 strbuf_release(&msg
);
837 static int merge_trivial(struct commit
*head
, struct commit_list
*remoteheads
)
839 unsigned char result_tree
[20], result_commit
[20];
840 struct commit_list
*parents
, **pptr
= &parents
;
842 write_tree_trivial(result_tree
);
843 printf(_("Wonderful.\n"));
844 pptr
= commit_list_append(head
, pptr
);
845 pptr
= commit_list_append(remoteheads
->item
, pptr
);
846 prepare_to_commit(remoteheads
);
847 if (commit_tree(merge_msg
.buf
, merge_msg
.len
, result_tree
, parents
,
848 result_commit
, NULL
, sign_commit
))
849 die(_("failed to write commit object"));
850 finish(head
, remoteheads
, result_commit
, "In-index merge");
855 static int finish_automerge(struct commit
*head
,
857 struct commit_list
*common
,
858 struct commit_list
*remoteheads
,
859 unsigned char *result_tree
,
860 const char *wt_strategy
)
862 struct commit_list
*parents
= NULL
;
863 struct strbuf buf
= STRBUF_INIT
;
864 unsigned char result_commit
[20];
866 free_commit_list(common
);
867 parents
= remoteheads
;
868 if (!head_subsumed
|| fast_forward
== FF_NO
)
869 commit_list_insert(head
, &parents
);
870 strbuf_addch(&merge_msg
, '\n');
871 prepare_to_commit(remoteheads
);
872 if (commit_tree(merge_msg
.buf
, merge_msg
.len
, result_tree
, parents
,
873 result_commit
, NULL
, sign_commit
))
874 die(_("failed to write commit object"));
875 strbuf_addf(&buf
, "Merge made by the '%s' strategy.", wt_strategy
);
876 finish(head
, remoteheads
, result_commit
, buf
.buf
);
877 strbuf_release(&buf
);
882 static int suggest_conflicts(int renormalizing
)
884 const char *filename
;
888 filename
= git_path("MERGE_MSG");
889 fp
= fopen(filename
, "a");
891 die_errno(_("Could not open '%s' for writing"), filename
);
892 fprintf(fp
, "\nConflicts:\n");
893 for (pos
= 0; pos
< active_nr
; pos
++) {
894 const struct cache_entry
*ce
= active_cache
[pos
];
897 fprintf(fp
, "\t%s\n", ce
->name
);
898 while (pos
+ 1 < active_nr
&&
900 active_cache
[pos
+ 1]->name
))
905 rerere(allow_rerere_auto
);
906 printf(_("Automatic merge failed; "
907 "fix conflicts and then commit the result.\n"));
911 static struct commit
*is_old_style_invocation(int argc
, const char **argv
,
912 const unsigned char *head
)
914 struct commit
*second_token
= NULL
;
916 unsigned char second_sha1
[20];
918 if (get_sha1(argv
[1], second_sha1
))
920 second_token
= lookup_commit_reference_gently(second_sha1
, 0);
922 die(_("'%s' is not a commit"), argv
[1]);
923 if (hashcmp(second_token
->object
.sha1
, head
))
929 static int evaluate_result(void)
934 /* Check how many files differ. */
935 init_revisions(&rev
, "");
936 setup_revisions(0, NULL
, &rev
, NULL
);
937 rev
.diffopt
.output_format
|=
938 DIFF_FORMAT_CALLBACK
;
939 rev
.diffopt
.format_callback
= count_diff_files
;
940 rev
.diffopt
.format_callback_data
= &cnt
;
941 run_diff_files(&rev
, 0);
944 * Check how many unmerged entries are
947 cnt
+= count_unmerged_entries();
953 * Pretend as if the user told us to merge with the remote-tracking
954 * branch we have for the upstream of the current branch
956 static int setup_with_upstream(const char ***argv
)
958 struct branch
*branch
= branch_get(NULL
);
963 die(_("No current branch."));
965 die(_("No remote for the current branch."));
966 if (!branch
->merge_nr
)
967 die(_("No default upstream defined for the current branch."));
969 args
= xcalloc(branch
->merge_nr
+ 1, sizeof(char *));
970 for (i
= 0; i
< branch
->merge_nr
; i
++) {
971 if (!branch
->merge
[i
]->dst
)
972 die(_("No remote-tracking branch for %s from %s"),
973 branch
->merge
[i
]->src
, branch
->remote_name
);
974 args
[i
] = branch
->merge
[i
]->dst
;
981 static void write_merge_state(struct commit_list
*remoteheads
)
983 const char *filename
;
985 struct commit_list
*j
;
986 struct strbuf buf
= STRBUF_INIT
;
988 for (j
= remoteheads
; j
; j
= j
->next
) {
989 unsigned const char *sha1
;
990 struct commit
*c
= j
->item
;
991 if (c
->util
&& merge_remote_util(c
)->obj
) {
992 sha1
= merge_remote_util(c
)->obj
->sha1
;
994 sha1
= c
->object
.sha1
;
996 strbuf_addf(&buf
, "%s\n", sha1_to_hex(sha1
));
998 filename
= git_path("MERGE_HEAD");
999 fd
= open(filename
, O_WRONLY
| O_CREAT
, 0666);
1001 die_errno(_("Could not open '%s' for writing"), filename
);
1002 if (write_in_full(fd
, buf
.buf
, buf
.len
) != buf
.len
)
1003 die_errno(_("Could not write to '%s'"), filename
);
1005 strbuf_addch(&merge_msg
, '\n');
1006 write_merge_msg(&merge_msg
);
1008 filename
= git_path("MERGE_MODE");
1009 fd
= open(filename
, O_WRONLY
| O_CREAT
| O_TRUNC
, 0666);
1011 die_errno(_("Could not open '%s' for writing"), filename
);
1013 if (fast_forward
== FF_NO
)
1014 strbuf_addf(&buf
, "no-ff");
1015 if (write_in_full(fd
, buf
.buf
, buf
.len
) != buf
.len
)
1016 die_errno(_("Could not write to '%s'"), filename
);
1020 static int default_edit_option(void)
1022 static const char name
[] = "GIT_MERGE_AUTOEDIT";
1023 const char *e
= getenv(name
);
1024 struct stat st_stdin
, st_stdout
;
1027 /* an explicit -m msg without --[no-]edit */
1031 int v
= git_config_maybe_bool(name
, e
);
1033 die("Bad value '%s' in environment '%s'", e
, name
);
1037 /* Use editor if stdin and stdout are the same and is a tty */
1038 return (!fstat(0, &st_stdin
) &&
1039 !fstat(1, &st_stdout
) &&
1040 isatty(0) && isatty(1) &&
1041 st_stdin
.st_dev
== st_stdout
.st_dev
&&
1042 st_stdin
.st_ino
== st_stdout
.st_ino
&&
1043 st_stdin
.st_mode
== st_stdout
.st_mode
);
1046 static struct commit_list
*collect_parents(struct commit
*head_commit
,
1048 int argc
, const char **argv
)
1051 struct commit_list
*remoteheads
= NULL
, *parents
, *next
;
1052 struct commit_list
**remotes
= &remoteheads
;
1055 remotes
= &commit_list_insert(head_commit
, remotes
)->next
;
1056 for (i
= 0; i
< argc
; i
++) {
1057 struct commit
*commit
= get_merge_parent(argv
[i
]);
1059 help_unknown_ref(argv
[i
], "merge",
1060 "not something we can merge");
1061 remotes
= &commit_list_insert(commit
, remotes
)->next
;
1065 parents
= reduce_heads(remoteheads
);
1067 *head_subsumed
= 1; /* we will flip this to 0 when we find it */
1068 for (remoteheads
= NULL
, remotes
= &remoteheads
;
1071 struct commit
*commit
= parents
->item
;
1072 next
= parents
->next
;
1073 if (commit
== head_commit
)
1076 remotes
= &commit_list_insert(commit
, remotes
)->next
;
1081 int cmd_merge(int argc
, const char **argv
, const char *prefix
)
1083 unsigned char result_tree
[20];
1084 unsigned char stash
[20];
1085 unsigned char head_sha1
[20];
1086 struct commit
*head_commit
;
1087 struct strbuf buf
= STRBUF_INIT
;
1088 const char *head_arg
;
1089 int flag
, i
, ret
= 0, head_subsumed
;
1090 int best_cnt
= -1, merge_was_ok
= 0, automerge_was_ok
= 0;
1091 struct commit_list
*common
= NULL
;
1092 const char *best_strategy
= NULL
, *wt_strategy
= NULL
;
1093 struct commit_list
*remoteheads
, *p
;
1094 void *branch_to_free
;
1096 if (argc
== 2 && !strcmp(argv
[1], "-h"))
1097 usage_with_options(builtin_merge_usage
, builtin_merge_options
);
1100 * Check if we are _not_ on a detached HEAD, i.e. if there is a
1103 branch
= branch_to_free
= resolve_refdup("HEAD", head_sha1
, 0, &flag
);
1104 if (branch
&& starts_with(branch
, "refs/heads/"))
1106 if (!branch
|| is_null_sha1(head_sha1
))
1109 head_commit
= lookup_commit_or_die(head_sha1
, "HEAD");
1111 git_config(git_merge_config
, NULL
);
1113 if (branch_mergeoptions
)
1114 parse_branch_merge_options(branch_mergeoptions
);
1115 argc
= parse_options(argc
, argv
, prefix
, builtin_merge_options
,
1116 builtin_merge_usage
, 0);
1117 if (shortlog_len
< 0)
1118 shortlog_len
= (merge_log_config
> 0) ? merge_log_config
: 0;
1120 if (verbosity
< 0 && show_progress
== -1)
1123 if (abort_current_merge
) {
1125 const char *nargv
[] = {"reset", "--merge", NULL
};
1127 if (!file_exists(git_path("MERGE_HEAD")))
1128 die(_("There is no merge to abort (MERGE_HEAD missing)."));
1130 /* Invoke 'git reset --merge' */
1131 ret
= cmd_reset(nargc
, nargv
, prefix
);
1135 if (read_cache_unmerged())
1136 die_resolve_conflict("merge");
1138 if (file_exists(git_path("MERGE_HEAD"))) {
1140 * There is no unmerged entry, don't advise 'git
1141 * add/rm <file>', just 'git commit'.
1143 if (advice_resolve_conflict
)
1144 die(_("You have not concluded your merge (MERGE_HEAD exists).\n"
1145 "Please, commit your changes before you merge."));
1147 die(_("You have not concluded your merge (MERGE_HEAD exists)."));
1149 if (file_exists(git_path("CHERRY_PICK_HEAD"))) {
1150 if (advice_resolve_conflict
)
1151 die(_("You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
1152 "Please, commit your changes before you merge."));
1154 die(_("You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."));
1156 resolve_undo_clear();
1162 if (fast_forward
== FF_NO
)
1163 die(_("You cannot combine --squash with --no-ff."));
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 * commit-ish 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 (fast_forward
== FF_NO
)
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, UPDATE_REFS_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 signature_check_clear(&signature_check
);
1281 strbuf_addstr(&buf
, "merge");
1282 for (p
= remoteheads
; p
; p
= p
->next
)
1283 strbuf_addf(&buf
, " %s", merge_remote_util(p
->item
)->name
);
1284 setenv("GIT_REFLOG_ACTION", buf
.buf
, 0);
1287 for (p
= remoteheads
; p
; p
= p
->next
) {
1288 struct commit
*commit
= p
->item
;
1289 strbuf_addf(&buf
, "GITHEAD_%s",
1290 sha1_to_hex(commit
->object
.sha1
));
1291 setenv(buf
.buf
, merge_remote_util(commit
)->name
, 1);
1293 if (fast_forward
!= FF_ONLY
&&
1294 merge_remote_util(commit
) &&
1295 merge_remote_util(commit
)->obj
&&
1296 merge_remote_util(commit
)->obj
->type
== OBJ_TAG
)
1297 fast_forward
= FF_NO
;
1300 if (option_edit
< 0)
1301 option_edit
= default_edit_option();
1303 if (!use_strategies
) {
1305 ; /* already up-to-date */
1306 else if (!remoteheads
->next
)
1307 add_strategies(pull_twohead
, DEFAULT_TWOHEAD
);
1309 add_strategies(pull_octopus
, DEFAULT_OCTOPUS
);
1312 for (i
= 0; i
< use_strategies_nr
; i
++) {
1313 if (use_strategies
[i
]->attr
& NO_FAST_FORWARD
)
1314 fast_forward
= FF_NO
;
1315 if (use_strategies
[i
]->attr
& NO_TRIVIAL
)
1320 ; /* already up-to-date */
1321 else if (!remoteheads
->next
)
1322 common
= get_merge_bases(head_commit
, remoteheads
->item
, 1);
1324 struct commit_list
*list
= remoteheads
;
1325 commit_list_insert(head_commit
, &list
);
1326 common
= get_octopus_merge_bases(list
);
1330 update_ref("updating ORIG_HEAD", "ORIG_HEAD", head_commit
->object
.sha1
,
1331 NULL
, 0, UPDATE_REFS_DIE_ON_ERR
);
1333 if (remoteheads
&& !common
)
1334 ; /* No common ancestors found. We need a real merge. */
1335 else if (!remoteheads
||
1336 (!remoteheads
->next
&& !common
->next
&&
1337 common
->item
== remoteheads
->item
)) {
1339 * If head can reach all the merge then we are up to date.
1340 * but first the most common case of merging one remote.
1342 finish_up_to_date("Already up-to-date.");
1344 } else if (fast_forward
!= FF_NO
&& !remoteheads
->next
&&
1346 !hashcmp(common
->item
->object
.sha1
, head_commit
->object
.sha1
)) {
1347 /* Again the most common case of merging one remote. */
1348 struct strbuf msg
= STRBUF_INIT
;
1349 struct commit
*commit
;
1352 strcpy(hex
, find_unique_abbrev(head_commit
->object
.sha1
, DEFAULT_ABBREV
));
1355 printf(_("Updating %s..%s\n"),
1357 find_unique_abbrev(remoteheads
->item
->object
.sha1
,
1359 strbuf_addstr(&msg
, "Fast-forward");
1362 " (no commit created; -m option ignored)");
1363 commit
= remoteheads
->item
;
1369 if (checkout_fast_forward(head_commit
->object
.sha1
,
1370 commit
->object
.sha1
,
1371 overwrite_ignore
)) {
1376 finish(head_commit
, remoteheads
, commit
->object
.sha1
, msg
.buf
);
1379 } else if (!remoteheads
->next
&& common
->next
)
1382 * We are not doing octopus and not fast-forward. Need
1385 else if (!remoteheads
->next
&& !common
->next
&& option_commit
) {
1387 * We are not doing octopus, not fast-forward, and have
1390 refresh_cache(REFRESH_QUIET
);
1391 if (allow_trivial
&& fast_forward
!= FF_ONLY
) {
1392 /* See if it is really trivial. */
1393 git_committer_info(IDENT_STRICT
);
1394 printf(_("Trying really trivial in-index merge...\n"));
1395 if (!read_tree_trivial(common
->item
->object
.sha1
,
1396 head_commit
->object
.sha1
,
1397 remoteheads
->item
->object
.sha1
)) {
1398 ret
= merge_trivial(head_commit
, remoteheads
);
1401 printf(_("Nope.\n"));
1405 * An octopus. If we can reach all the remote we are up
1409 struct commit_list
*j
;
1411 for (j
= remoteheads
; j
; j
= j
->next
) {
1412 struct commit_list
*common_one
;
1415 * Here we *have* to calculate the individual
1416 * merge_bases again, otherwise "git merge HEAD^
1417 * HEAD^^" would be missed.
1419 common_one
= get_merge_bases(head_commit
, j
->item
, 1);
1420 if (hashcmp(common_one
->item
->object
.sha1
,
1421 j
->item
->object
.sha1
)) {
1427 finish_up_to_date("Already up-to-date. Yeeah!");
1432 if (fast_forward
== FF_ONLY
)
1433 die(_("Not possible to fast-forward, aborting."));
1435 /* We are going to make a new commit. */
1436 git_committer_info(IDENT_STRICT
);
1439 * At this point, we need a real merge. No matter what strategy
1440 * we use, it would operate on the index, possibly affecting the
1441 * working tree, and when resolved cleanly, have the desired
1442 * tree in the index -- this means that the index must be in
1443 * sync with the head commit. The strategies are responsible
1446 if (use_strategies_nr
== 1 ||
1448 * Stash away the local changes so that we can try more than one.
1451 hashcpy(stash
, null_sha1
);
1453 for (i
= 0; i
< use_strategies_nr
; i
++) {
1456 printf(_("Rewinding the tree to pristine...\n"));
1457 restore_state(head_commit
->object
.sha1
, stash
);
1459 if (use_strategies_nr
!= 1)
1460 printf(_("Trying merge strategy %s...\n"),
1461 use_strategies
[i
]->name
);
1463 * Remember which strategy left the state in the working
1466 wt_strategy
= use_strategies
[i
]->name
;
1468 ret
= try_merge_strategy(use_strategies
[i
]->name
,
1469 common
, remoteheads
,
1470 head_commit
, head_arg
);
1471 if (!option_commit
&& !ret
) {
1474 * This is necessary here just to avoid writing
1475 * the tree, but later we will *not* exit with
1476 * status code 1 because merge_was_ok is set.
1483 * The backend exits with 1 when conflicts are
1484 * left to be resolved, with 2 when it does not
1485 * handle the given merge at all.
1488 int cnt
= evaluate_result();
1490 if (best_cnt
<= 0 || cnt
<= best_cnt
) {
1491 best_strategy
= use_strategies
[i
]->name
;
1501 /* Automerge succeeded. */
1502 write_tree_trivial(result_tree
);
1503 automerge_was_ok
= 1;
1508 * If we have a resulting tree, that means the strategy module
1509 * auto resolved the merge cleanly.
1511 if (automerge_was_ok
) {
1512 ret
= finish_automerge(head_commit
, head_subsumed
,
1513 common
, remoteheads
,
1514 result_tree
, wt_strategy
);
1519 * Pick the result from the best strategy and have the user fix
1522 if (!best_strategy
) {
1523 restore_state(head_commit
->object
.sha1
, stash
);
1524 if (use_strategies_nr
> 1)
1526 _("No merge strategy handled the merge.\n"));
1528 fprintf(stderr
, _("Merge with strategy %s failed.\n"),
1529 use_strategies
[0]->name
);
1532 } else if (best_strategy
== wt_strategy
)
1533 ; /* We already have its result in the working tree. */
1535 printf(_("Rewinding the tree to pristine...\n"));
1536 restore_state(head_commit
->object
.sha1
, stash
);
1537 printf(_("Using the %s to prepare resolving by hand.\n"),
1539 try_merge_strategy(best_strategy
, common
, remoteheads
,
1540 head_commit
, head_arg
);
1544 finish(head_commit
, remoteheads
, NULL
, NULL
);
1546 write_merge_state(remoteheads
);
1549 fprintf(stderr
, _("Automatic merge went well; "
1550 "stopped before committing as requested\n"));
1552 ret
= suggest_conflicts(option_renormalize
);
1555 free(branch_to_free
);