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"
31 #include "sequencer.h"
33 #define DEFAULT_TWOHEAD (1<<0)
34 #define DEFAULT_OCTOPUS (1<<1)
35 #define NO_FAST_FORWARD (1<<2)
36 #define NO_TRIVIAL (1<<3)
43 static const char * const builtin_merge_usage
[] = {
44 N_("git merge [options] [<commit>...]"),
45 N_("git merge [options] <msg> HEAD <commit>"),
46 N_("git merge --abort"),
50 static int show_diffstat
= 1, shortlog_len
= -1, squash
;
51 static int option_commit
= 1;
52 static int option_edit
= -1;
53 static int allow_trivial
= 1, have_message
, verify_signatures
;
54 static int overwrite_ignore
= 1;
55 static struct strbuf merge_msg
= STRBUF_INIT
;
56 static struct strategy
**use_strategies
;
57 static size_t use_strategies_nr
, use_strategies_alloc
;
58 static const char **xopts
;
59 static size_t xopts_nr
, xopts_alloc
;
60 static const char *branch
;
61 static char *branch_mergeoptions
;
62 static int option_renormalize
;
64 static int allow_rerere_auto
;
65 static int abort_current_merge
;
66 static int show_progress
= -1;
67 static int default_to_upstream
= 1;
68 static const char *sign_commit
;
70 static struct strategy all_strategy
[] = {
71 { "recursive", DEFAULT_TWOHEAD
| NO_TRIVIAL
},
72 { "octopus", DEFAULT_OCTOPUS
},
74 { "ours", NO_FAST_FORWARD
| NO_TRIVIAL
},
75 { "subtree", NO_FAST_FORWARD
| NO_TRIVIAL
},
78 static const char *pull_twohead
, *pull_octopus
;
86 static enum ff_type fast_forward
= FF_ALLOW
;
88 static int option_parse_message(const struct option
*opt
,
89 const char *arg
, int unset
)
91 struct strbuf
*buf
= opt
->value
;
94 strbuf_setlen(buf
, 0);
96 strbuf_addf(buf
, "%s%s", buf
->len
? "\n\n" : "", arg
);
99 return error(_("switch `m' requires a value"));
103 static struct strategy
*get_strategy(const char *name
)
106 struct strategy
*ret
;
107 static struct cmdnames main_cmds
, other_cmds
;
113 for (i
= 0; i
< ARRAY_SIZE(all_strategy
); i
++)
114 if (!strcmp(name
, all_strategy
[i
].name
))
115 return &all_strategy
[i
];
118 struct cmdnames not_strategies
;
121 memset(¬_strategies
, 0, sizeof(struct cmdnames
));
122 load_command_list("git-merge-", &main_cmds
, &other_cmds
);
123 for (i
= 0; i
< main_cmds
.cnt
; i
++) {
125 struct cmdname
*ent
= main_cmds
.names
[i
];
126 for (j
= 0; j
< ARRAY_SIZE(all_strategy
); j
++)
127 if (!strncmp(ent
->name
, all_strategy
[j
].name
, ent
->len
)
128 && !all_strategy
[j
].name
[ent
->len
])
131 add_cmdname(¬_strategies
, ent
->name
, ent
->len
);
133 exclude_cmds(&main_cmds
, ¬_strategies
);
135 if (!is_in_cmdlist(&main_cmds
, name
) && !is_in_cmdlist(&other_cmds
, name
)) {
136 fprintf(stderr
, _("Could not find merge strategy '%s'.\n"), name
);
137 fprintf(stderr
, _("Available strategies are:"));
138 for (i
= 0; i
< main_cmds
.cnt
; i
++)
139 fprintf(stderr
, " %s", main_cmds
.names
[i
]->name
);
140 fprintf(stderr
, ".\n");
141 if (other_cmds
.cnt
) {
142 fprintf(stderr
, _("Available custom strategies are:"));
143 for (i
= 0; i
< other_cmds
.cnt
; i
++)
144 fprintf(stderr
, " %s", other_cmds
.names
[i
]->name
);
145 fprintf(stderr
, ".\n");
150 ret
= xcalloc(1, sizeof(struct strategy
));
151 ret
->name
= xstrdup(name
);
152 ret
->attr
= NO_TRIVIAL
;
156 static void append_strategy(struct strategy
*s
)
158 ALLOC_GROW(use_strategies
, use_strategies_nr
+ 1, use_strategies_alloc
);
159 use_strategies
[use_strategies_nr
++] = s
;
162 static int option_parse_strategy(const struct option
*opt
,
163 const char *name
, int unset
)
168 append_strategy(get_strategy(name
));
172 static int option_parse_x(const struct option
*opt
,
173 const char *arg
, int unset
)
178 ALLOC_GROW(xopts
, xopts_nr
+ 1, xopts_alloc
);
179 xopts
[xopts_nr
++] = xstrdup(arg
);
183 static int option_parse_n(const struct option
*opt
,
184 const char *arg
, int unset
)
186 show_diffstat
= unset
;
190 static struct option builtin_merge_options
[] = {
191 { OPTION_CALLBACK
, 'n', NULL
, NULL
, NULL
,
192 N_("do not show a diffstat at the end of the merge"),
193 PARSE_OPT_NOARG
, option_parse_n
},
194 OPT_BOOL(0, "stat", &show_diffstat
,
195 N_("show a diffstat at the end of the merge")),
196 OPT_BOOL(0, "summary", &show_diffstat
, N_("(synonym to --stat)")),
197 { OPTION_INTEGER
, 0, "log", &shortlog_len
, N_("n"),
198 N_("add (at most <n>) entries from shortlog to merge commit message"),
199 PARSE_OPT_OPTARG
, NULL
, DEFAULT_MERGE_LOG_LEN
},
200 OPT_BOOL(0, "squash", &squash
,
201 N_("create a single commit instead of doing a merge")),
202 OPT_BOOL(0, "commit", &option_commit
,
203 N_("perform a commit if the merge succeeds (default)")),
204 OPT_BOOL('e', "edit", &option_edit
,
205 N_("edit message before committing")),
206 OPT_SET_INT(0, "ff", &fast_forward
, N_("allow fast-forward (default)"), FF_ALLOW
),
207 { OPTION_SET_INT
, 0, "ff-only", &fast_forward
, NULL
,
208 N_("abort if fast-forward is not possible"),
209 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
, NULL
, FF_ONLY
},
210 OPT_RERERE_AUTOUPDATE(&allow_rerere_auto
),
211 OPT_BOOL(0, "verify-signatures", &verify_signatures
,
212 N_("Verify that the named commit has a valid GPG signature")),
213 OPT_CALLBACK('s', "strategy", &use_strategies
, N_("strategy"),
214 N_("merge strategy to use"), option_parse_strategy
),
215 OPT_CALLBACK('X', "strategy-option", &xopts
, N_("option=value"),
216 N_("option for selected merge strategy"), option_parse_x
),
217 OPT_CALLBACK('m', "message", &merge_msg
, N_("message"),
218 N_("merge commit message (for a non-fast-forward merge)"),
219 option_parse_message
),
220 OPT__VERBOSITY(&verbosity
),
221 OPT_BOOL(0, "abort", &abort_current_merge
,
222 N_("abort the current in-progress merge")),
223 OPT_SET_INT(0, "progress", &show_progress
, N_("force progress reporting"), 1),
224 { OPTION_STRING
, 'S', "gpg-sign", &sign_commit
, N_("key-id"),
225 N_("GPG sign commit"), PARSE_OPT_OPTARG
, NULL
, (intptr_t) "" },
226 OPT_BOOL(0, "overwrite-ignore", &overwrite_ignore
, N_("update ignored files (default)")),
230 /* Cleans up metadata that is uninteresting after a succeeded merge. */
231 static void drop_save(void)
233 unlink(git_path("MERGE_HEAD"));
234 unlink(git_path("MERGE_MSG"));
235 unlink(git_path("MERGE_MODE"));
238 static int save_state(unsigned char *stash
)
241 struct child_process cp
= CHILD_PROCESS_INIT
;
242 struct strbuf buffer
= STRBUF_INIT
;
243 const char *argv
[] = {"stash", "create", NULL
};
249 if (start_command(&cp
))
250 die(_("could not run stash."));
251 len
= strbuf_read(&buffer
, cp
.out
, 1024);
254 if (finish_command(&cp
) || len
< 0)
255 die(_("stash failed"));
256 else if (!len
) /* no changes */
258 strbuf_setlen(&buffer
, buffer
.len
-1);
259 if (get_sha1(buffer
.buf
, stash
))
260 die(_("not a valid object: %s"), buffer
.buf
);
264 static void read_empty(unsigned const char *sha1
, int verbose
)
269 args
[i
++] = "read-tree";
274 args
[i
++] = EMPTY_TREE_SHA1_HEX
;
275 args
[i
++] = sha1_to_hex(sha1
);
278 if (run_command_v_opt(args
, RUN_GIT_CMD
))
279 die(_("read-tree failed"));
282 static void reset_hard(unsigned const char *sha1
, int verbose
)
287 args
[i
++] = "read-tree";
290 args
[i
++] = "--reset";
292 args
[i
++] = sha1_to_hex(sha1
);
295 if (run_command_v_opt(args
, RUN_GIT_CMD
))
296 die(_("read-tree failed"));
299 static void restore_state(const unsigned char *head
,
300 const unsigned char *stash
)
302 struct strbuf sb
= STRBUF_INIT
;
303 const char *args
[] = { "stash", "apply", NULL
, NULL
};
305 if (is_null_sha1(stash
))
310 args
[2] = sha1_to_hex(stash
);
313 * It is OK to ignore error here, for example when there was
314 * nothing to restore.
316 run_command_v_opt(args
, RUN_GIT_CMD
);
319 refresh_cache(REFRESH_QUIET
);
322 /* This is called when no merge was necessary. */
323 static void finish_up_to_date(const char *msg
)
326 printf("%s%s\n", squash
? _(" (nothing to squash)") : "", msg
);
330 static void squash_message(struct commit
*commit
, struct commit_list
*remoteheads
)
333 struct strbuf out
= STRBUF_INIT
;
334 struct commit_list
*j
;
335 const char *filename
;
337 struct pretty_print_context ctx
= {0};
339 printf(_("Squash commit -- not updating HEAD\n"));
340 filename
= git_path("SQUASH_MSG");
341 fd
= open(filename
, O_WRONLY
| O_CREAT
, 0666);
343 die_errno(_("Could not write to '%s'"), filename
);
345 init_revisions(&rev
, NULL
);
346 rev
.ignore_merges
= 1;
347 rev
.commit_format
= CMIT_FMT_MEDIUM
;
349 commit
->object
.flags
|= UNINTERESTING
;
350 add_pending_object(&rev
, &commit
->object
, NULL
);
352 for (j
= remoteheads
; j
; j
= j
->next
)
353 add_pending_object(&rev
, &j
->item
->object
, NULL
);
355 setup_revisions(0, NULL
, &rev
, NULL
);
356 if (prepare_revision_walk(&rev
))
357 die(_("revision walk setup failed"));
359 ctx
.abbrev
= rev
.abbrev
;
360 ctx
.date_mode
= rev
.date_mode
;
361 ctx
.fmt
= rev
.commit_format
;
363 strbuf_addstr(&out
, "Squashed commit of the following:\n");
364 while ((commit
= get_revision(&rev
)) != NULL
) {
365 strbuf_addch(&out
, '\n');
366 strbuf_addf(&out
, "commit %s\n",
367 sha1_to_hex(commit
->object
.sha1
));
368 pretty_print_commit(&ctx
, commit
, &out
);
370 if (write_in_full(fd
, out
.buf
, out
.len
) != out
.len
)
371 die_errno(_("Writing SQUASH_MSG"));
373 die_errno(_("Finishing SQUASH_MSG"));
374 strbuf_release(&out
);
377 static void finish(struct commit
*head_commit
,
378 struct commit_list
*remoteheads
,
379 const unsigned char *new_head
, const char *msg
)
381 struct strbuf reflog_message
= STRBUF_INIT
;
382 const unsigned char *head
= head_commit
->object
.sha1
;
385 strbuf_addstr(&reflog_message
, getenv("GIT_REFLOG_ACTION"));
389 strbuf_addf(&reflog_message
, "%s: %s",
390 getenv("GIT_REFLOG_ACTION"), msg
);
393 squash_message(head_commit
, remoteheads
);
395 if (verbosity
>= 0 && !merge_msg
.len
)
396 printf(_("No merge message -- not updating HEAD\n"));
398 const char *argv_gc_auto
[] = { "gc", "--auto", NULL
};
399 update_ref(reflog_message
.buf
, "HEAD",
401 UPDATE_REFS_DIE_ON_ERR
);
403 * We ignore errors in 'gc --auto', since the
404 * user should see them.
406 run_command_v_opt(argv_gc_auto
, RUN_GIT_CMD
);
409 if (new_head
&& show_diffstat
) {
410 struct diff_options opts
;
412 opts
.stat_width
= -1; /* use full terminal width */
413 opts
.stat_graph_width
= -1; /* respect statGraphWidth config */
414 opts
.output_format
|=
415 DIFF_FORMAT_SUMMARY
| DIFF_FORMAT_DIFFSTAT
;
416 opts
.detect_rename
= DIFF_DETECT_RENAME
;
417 diff_setup_done(&opts
);
418 diff_tree_sha1(head
, new_head
, "", &opts
);
423 /* Run a post-merge hook */
424 run_hook_le(NULL
, "post-merge", squash
? "1" : "0", NULL
);
426 strbuf_release(&reflog_message
);
429 /* Get the name for the merge commit's message. */
430 static void merge_name(const char *remote
, struct strbuf
*msg
)
432 struct commit
*remote_head
;
433 unsigned char branch_head
[20];
434 struct strbuf buf
= STRBUF_INIT
;
435 struct strbuf bname
= STRBUF_INIT
;
440 strbuf_branchname(&bname
, remote
);
443 memset(branch_head
, 0, sizeof(branch_head
));
444 remote_head
= get_merge_parent(remote
);
446 die(_("'%s' does not point to a commit"), remote
);
448 if (dwim_ref(remote
, strlen(remote
), branch_head
, &found_ref
) > 0) {
449 if (starts_with(found_ref
, "refs/heads/")) {
450 strbuf_addf(msg
, "%s\t\tbranch '%s' of .\n",
451 sha1_to_hex(branch_head
), remote
);
454 if (starts_with(found_ref
, "refs/tags/")) {
455 strbuf_addf(msg
, "%s\t\ttag '%s' of .\n",
456 sha1_to_hex(branch_head
), remote
);
459 if (starts_with(found_ref
, "refs/remotes/")) {
460 strbuf_addf(msg
, "%s\t\tremote-tracking branch '%s' of .\n",
461 sha1_to_hex(branch_head
), remote
);
466 /* See if remote matches <name>^^^.. or <name>~<number> */
467 for (len
= 0, ptr
= remote
+ strlen(remote
);
468 remote
< ptr
&& ptr
[-1] == '^';
475 ptr
= strrchr(remote
, '~');
477 int seen_nonzero
= 0;
480 while (*++ptr
&& isdigit(*ptr
)) {
481 seen_nonzero
|= (*ptr
!= '0');
485 len
= 0; /* not ...~<number> */
486 else if (seen_nonzero
)
489 early
= 1; /* "name~" is "name~1"! */
493 struct strbuf truname
= STRBUF_INIT
;
494 strbuf_addstr(&truname
, "refs/heads/");
495 strbuf_addstr(&truname
, remote
);
496 strbuf_setlen(&truname
, truname
.len
- len
);
497 if (ref_exists(truname
.buf
)) {
499 "%s\t\tbranch '%s'%s of .\n",
500 sha1_to_hex(remote_head
->object
.sha1
),
502 (early
? " (early part)" : ""));
503 strbuf_release(&truname
);
508 if (!strcmp(remote
, "FETCH_HEAD") &&
509 !access(git_path("FETCH_HEAD"), R_OK
)) {
510 const char *filename
;
512 struct strbuf line
= STRBUF_INIT
;
515 filename
= git_path("FETCH_HEAD");
516 fp
= fopen(filename
, "r");
518 die_errno(_("could not open '%s' for reading"),
520 strbuf_getline(&line
, fp
, '\n');
522 ptr
= strstr(line
.buf
, "\tnot-for-merge\t");
524 strbuf_remove(&line
, ptr
-line
.buf
+1, 13);
525 strbuf_addbuf(msg
, &line
);
526 strbuf_release(&line
);
530 if (remote_head
->util
) {
531 struct merge_remote_desc
*desc
;
532 desc
= merge_remote_util(remote_head
);
533 if (desc
&& desc
->obj
&& desc
->obj
->type
== OBJ_TAG
) {
534 strbuf_addf(msg
, "%s\t\t%s '%s'\n",
535 sha1_to_hex(desc
->obj
->sha1
),
536 typename(desc
->obj
->type
),
542 strbuf_addf(msg
, "%s\t\tcommit '%s'\n",
543 sha1_to_hex(remote_head
->object
.sha1
), remote
);
545 strbuf_release(&buf
);
546 strbuf_release(&bname
);
549 static void parse_branch_merge_options(char *bmo
)
556 argc
= split_cmdline(bmo
, &argv
);
558 die(_("Bad branch.%s.mergeoptions string: %s"), branch
,
559 split_cmdline_strerror(argc
));
560 argv
= xrealloc(argv
, sizeof(*argv
) * (argc
+ 2));
561 memmove(argv
+ 1, argv
, sizeof(*argv
) * (argc
+ 1));
563 argv
[0] = "branch.*.mergeoptions";
564 parse_options(argc
, argv
, NULL
, builtin_merge_options
,
565 builtin_merge_usage
, 0);
569 static int git_merge_config(const char *k
, const char *v
, void *cb
)
573 if (branch
&& starts_with(k
, "branch.") &&
574 starts_with(k
+ 7, branch
) &&
575 !strcmp(k
+ 7 + strlen(branch
), ".mergeoptions")) {
576 free(branch_mergeoptions
);
577 branch_mergeoptions
= xstrdup(v
);
581 if (!strcmp(k
, "merge.diffstat") || !strcmp(k
, "merge.stat"))
582 show_diffstat
= git_config_bool(k
, v
);
583 else if (!strcmp(k
, "pull.twohead"))
584 return git_config_string(&pull_twohead
, k
, v
);
585 else if (!strcmp(k
, "pull.octopus"))
586 return git_config_string(&pull_octopus
, k
, v
);
587 else if (!strcmp(k
, "merge.renormalize"))
588 option_renormalize
= git_config_bool(k
, v
);
589 else if (!strcmp(k
, "merge.ff")) {
590 int boolval
= git_config_maybe_bool(k
, v
);
592 fast_forward
= boolval
? FF_ALLOW
: FF_NO
;
593 } else if (v
&& !strcmp(v
, "only")) {
594 fast_forward
= FF_ONLY
;
595 } /* do not barf on values from future versions of git */
597 } else if (!strcmp(k
, "merge.defaulttoupstream")) {
598 default_to_upstream
= git_config_bool(k
, v
);
600 } else if (!strcmp(k
, "commit.gpgsign")) {
601 sign_commit
= git_config_bool(k
, v
) ? "" : NULL
;
605 status
= fmt_merge_msg_config(k
, v
, cb
);
608 status
= git_gpg_config(k
, v
, NULL
);
611 return git_diff_ui_config(k
, v
, cb
);
614 static int read_tree_trivial(unsigned char *common
, unsigned char *head
,
618 struct tree
*trees
[MAX_UNPACK_TREES
];
619 struct tree_desc t
[MAX_UNPACK_TREES
];
620 struct unpack_trees_options opts
;
622 memset(&opts
, 0, sizeof(opts
));
624 opts
.src_index
= &the_index
;
625 opts
.dst_index
= &the_index
;
627 opts
.verbose_update
= 1;
628 opts
.trivial_merges_only
= 1;
630 trees
[nr_trees
] = parse_tree_indirect(common
);
631 if (!trees
[nr_trees
++])
633 trees
[nr_trees
] = parse_tree_indirect(head
);
634 if (!trees
[nr_trees
++])
636 trees
[nr_trees
] = parse_tree_indirect(one
);
637 if (!trees
[nr_trees
++])
639 opts
.fn
= threeway_merge
;
640 cache_tree_free(&active_cache_tree
);
641 for (i
= 0; i
< nr_trees
; i
++) {
642 parse_tree(trees
[i
]);
643 init_tree_desc(t
+i
, trees
[i
]->buffer
, trees
[i
]->size
);
645 if (unpack_trees(nr_trees
, t
, &opts
))
650 static void write_tree_trivial(unsigned char *sha1
)
652 if (write_cache_as_tree(sha1
, 0, NULL
))
653 die(_("git write-tree failed to write a tree"));
656 static int try_merge_strategy(const char *strategy
, struct commit_list
*common
,
657 struct commit_list
*remoteheads
,
658 struct commit
*head
, const char *head_arg
)
660 struct lock_file
*lock
= xcalloc(1, sizeof(struct lock_file
));
662 hold_locked_index(lock
, 1);
663 refresh_cache(REFRESH_QUIET
);
664 if (active_cache_changed
&&
665 write_locked_index(&the_index
, lock
, COMMIT_LOCK
))
666 return error(_("Unable to write index."));
667 rollback_lock_file(lock
);
669 if (!strcmp(strategy
, "recursive") || !strcmp(strategy
, "subtree")) {
671 struct commit
*result
;
672 struct lock_file
*lock
= xcalloc(1, sizeof(struct lock_file
));
673 struct commit_list
*reversed
= NULL
;
674 struct merge_options o
;
675 struct commit_list
*j
;
677 if (remoteheads
->next
) {
678 error(_("Not handling anything other than two heads merge."));
682 init_merge_options(&o
);
683 if (!strcmp(strategy
, "subtree"))
684 o
.subtree_shift
= "";
686 o
.renormalize
= option_renormalize
;
687 o
.show_rename_progress
=
688 show_progress
== -1 ? isatty(2) : show_progress
;
690 for (x
= 0; x
< xopts_nr
; x
++)
691 if (parse_merge_opt(&o
, xopts
[x
]))
692 die(_("Unknown option for merge-recursive: -X%s"), xopts
[x
]);
694 o
.branch1
= head_arg
;
695 o
.branch2
= merge_remote_util(remoteheads
->item
)->name
;
697 for (j
= common
; j
; j
= j
->next
)
698 commit_list_insert(j
->item
, &reversed
);
700 hold_locked_index(lock
, 1);
701 clean
= merge_recursive(&o
, head
,
702 remoteheads
->item
, reversed
, &result
);
703 if (active_cache_changed
&&
704 write_locked_index(&the_index
, lock
, COMMIT_LOCK
))
705 die (_("unable to write %s"), get_index_file());
706 rollback_lock_file(lock
);
707 return clean
? 0 : 1;
709 return try_merge_command(strategy
, xopts_nr
, xopts
,
710 common
, head_arg
, remoteheads
);
714 static void count_diff_files(struct diff_queue_struct
*q
,
715 struct diff_options
*opt
, void *data
)
722 static int count_unmerged_entries(void)
726 for (i
= 0; i
< active_nr
; i
++)
727 if (ce_stage(active_cache
[i
]))
733 static void split_merge_strategies(const char *string
, struct strategy
**list
,
741 buf
= xstrdup(string
);
746 ALLOC_GROW(*list
, *nr
+ 1, *alloc
);
747 (*list
)[(*nr
)++].name
= xstrdup(q
);
752 ALLOC_GROW(*list
, *nr
+ 1, *alloc
);
753 (*list
)[(*nr
)++].name
= xstrdup(q
);
759 static void add_strategies(const char *string
, unsigned attr
)
761 struct strategy
*list
= NULL
;
762 int list_alloc
= 0, list_nr
= 0, i
;
764 memset(&list
, 0, sizeof(list
));
765 split_merge_strategies(string
, &list
, &list_nr
, &list_alloc
);
767 for (i
= 0; i
< list_nr
; i
++)
768 append_strategy(get_strategy(list
[i
].name
));
771 for (i
= 0; i
< ARRAY_SIZE(all_strategy
); i
++)
772 if (all_strategy
[i
].attr
& attr
)
773 append_strategy(&all_strategy
[i
]);
777 static void write_merge_msg(struct strbuf
*msg
)
779 const char *filename
= git_path("MERGE_MSG");
780 int fd
= open(filename
, O_WRONLY
| O_CREAT
, 0666);
782 die_errno(_("Could not open '%s' for writing"),
784 if (write_in_full(fd
, msg
->buf
, msg
->len
) != msg
->len
)
785 die_errno(_("Could not write to '%s'"), filename
);
789 static void read_merge_msg(struct strbuf
*msg
)
791 const char *filename
= git_path("MERGE_MSG");
793 if (strbuf_read_file(msg
, filename
, 0) < 0)
794 die_errno(_("Could not read from '%s'"), filename
);
797 static void write_merge_state(struct commit_list
*);
798 static void abort_commit(struct commit_list
*remoteheads
, const char *err_msg
)
801 error("%s", err_msg
);
803 _("Not committing merge; use 'git commit' to complete the merge.\n"));
804 write_merge_state(remoteheads
);
808 static const char merge_editor_comment
[] =
809 N_("Please enter a commit message to explain why this merge is necessary,\n"
810 "especially if it merges an updated upstream into a topic branch.\n"
812 "Lines starting with '%c' will be ignored, and an empty message aborts\n"
815 static void prepare_to_commit(struct commit_list
*remoteheads
)
817 struct strbuf msg
= STRBUF_INIT
;
818 strbuf_addbuf(&msg
, &merge_msg
);
819 strbuf_addch(&msg
, '\n');
821 strbuf_commented_addf(&msg
, _(merge_editor_comment
), comment_line_char
);
822 write_merge_msg(&msg
);
823 if (run_commit_hook(0 < option_edit
, get_index_file(), "prepare-commit-msg",
824 git_path("MERGE_MSG"), "merge", NULL
))
825 abort_commit(remoteheads
, NULL
);
826 if (0 < option_edit
) {
827 if (launch_editor(git_path("MERGE_MSG"), NULL
, NULL
))
828 abort_commit(remoteheads
, NULL
);
830 read_merge_msg(&msg
);
831 stripspace(&msg
, 0 < option_edit
);
833 abort_commit(remoteheads
, _("Empty commit message."));
834 strbuf_release(&merge_msg
);
835 strbuf_addbuf(&merge_msg
, &msg
);
836 strbuf_release(&msg
);
839 static int merge_trivial(struct commit
*head
, struct commit_list
*remoteheads
)
841 unsigned char result_tree
[20], result_commit
[20];
842 struct commit_list
*parents
, **pptr
= &parents
;
844 write_tree_trivial(result_tree
);
845 printf(_("Wonderful.\n"));
846 pptr
= commit_list_append(head
, pptr
);
847 pptr
= commit_list_append(remoteheads
->item
, pptr
);
848 prepare_to_commit(remoteheads
);
849 if (commit_tree(merge_msg
.buf
, merge_msg
.len
, result_tree
, parents
,
850 result_commit
, NULL
, sign_commit
))
851 die(_("failed to write commit object"));
852 finish(head
, remoteheads
, result_commit
, "In-index merge");
857 static int finish_automerge(struct commit
*head
,
859 struct commit_list
*common
,
860 struct commit_list
*remoteheads
,
861 unsigned char *result_tree
,
862 const char *wt_strategy
)
864 struct commit_list
*parents
= NULL
;
865 struct strbuf buf
= STRBUF_INIT
;
866 unsigned char result_commit
[20];
868 free_commit_list(common
);
869 parents
= remoteheads
;
870 if (!head_subsumed
|| fast_forward
== FF_NO
)
871 commit_list_insert(head
, &parents
);
872 strbuf_addch(&merge_msg
, '\n');
873 prepare_to_commit(remoteheads
);
874 if (commit_tree(merge_msg
.buf
, merge_msg
.len
, result_tree
, parents
,
875 result_commit
, NULL
, sign_commit
))
876 die(_("failed to write commit object"));
877 strbuf_addf(&buf
, "Merge made by the '%s' strategy.", wt_strategy
);
878 finish(head
, remoteheads
, result_commit
, buf
.buf
);
879 strbuf_release(&buf
);
884 static int suggest_conflicts(void)
886 const char *filename
;
888 struct strbuf msgbuf
= STRBUF_INIT
;
890 filename
= git_path("MERGE_MSG");
891 fp
= fopen(filename
, "a");
893 die_errno(_("Could not open '%s' for writing"), filename
);
895 append_conflicts_hint(&msgbuf
);
896 fputs(msgbuf
.buf
, fp
);
898 rerere(allow_rerere_auto
);
899 printf(_("Automatic merge failed; "
900 "fix conflicts and then commit the result.\n"));
904 static struct commit
*is_old_style_invocation(int argc
, const char **argv
,
905 const unsigned char *head
)
907 struct commit
*second_token
= NULL
;
909 unsigned char second_sha1
[20];
911 if (get_sha1(argv
[1], second_sha1
))
913 second_token
= lookup_commit_reference_gently(second_sha1
, 0);
915 die(_("'%s' is not a commit"), argv
[1]);
916 if (hashcmp(second_token
->object
.sha1
, head
))
922 static int evaluate_result(void)
927 /* Check how many files differ. */
928 init_revisions(&rev
, "");
929 setup_revisions(0, NULL
, &rev
, NULL
);
930 rev
.diffopt
.output_format
|=
931 DIFF_FORMAT_CALLBACK
;
932 rev
.diffopt
.format_callback
= count_diff_files
;
933 rev
.diffopt
.format_callback_data
= &cnt
;
934 run_diff_files(&rev
, 0);
937 * Check how many unmerged entries are
940 cnt
+= count_unmerged_entries();
946 * Pretend as if the user told us to merge with the remote-tracking
947 * branch we have for the upstream of the current branch
949 static int setup_with_upstream(const char ***argv
)
951 struct branch
*branch
= branch_get(NULL
);
956 die(_("No current branch."));
958 die(_("No remote for the current branch."));
959 if (!branch
->merge_nr
)
960 die(_("No default upstream defined for the current branch."));
962 args
= xcalloc(branch
->merge_nr
+ 1, sizeof(char *));
963 for (i
= 0; i
< branch
->merge_nr
; i
++) {
964 if (!branch
->merge
[i
]->dst
)
965 die(_("No remote-tracking branch for %s from %s"),
966 branch
->merge
[i
]->src
, branch
->remote_name
);
967 args
[i
] = branch
->merge
[i
]->dst
;
974 static void write_merge_state(struct commit_list
*remoteheads
)
976 const char *filename
;
978 struct commit_list
*j
;
979 struct strbuf buf
= STRBUF_INIT
;
981 for (j
= remoteheads
; j
; j
= j
->next
) {
982 unsigned const char *sha1
;
983 struct commit
*c
= j
->item
;
984 if (c
->util
&& merge_remote_util(c
)->obj
) {
985 sha1
= merge_remote_util(c
)->obj
->sha1
;
987 sha1
= c
->object
.sha1
;
989 strbuf_addf(&buf
, "%s\n", sha1_to_hex(sha1
));
991 filename
= git_path("MERGE_HEAD");
992 fd
= open(filename
, O_WRONLY
| O_CREAT
, 0666);
994 die_errno(_("Could not open '%s' for writing"), filename
);
995 if (write_in_full(fd
, buf
.buf
, buf
.len
) != buf
.len
)
996 die_errno(_("Could not write to '%s'"), filename
);
998 strbuf_addch(&merge_msg
, '\n');
999 write_merge_msg(&merge_msg
);
1001 filename
= git_path("MERGE_MODE");
1002 fd
= open(filename
, O_WRONLY
| O_CREAT
| O_TRUNC
, 0666);
1004 die_errno(_("Could not open '%s' for writing"), filename
);
1006 if (fast_forward
== FF_NO
)
1007 strbuf_addf(&buf
, "no-ff");
1008 if (write_in_full(fd
, buf
.buf
, buf
.len
) != buf
.len
)
1009 die_errno(_("Could not write to '%s'"), filename
);
1013 static int default_edit_option(void)
1015 static const char name
[] = "GIT_MERGE_AUTOEDIT";
1016 const char *e
= getenv(name
);
1017 struct stat st_stdin
, st_stdout
;
1020 /* an explicit -m msg without --[no-]edit */
1024 int v
= git_config_maybe_bool(name
, e
);
1026 die("Bad value '%s' in environment '%s'", e
, name
);
1030 /* Use editor if stdin and stdout are the same and is a tty */
1031 return (!fstat(0, &st_stdin
) &&
1032 !fstat(1, &st_stdout
) &&
1033 isatty(0) && isatty(1) &&
1034 st_stdin
.st_dev
== st_stdout
.st_dev
&&
1035 st_stdin
.st_ino
== st_stdout
.st_ino
&&
1036 st_stdin
.st_mode
== st_stdout
.st_mode
);
1039 static struct commit_list
*collect_parents(struct commit
*head_commit
,
1041 int argc
, const char **argv
)
1044 struct commit_list
*remoteheads
= NULL
, *parents
, *next
;
1045 struct commit_list
**remotes
= &remoteheads
;
1048 remotes
= &commit_list_insert(head_commit
, remotes
)->next
;
1049 for (i
= 0; i
< argc
; i
++) {
1050 struct commit
*commit
= get_merge_parent(argv
[i
]);
1052 help_unknown_ref(argv
[i
], "merge",
1053 "not something we can merge");
1054 remotes
= &commit_list_insert(commit
, remotes
)->next
;
1058 parents
= reduce_heads(remoteheads
);
1060 *head_subsumed
= 1; /* we will flip this to 0 when we find it */
1061 for (remoteheads
= NULL
, remotes
= &remoteheads
;
1064 struct commit
*commit
= parents
->item
;
1065 next
= parents
->next
;
1066 if (commit
== head_commit
)
1069 remotes
= &commit_list_insert(commit
, remotes
)->next
;
1074 int cmd_merge(int argc
, const char **argv
, const char *prefix
)
1076 unsigned char result_tree
[20];
1077 unsigned char stash
[20];
1078 unsigned char head_sha1
[20];
1079 struct commit
*head_commit
;
1080 struct strbuf buf
= STRBUF_INIT
;
1081 const char *head_arg
;
1082 int flag
, i
, ret
= 0, head_subsumed
;
1083 int best_cnt
= -1, merge_was_ok
= 0, automerge_was_ok
= 0;
1084 struct commit_list
*common
= NULL
;
1085 const char *best_strategy
= NULL
, *wt_strategy
= NULL
;
1086 struct commit_list
*remoteheads
, *p
;
1087 void *branch_to_free
;
1089 if (argc
== 2 && !strcmp(argv
[1], "-h"))
1090 usage_with_options(builtin_merge_usage
, builtin_merge_options
);
1093 * Check if we are _not_ on a detached HEAD, i.e. if there is a
1096 branch
= branch_to_free
= resolve_refdup("HEAD", head_sha1
, 0, &flag
);
1097 if (branch
&& starts_with(branch
, "refs/heads/"))
1099 if (!branch
|| is_null_sha1(head_sha1
))
1102 head_commit
= lookup_commit_or_die(head_sha1
, "HEAD");
1104 git_config(git_merge_config
, NULL
);
1106 if (branch_mergeoptions
)
1107 parse_branch_merge_options(branch_mergeoptions
);
1108 argc
= parse_options(argc
, argv
, prefix
, builtin_merge_options
,
1109 builtin_merge_usage
, 0);
1110 if (shortlog_len
< 0)
1111 shortlog_len
= (merge_log_config
> 0) ? merge_log_config
: 0;
1113 if (verbosity
< 0 && show_progress
== -1)
1116 if (abort_current_merge
) {
1118 const char *nargv
[] = {"reset", "--merge", NULL
};
1120 if (!file_exists(git_path("MERGE_HEAD")))
1121 die(_("There is no merge to abort (MERGE_HEAD missing)."));
1123 /* Invoke 'git reset --merge' */
1124 ret
= cmd_reset(nargc
, nargv
, prefix
);
1128 if (read_cache_unmerged())
1129 die_resolve_conflict("merge");
1131 if (file_exists(git_path("MERGE_HEAD"))) {
1133 * There is no unmerged entry, don't advise 'git
1134 * add/rm <file>', just 'git commit'.
1136 if (advice_resolve_conflict
)
1137 die(_("You have not concluded your merge (MERGE_HEAD exists).\n"
1138 "Please, commit your changes before you can merge."));
1140 die(_("You have not concluded your merge (MERGE_HEAD exists)."));
1142 if (file_exists(git_path("CHERRY_PICK_HEAD"))) {
1143 if (advice_resolve_conflict
)
1144 die(_("You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
1145 "Please, commit your changes before you can merge."));
1147 die(_("You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."));
1149 resolve_undo_clear();
1155 if (fast_forward
== FF_NO
)
1156 die(_("You cannot combine --squash with --no-ff."));
1160 if (!abort_current_merge
) {
1162 if (default_to_upstream
)
1163 argc
= setup_with_upstream(&argv
);
1165 die(_("No commit specified and merge.defaultToUpstream not set."));
1166 } else if (argc
== 1 && !strcmp(argv
[0], "-"))
1170 usage_with_options(builtin_merge_usage
,
1171 builtin_merge_options
);
1174 * This could be traditional "merge <msg> HEAD <commit>..." and
1175 * the way we can tell it is to see if the second token is HEAD,
1176 * but some people might have misused the interface and used a
1177 * commit-ish that is the same as HEAD there instead.
1178 * Traditional format never would have "-m" so it is an
1179 * additional safety measure to check for it.
1182 if (!have_message
&& head_commit
&&
1183 is_old_style_invocation(argc
, argv
, head_commit
->object
.sha1
)) {
1184 strbuf_addstr(&merge_msg
, argv
[0]);
1188 remoteheads
= collect_parents(head_commit
, &head_subsumed
, argc
, argv
);
1189 } else if (!head_commit
) {
1190 struct commit
*remote_head
;
1192 * If the merged head is a valid one there is no reason
1193 * to forbid "git merge" into a branch yet to be born.
1194 * We do the same for "git pull".
1197 die(_("Can merge only exactly one commit into "
1200 die(_("Squash commit into empty head not supported yet"));
1201 if (fast_forward
== FF_NO
)
1202 die(_("Non-fast-forward commit does not make sense into "
1204 remoteheads
= collect_parents(head_commit
, &head_subsumed
, argc
, argv
);
1205 remote_head
= remoteheads
->item
;
1207 die(_("%s - not something we can merge"), argv
[0]);
1208 read_empty(remote_head
->object
.sha1
, 0);
1209 update_ref("initial pull", "HEAD", remote_head
->object
.sha1
,
1210 NULL
, 0, UPDATE_REFS_DIE_ON_ERR
);
1213 struct strbuf merge_names
= STRBUF_INIT
;
1215 /* We are invoked directly as the first-class UI. */
1219 * All the rest are the commits being merged; prepare
1220 * the standard merge summary message to be appended
1221 * to the given message.
1223 remoteheads
= collect_parents(head_commit
, &head_subsumed
, argc
, argv
);
1224 for (p
= remoteheads
; p
; p
= p
->next
)
1225 merge_name(merge_remote_util(p
->item
)->name
, &merge_names
);
1227 if (!have_message
|| shortlog_len
) {
1228 struct fmt_merge_msg_opts opts
;
1229 memset(&opts
, 0, sizeof(opts
));
1230 opts
.add_title
= !have_message
;
1231 opts
.shortlog_len
= shortlog_len
;
1232 opts
.credit_people
= (0 < option_edit
);
1234 fmt_merge_msg(&merge_names
, &merge_msg
, &opts
);
1236 strbuf_setlen(&merge_msg
, merge_msg
.len
- 1);
1240 if (!head_commit
|| !argc
)
1241 usage_with_options(builtin_merge_usage
,
1242 builtin_merge_options
);
1244 if (verify_signatures
) {
1245 for (p
= remoteheads
; p
; p
= p
->next
) {
1246 struct commit
*commit
= p
->item
;
1248 struct signature_check signature_check
;
1249 memset(&signature_check
, 0, sizeof(signature_check
));
1251 check_commit_signature(commit
, &signature_check
);
1253 strcpy(hex
, find_unique_abbrev(commit
->object
.sha1
, DEFAULT_ABBREV
));
1254 switch (signature_check
.result
) {
1258 die(_("Commit %s has an untrusted GPG signature, "
1259 "allegedly by %s."), hex
, signature_check
.signer
);
1261 die(_("Commit %s has a bad GPG signature "
1262 "allegedly by %s."), hex
, signature_check
.signer
);
1264 die(_("Commit %s does not have a GPG signature."), hex
);
1266 if (verbosity
>= 0 && signature_check
.result
== 'G')
1267 printf(_("Commit %s has a good GPG signature by %s\n"),
1268 hex
, signature_check
.signer
);
1270 signature_check_clear(&signature_check
);
1274 strbuf_addstr(&buf
, "merge");
1275 for (p
= remoteheads
; p
; p
= p
->next
)
1276 strbuf_addf(&buf
, " %s", merge_remote_util(p
->item
)->name
);
1277 setenv("GIT_REFLOG_ACTION", buf
.buf
, 0);
1280 for (p
= remoteheads
; p
; p
= p
->next
) {
1281 struct commit
*commit
= p
->item
;
1282 strbuf_addf(&buf
, "GITHEAD_%s",
1283 sha1_to_hex(commit
->object
.sha1
));
1284 setenv(buf
.buf
, merge_remote_util(commit
)->name
, 1);
1286 if (fast_forward
!= FF_ONLY
&&
1287 merge_remote_util(commit
) &&
1288 merge_remote_util(commit
)->obj
&&
1289 merge_remote_util(commit
)->obj
->type
== OBJ_TAG
)
1290 fast_forward
= FF_NO
;
1293 if (option_edit
< 0)
1294 option_edit
= default_edit_option();
1296 if (!use_strategies
) {
1298 ; /* already up-to-date */
1299 else if (!remoteheads
->next
)
1300 add_strategies(pull_twohead
, DEFAULT_TWOHEAD
);
1302 add_strategies(pull_octopus
, DEFAULT_OCTOPUS
);
1305 for (i
= 0; i
< use_strategies_nr
; i
++) {
1306 if (use_strategies
[i
]->attr
& NO_FAST_FORWARD
)
1307 fast_forward
= FF_NO
;
1308 if (use_strategies
[i
]->attr
& NO_TRIVIAL
)
1313 ; /* already up-to-date */
1314 else if (!remoteheads
->next
)
1315 common
= get_merge_bases(head_commit
, remoteheads
->item
, 1);
1317 struct commit_list
*list
= remoteheads
;
1318 commit_list_insert(head_commit
, &list
);
1319 common
= get_octopus_merge_bases(list
);
1323 update_ref("updating ORIG_HEAD", "ORIG_HEAD", head_commit
->object
.sha1
,
1324 NULL
, 0, UPDATE_REFS_DIE_ON_ERR
);
1326 if (remoteheads
&& !common
)
1327 ; /* No common ancestors found. We need a real merge. */
1328 else if (!remoteheads
||
1329 (!remoteheads
->next
&& !common
->next
&&
1330 common
->item
== remoteheads
->item
)) {
1332 * If head can reach all the merge then we are up to date.
1333 * but first the most common case of merging one remote.
1335 finish_up_to_date("Already up-to-date.");
1337 } else if (fast_forward
!= FF_NO
&& !remoteheads
->next
&&
1339 !hashcmp(common
->item
->object
.sha1
, head_commit
->object
.sha1
)) {
1340 /* Again the most common case of merging one remote. */
1341 struct strbuf msg
= STRBUF_INIT
;
1342 struct commit
*commit
;
1345 strcpy(hex
, find_unique_abbrev(head_commit
->object
.sha1
, DEFAULT_ABBREV
));
1348 printf(_("Updating %s..%s\n"),
1350 find_unique_abbrev(remoteheads
->item
->object
.sha1
,
1352 strbuf_addstr(&msg
, "Fast-forward");
1355 " (no commit created; -m option ignored)");
1356 commit
= remoteheads
->item
;
1362 if (checkout_fast_forward(head_commit
->object
.sha1
,
1363 commit
->object
.sha1
,
1364 overwrite_ignore
)) {
1369 finish(head_commit
, remoteheads
, commit
->object
.sha1
, msg
.buf
);
1372 } else if (!remoteheads
->next
&& common
->next
)
1375 * We are not doing octopus and not fast-forward. Need
1378 else if (!remoteheads
->next
&& !common
->next
&& option_commit
) {
1380 * We are not doing octopus, not fast-forward, and have
1383 refresh_cache(REFRESH_QUIET
);
1384 if (allow_trivial
&& fast_forward
!= FF_ONLY
) {
1385 /* See if it is really trivial. */
1386 git_committer_info(IDENT_STRICT
);
1387 printf(_("Trying really trivial in-index merge...\n"));
1388 if (!read_tree_trivial(common
->item
->object
.sha1
,
1389 head_commit
->object
.sha1
,
1390 remoteheads
->item
->object
.sha1
)) {
1391 ret
= merge_trivial(head_commit
, remoteheads
);
1394 printf(_("Nope.\n"));
1398 * An octopus. If we can reach all the remote we are up
1402 struct commit_list
*j
;
1404 for (j
= remoteheads
; j
; j
= j
->next
) {
1405 struct commit_list
*common_one
;
1408 * Here we *have* to calculate the individual
1409 * merge_bases again, otherwise "git merge HEAD^
1410 * HEAD^^" would be missed.
1412 common_one
= get_merge_bases(head_commit
, j
->item
, 1);
1413 if (hashcmp(common_one
->item
->object
.sha1
,
1414 j
->item
->object
.sha1
)) {
1420 finish_up_to_date("Already up-to-date. Yeeah!");
1425 if (fast_forward
== FF_ONLY
)
1426 die(_("Not possible to fast-forward, aborting."));
1428 /* We are going to make a new commit. */
1429 git_committer_info(IDENT_STRICT
);
1432 * At this point, we need a real merge. No matter what strategy
1433 * we use, it would operate on the index, possibly affecting the
1434 * working tree, and when resolved cleanly, have the desired
1435 * tree in the index -- this means that the index must be in
1436 * sync with the head commit. The strategies are responsible
1439 if (use_strategies_nr
== 1 ||
1441 * Stash away the local changes so that we can try more than one.
1444 hashcpy(stash
, null_sha1
);
1446 for (i
= 0; i
< use_strategies_nr
; i
++) {
1449 printf(_("Rewinding the tree to pristine...\n"));
1450 restore_state(head_commit
->object
.sha1
, stash
);
1452 if (use_strategies_nr
!= 1)
1453 printf(_("Trying merge strategy %s...\n"),
1454 use_strategies
[i
]->name
);
1456 * Remember which strategy left the state in the working
1459 wt_strategy
= use_strategies
[i
]->name
;
1461 ret
= try_merge_strategy(use_strategies
[i
]->name
,
1462 common
, remoteheads
,
1463 head_commit
, head_arg
);
1464 if (!option_commit
&& !ret
) {
1467 * This is necessary here just to avoid writing
1468 * the tree, but later we will *not* exit with
1469 * status code 1 because merge_was_ok is set.
1476 * The backend exits with 1 when conflicts are
1477 * left to be resolved, with 2 when it does not
1478 * handle the given merge at all.
1481 int cnt
= evaluate_result();
1483 if (best_cnt
<= 0 || cnt
<= best_cnt
) {
1484 best_strategy
= use_strategies
[i
]->name
;
1494 /* Automerge succeeded. */
1495 write_tree_trivial(result_tree
);
1496 automerge_was_ok
= 1;
1501 * If we have a resulting tree, that means the strategy module
1502 * auto resolved the merge cleanly.
1504 if (automerge_was_ok
) {
1505 ret
= finish_automerge(head_commit
, head_subsumed
,
1506 common
, remoteheads
,
1507 result_tree
, wt_strategy
);
1512 * Pick the result from the best strategy and have the user fix
1515 if (!best_strategy
) {
1516 restore_state(head_commit
->object
.sha1
, stash
);
1517 if (use_strategies_nr
> 1)
1519 _("No merge strategy handled the merge.\n"));
1521 fprintf(stderr
, _("Merge with strategy %s failed.\n"),
1522 use_strategies
[0]->name
);
1525 } else if (best_strategy
== wt_strategy
)
1526 ; /* We already have its result in the working tree. */
1528 printf(_("Rewinding the tree to pristine...\n"));
1529 restore_state(head_commit
->object
.sha1
, stash
);
1530 printf(_("Using the %s to prepare resolving by hand.\n"),
1532 try_merge_strategy(best_strategy
, common
, remoteheads
,
1533 head_commit
, head_arg
);
1537 finish(head_commit
, remoteheads
, NULL
, NULL
);
1539 write_merge_state(remoteheads
);
1542 fprintf(stderr
, _("Automatic merge went well; "
1543 "stopped before committing as requested\n"));
1545 ret
= suggest_conflicts();
1548 free(branch_to_free
);