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"
28 #define DEFAULT_TWOHEAD (1<<0)
29 #define DEFAULT_OCTOPUS (1<<1)
30 #define NO_FAST_FORWARD (1<<2)
31 #define NO_TRIVIAL (1<<3)
38 static const char * const builtin_merge_usage
[] = {
39 "git-merge [options] <remote>...",
40 "git-merge [options] <msg> HEAD <remote>",
44 static int show_diffstat
= 1, option_log
, squash
;
45 static int option_commit
= 1, allow_fast_forward
= 1;
46 static int allow_trivial
= 1, have_message
;
47 static struct strbuf merge_msg
;
48 static struct commit_list
*remoteheads
;
49 static unsigned char head
[20], stash
[20];
50 static struct strategy
**use_strategies
;
51 static size_t use_strategies_nr
, use_strategies_alloc
;
52 static const char *branch
;
54 static struct strategy all_strategy
[] = {
55 { "recursive", DEFAULT_TWOHEAD
| NO_TRIVIAL
},
56 { "octopus", DEFAULT_OCTOPUS
},
58 { "ours", NO_FAST_FORWARD
| NO_TRIVIAL
},
59 { "subtree", NO_FAST_FORWARD
| NO_TRIVIAL
},
62 static const char *pull_twohead
, *pull_octopus
;
64 static int option_parse_message(const struct option
*opt
,
65 const char *arg
, int unset
)
67 struct strbuf
*buf
= opt
->value
;
70 strbuf_setlen(buf
, 0);
72 strbuf_addf(buf
, "%s\n\n", arg
);
75 return error("switch `m' requires a value");
79 static struct strategy
*get_strategy(const char *name
)
83 static struct cmdnames main_cmds
, other_cmds
;
89 for (i
= 0; i
< ARRAY_SIZE(all_strategy
); i
++)
90 if (!strcmp(name
, all_strategy
[i
].name
))
91 return &all_strategy
[i
];
94 struct cmdnames not_strategies
;
97 memset(¬_strategies
, 0, sizeof(struct cmdnames
));
98 load_command_list("git-merge-", &main_cmds
, &other_cmds
);
99 for (i
= 0; i
< main_cmds
.cnt
; i
++) {
101 struct cmdname
*ent
= main_cmds
.names
[i
];
102 for (j
= 0; j
< ARRAY_SIZE(all_strategy
); j
++)
103 if (!strncmp(ent
->name
, all_strategy
[j
].name
, ent
->len
)
104 && !all_strategy
[j
].name
[ent
->len
])
107 add_cmdname(¬_strategies
, ent
->name
, ent
->len
);
108 exclude_cmds(&main_cmds
, ¬_strategies
);
111 if (!is_in_cmdlist(&main_cmds
, name
) && !is_in_cmdlist(&other_cmds
, name
)) {
112 fprintf(stderr
, "Could not find merge strategy '%s'.\n", name
);
113 fprintf(stderr
, "Available strategies are:");
114 for (i
= 0; i
< main_cmds
.cnt
; i
++)
115 fprintf(stderr
, " %s", main_cmds
.names
[i
]->name
);
116 fprintf(stderr
, ".\n");
117 if (other_cmds
.cnt
) {
118 fprintf(stderr
, "Available custom strategies are:");
119 for (i
= 0; i
< other_cmds
.cnt
; i
++)
120 fprintf(stderr
, " %s", other_cmds
.names
[i
]->name
);
121 fprintf(stderr
, ".\n");
126 ret
= xmalloc(sizeof(struct strategy
));
127 memset(ret
, 0, sizeof(struct strategy
));
128 ret
->name
= xstrdup(name
);
132 static void append_strategy(struct strategy
*s
)
134 ALLOC_GROW(use_strategies
, use_strategies_nr
+ 1, use_strategies_alloc
);
135 use_strategies
[use_strategies_nr
++] = s
;
138 static int option_parse_strategy(const struct option
*opt
,
139 const char *name
, int unset
)
144 append_strategy(get_strategy(name
));
148 static int option_parse_n(const struct option
*opt
,
149 const char *arg
, int unset
)
151 show_diffstat
= unset
;
155 static struct option builtin_merge_options
[] = {
156 { OPTION_CALLBACK
, 'n', NULL
, NULL
, NULL
,
157 "do not show a diffstat at the end of the merge",
158 PARSE_OPT_NOARG
, option_parse_n
},
159 OPT_BOOLEAN(0, "stat", &show_diffstat
,
160 "show a diffstat at the end of the merge"),
161 OPT_BOOLEAN(0, "summary", &show_diffstat
, "(synonym to --stat)"),
162 OPT_BOOLEAN(0, "log", &option_log
,
163 "add list of one-line log to merge commit message"),
164 OPT_BOOLEAN(0, "squash", &squash
,
165 "create a single commit instead of doing a merge"),
166 OPT_BOOLEAN(0, "commit", &option_commit
,
167 "perform a commit if the merge succeeds (default)"),
168 OPT_BOOLEAN(0, "ff", &allow_fast_forward
,
169 "allow fast forward (default)"),
170 OPT_CALLBACK('s', "strategy", &use_strategies
, "strategy",
171 "merge strategy to use", option_parse_strategy
),
172 OPT_CALLBACK('m', "message", &merge_msg
, "message",
173 "message to be used for the merge commit (if any)",
174 option_parse_message
),
178 /* Cleans up metadata that is uninteresting after a succeeded merge. */
179 static void drop_save(void)
181 unlink(git_path("MERGE_HEAD"));
182 unlink(git_path("MERGE_MSG"));
185 static void save_state(void)
188 struct child_process cp
;
189 struct strbuf buffer
= STRBUF_INIT
;
190 const char *argv
[] = {"stash", "create", NULL
};
192 memset(&cp
, 0, sizeof(cp
));
197 if (start_command(&cp
))
198 die("could not run stash.");
199 len
= strbuf_read(&buffer
, cp
.out
, 1024);
202 if (finish_command(&cp
) || len
< 0)
206 strbuf_setlen(&buffer
, buffer
.len
-1);
207 if (get_sha1(buffer
.buf
, stash
))
208 die("not a valid object: %s", buffer
.buf
);
211 static void reset_hard(unsigned const char *sha1
, int verbose
)
216 args
[i
++] = "read-tree";
219 args
[i
++] = "--reset";
221 args
[i
++] = sha1_to_hex(sha1
);
224 if (run_command_v_opt(args
, RUN_GIT_CMD
))
225 die("read-tree failed");
228 static void restore_state(void)
231 const char *args
[] = { "stash", "apply", NULL
, NULL
};
233 if (is_null_sha1(stash
))
239 args
[2] = sha1_to_hex(stash
);
242 * It is OK to ignore error here, for example when there was
243 * nothing to restore.
245 run_command_v_opt(args
, RUN_GIT_CMD
);
248 refresh_cache(REFRESH_QUIET
);
251 /* This is called when no merge was necessary. */
252 static void finish_up_to_date(const char *msg
)
254 printf("%s%s\n", squash
? " (nothing to squash)" : "", msg
);
258 static void squash_message(void)
261 struct commit
*commit
;
263 struct commit_list
*j
;
266 printf("Squash commit -- not updating HEAD\n");
267 fd
= open(git_path("SQUASH_MSG"), O_WRONLY
| O_CREAT
, 0666);
269 die("Could not write to %s", git_path("SQUASH_MSG"));
271 init_revisions(&rev
, NULL
);
272 rev
.ignore_merges
= 1;
273 rev
.commit_format
= CMIT_FMT_MEDIUM
;
275 commit
= lookup_commit(head
);
276 commit
->object
.flags
|= UNINTERESTING
;
277 add_pending_object(&rev
, &commit
->object
, NULL
);
279 for (j
= remoteheads
; j
; j
= j
->next
)
280 add_pending_object(&rev
, &j
->item
->object
, NULL
);
282 setup_revisions(0, NULL
, &rev
, NULL
);
283 if (prepare_revision_walk(&rev
))
284 die("revision walk setup failed");
286 strbuf_init(&out
, 0);
287 strbuf_addstr(&out
, "Squashed commit of the following:\n");
288 while ((commit
= get_revision(&rev
)) != NULL
) {
289 strbuf_addch(&out
, '\n');
290 strbuf_addf(&out
, "commit %s\n",
291 sha1_to_hex(commit
->object
.sha1
));
292 pretty_print_commit(rev
.commit_format
, commit
, &out
, rev
.abbrev
,
293 NULL
, NULL
, rev
.date_mode
, 0);
295 write(fd
, out
.buf
, out
.len
);
297 strbuf_release(&out
);
300 static int run_hook(const char *name
)
302 struct child_process hook
;
303 const char *argv
[3], *env
[2];
304 char index
[PATH_MAX
];
306 argv
[0] = git_path("hooks/%s", name
);
307 if (access(argv
[0], X_OK
) < 0)
310 snprintf(index
, sizeof(index
), "GIT_INDEX_FILE=%s", get_index_file());
320 memset(&hook
, 0, sizeof(hook
));
323 hook
.stdout_to_stderr
= 1;
326 return run_command(&hook
);
329 static void finish(const unsigned char *new_head
, const char *msg
)
331 struct strbuf reflog_message
;
333 strbuf_init(&reflog_message
, 0);
335 strbuf_addstr(&reflog_message
, getenv("GIT_REFLOG_ACTION"));
338 strbuf_addf(&reflog_message
, "%s: %s",
339 getenv("GIT_REFLOG_ACTION"), msg
);
345 printf("No merge message -- not updating HEAD\n");
347 const char *argv_gc_auto
[] = { "gc", "--auto", NULL
};
348 update_ref(reflog_message
.buf
, "HEAD",
352 * We ignore errors in 'gc --auto', since the
353 * user should see them.
355 run_command_v_opt(argv_gc_auto
, RUN_GIT_CMD
);
358 if (new_head
&& show_diffstat
) {
359 struct diff_options opts
;
361 opts
.output_format
|=
362 DIFF_FORMAT_SUMMARY
| DIFF_FORMAT_DIFFSTAT
;
363 opts
.detect_rename
= DIFF_DETECT_RENAME
;
364 if (diff_use_color_default
> 0)
365 DIFF_OPT_SET(&opts
, COLOR_DIFF
);
366 if (diff_setup_done(&opts
) < 0)
367 die("diff_setup_done failed");
368 diff_tree_sha1(head
, new_head
, "", &opts
);
373 /* Run a post-merge hook */
374 run_hook("post-merge");
376 strbuf_release(&reflog_message
);
379 /* Get the name for the merge commit's message. */
380 static void merge_name(const char *remote
, struct strbuf
*msg
)
382 struct object
*remote_head
;
383 unsigned char branch_head
[20], buf_sha
[20];
388 memset(branch_head
, 0, sizeof(branch_head
));
389 remote_head
= peel_to_type(remote
, 0, NULL
, OBJ_COMMIT
);
391 die("'%s' does not point to a commit", remote
);
393 strbuf_init(&buf
, 0);
394 strbuf_addstr(&buf
, "refs/heads/");
395 strbuf_addstr(&buf
, remote
);
396 resolve_ref(buf
.buf
, branch_head
, 0, 0);
398 if (!hashcmp(remote_head
->sha1
, branch_head
)) {
399 strbuf_addf(msg
, "%s\t\tbranch '%s' of .\n",
400 sha1_to_hex(branch_head
), remote
);
404 /* See if remote matches <name>^^^.. or <name>~<number> */
405 for (len
= 0, ptr
= remote
+ strlen(remote
);
406 remote
< ptr
&& ptr
[-1] == '^';
413 ptr
= strrchr(remote
, '~');
415 int seen_nonzero
= 0;
418 while (*++ptr
&& isdigit(*ptr
)) {
419 seen_nonzero
|= (*ptr
!= '0');
423 len
= 0; /* not ...~<number> */
424 else if (seen_nonzero
)
427 early
= 1; /* "name~" is "name~1"! */
431 struct strbuf truname
= STRBUF_INIT
;
432 strbuf_addstr(&truname
, "refs/heads/");
433 strbuf_addstr(&truname
, remote
);
434 strbuf_setlen(&truname
, truname
.len
- len
);
435 if (resolve_ref(truname
.buf
, buf_sha
, 0, 0)) {
437 "%s\t\tbranch '%s'%s of .\n",
438 sha1_to_hex(remote_head
->sha1
),
440 (early
? " (early part)" : ""));
445 if (!strcmp(remote
, "FETCH_HEAD") &&
446 !access(git_path("FETCH_HEAD"), R_OK
)) {
451 strbuf_init(&line
, 0);
452 fp
= fopen(git_path("FETCH_HEAD"), "r");
454 die("could not open %s for reading: %s",
455 git_path("FETCH_HEAD"), strerror(errno
));
456 strbuf_getline(&line
, fp
, '\n');
458 ptr
= strstr(line
.buf
, "\tnot-for-merge\t");
460 strbuf_remove(&line
, ptr
-line
.buf
+1, 13);
461 strbuf_addbuf(msg
, &line
);
462 strbuf_release(&line
);
465 strbuf_addf(msg
, "%s\t\tcommit '%s'\n",
466 sha1_to_hex(remote_head
->sha1
), remote
);
469 static int git_merge_config(const char *k
, const char *v
, void *cb
)
471 if (branch
&& !prefixcmp(k
, "branch.") &&
472 !prefixcmp(k
+ 7, branch
) &&
473 !strcmp(k
+ 7 + strlen(branch
), ".mergeoptions")) {
479 argc
= split_cmdline(buf
, &argv
);
481 die("Bad branch.%s.mergeoptions string", branch
);
482 argv
= xrealloc(argv
, sizeof(*argv
) * (argc
+ 2));
483 memmove(argv
+ 1, argv
, sizeof(*argv
) * (argc
+ 1));
485 parse_options(argc
, argv
, builtin_merge_options
,
486 builtin_merge_usage
, 0);
490 if (!strcmp(k
, "merge.diffstat") || !strcmp(k
, "merge.stat"))
491 show_diffstat
= git_config_bool(k
, v
);
492 else if (!strcmp(k
, "pull.twohead"))
493 return git_config_string(&pull_twohead
, k
, v
);
494 else if (!strcmp(k
, "pull.octopus"))
495 return git_config_string(&pull_octopus
, k
, v
);
496 else if (!strcmp(k
, "merge.log") || !strcmp(k
, "merge.summary"))
497 option_log
= git_config_bool(k
, v
);
498 return git_diff_ui_config(k
, v
, cb
);
501 static int read_tree_trivial(unsigned char *common
, unsigned char *head
,
505 struct tree
*trees
[MAX_UNPACK_TREES
];
506 struct tree_desc t
[MAX_UNPACK_TREES
];
507 struct unpack_trees_options opts
;
509 memset(&opts
, 0, sizeof(opts
));
511 opts
.src_index
= &the_index
;
512 opts
.dst_index
= &the_index
;
514 opts
.verbose_update
= 1;
515 opts
.trivial_merges_only
= 1;
517 trees
[nr_trees
] = parse_tree_indirect(common
);
518 if (!trees
[nr_trees
++])
520 trees
[nr_trees
] = parse_tree_indirect(head
);
521 if (!trees
[nr_trees
++])
523 trees
[nr_trees
] = parse_tree_indirect(one
);
524 if (!trees
[nr_trees
++])
526 opts
.fn
= threeway_merge
;
527 cache_tree_free(&active_cache_tree
);
528 for (i
= 0; i
< nr_trees
; i
++) {
529 parse_tree(trees
[i
]);
530 init_tree_desc(t
+i
, trees
[i
]->buffer
, trees
[i
]->size
);
532 if (unpack_trees(nr_trees
, t
, &opts
))
537 static void write_tree_trivial(unsigned char *sha1
)
539 if (write_cache_as_tree(sha1
, 0, NULL
))
540 die("git write-tree failed to write a tree");
543 static int try_merge_strategy(const char *strategy
, struct commit_list
*common
,
544 const char *head_arg
)
548 struct commit_list
*j
;
551 struct lock_file
*lock
= xcalloc(1, sizeof(struct lock_file
));
553 index_fd
= hold_locked_index(lock
, 1);
554 refresh_cache(REFRESH_QUIET
);
555 if (active_cache_changed
&&
556 (write_cache(index_fd
, active_cache
, active_nr
) ||
557 commit_locked_index(lock
)))
558 return error("Unable to write index.");
559 rollback_lock_file(lock
);
561 if (!strcmp(strategy
, "recursive") || !strcmp(strategy
, "subtree")) {
563 struct commit
*result
;
564 struct lock_file
*lock
= xcalloc(1, sizeof(struct lock_file
));
566 struct commit_list
*reversed
= NULL
;
567 struct merge_options o
;
569 if (remoteheads
->next
) {
570 error("Not handling anything other than two heads merge.");
574 init_merge_options(&o
);
575 if (!strcmp(strategy
, "subtree"))
578 o
.branch1
= head_arg
;
579 o
.branch2
= remoteheads
->item
->util
;
581 for (j
= common
; j
; j
= j
->next
)
582 commit_list_insert(j
->item
, &reversed
);
584 index_fd
= hold_locked_index(lock
, 1);
585 clean
= merge_recursive(&o
, lookup_commit(head
),
586 remoteheads
->item
, reversed
, &result
);
587 if (active_cache_changed
&&
588 (write_cache(index_fd
, active_cache
, active_nr
) ||
589 commit_locked_index(lock
)))
590 die ("unable to write %s", get_index_file());
591 rollback_lock_file(lock
);
592 return clean
? 0 : 1;
594 args
= xmalloc((4 + commit_list_count(common
) +
595 commit_list_count(remoteheads
)) * sizeof(char *));
596 strbuf_init(&buf
, 0);
597 strbuf_addf(&buf
, "merge-%s", strategy
);
599 for (j
= common
; j
; j
= j
->next
)
600 args
[i
++] = xstrdup(sha1_to_hex(j
->item
->object
.sha1
));
602 args
[i
++] = head_arg
;
603 for (j
= remoteheads
; j
; j
= j
->next
)
604 args
[i
++] = xstrdup(sha1_to_hex(j
->item
->object
.sha1
));
606 ret
= run_command_v_opt(args
, RUN_GIT_CMD
);
607 strbuf_release(&buf
);
609 for (j
= common
; j
; j
= j
->next
)
610 free((void *)args
[i
++]);
612 for (j
= remoteheads
; j
; j
= j
->next
)
613 free((void *)args
[i
++]);
616 if (read_cache() < 0)
617 die("failed to read the cache");
622 static void count_diff_files(struct diff_queue_struct
*q
,
623 struct diff_options
*opt
, void *data
)
630 static int count_unmerged_entries(void)
632 const struct index_state
*state
= &the_index
;
635 for (i
= 0; i
< state
->cache_nr
; i
++)
636 if (ce_stage(state
->cache
[i
]))
642 static int checkout_fast_forward(unsigned char *head
, unsigned char *remote
)
644 struct tree
*trees
[MAX_UNPACK_TREES
];
645 struct unpack_trees_options opts
;
646 struct tree_desc t
[MAX_UNPACK_TREES
];
647 int i
, fd
, nr_trees
= 0;
648 struct dir_struct dir
;
649 struct lock_file
*lock_file
= xcalloc(1, sizeof(struct lock_file
));
651 refresh_cache(REFRESH_QUIET
);
653 fd
= hold_locked_index(lock_file
, 1);
655 memset(&trees
, 0, sizeof(trees
));
656 memset(&opts
, 0, sizeof(opts
));
657 memset(&t
, 0, sizeof(t
));
658 memset(&dir
, 0, sizeof(dir
));
659 dir
.show_ignored
= 1;
660 dir
.exclude_per_dir
= ".gitignore";
664 opts
.src_index
= &the_index
;
665 opts
.dst_index
= &the_index
;
667 opts
.verbose_update
= 1;
669 opts
.fn
= twoway_merge
;
671 trees
[nr_trees
] = parse_tree_indirect(head
);
672 if (!trees
[nr_trees
++])
674 trees
[nr_trees
] = parse_tree_indirect(remote
);
675 if (!trees
[nr_trees
++])
677 for (i
= 0; i
< nr_trees
; i
++) {
678 parse_tree(trees
[i
]);
679 init_tree_desc(t
+i
, trees
[i
]->buffer
, trees
[i
]->size
);
681 if (unpack_trees(nr_trees
, t
, &opts
))
683 if (write_cache(fd
, active_cache
, active_nr
) ||
684 commit_locked_index(lock_file
))
685 die("unable to write new index file");
689 static void split_merge_strategies(const char *string
, struct strategy
**list
,
697 buf
= xstrdup(string
);
702 ALLOC_GROW(*list
, *nr
+ 1, *alloc
);
703 (*list
)[(*nr
)++].name
= xstrdup(q
);
708 ALLOC_GROW(*list
, *nr
+ 1, *alloc
);
709 (*list
)[(*nr
)++].name
= xstrdup(q
);
715 static void add_strategies(const char *string
, unsigned attr
)
717 struct strategy
*list
= NULL
;
718 int list_alloc
= 0, list_nr
= 0, i
;
720 memset(&list
, 0, sizeof(list
));
721 split_merge_strategies(string
, &list
, &list_nr
, &list_alloc
);
723 for (i
= 0; i
< list_nr
; i
++)
724 append_strategy(get_strategy(list
[i
].name
));
727 for (i
= 0; i
< ARRAY_SIZE(all_strategy
); i
++)
728 if (all_strategy
[i
].attr
& attr
)
729 append_strategy(&all_strategy
[i
]);
733 static int merge_trivial(void)
735 unsigned char result_tree
[20], result_commit
[20];
736 struct commit_list
*parent
= xmalloc(sizeof(struct commit_list
*));
738 write_tree_trivial(result_tree
);
739 printf("Wonderful.\n");
740 parent
->item
= lookup_commit(head
);
741 parent
->next
= xmalloc(sizeof(struct commit_list
*));
742 parent
->next
->item
= remoteheads
->item
;
743 parent
->next
->next
= NULL
;
744 commit_tree(merge_msg
.buf
, result_tree
, parent
, result_commit
, NULL
);
745 finish(result_commit
, "In-index merge");
750 static int finish_automerge(struct commit_list
*common
,
751 unsigned char *result_tree
,
752 const char *wt_strategy
)
754 struct commit_list
*parents
= NULL
, *j
;
755 struct strbuf buf
= STRBUF_INIT
;
756 unsigned char result_commit
[20];
758 free_commit_list(common
);
759 if (allow_fast_forward
) {
760 parents
= remoteheads
;
761 commit_list_insert(lookup_commit(head
), &parents
);
762 parents
= reduce_heads(parents
);
764 struct commit_list
**pptr
= &parents
;
766 pptr
= &commit_list_insert(lookup_commit(head
),
768 for (j
= remoteheads
; j
; j
= j
->next
)
769 pptr
= &commit_list_insert(j
->item
, pptr
)->next
;
771 free_commit_list(remoteheads
);
772 strbuf_addch(&merge_msg
, '\n');
773 commit_tree(merge_msg
.buf
, result_tree
, parents
, result_commit
, NULL
);
774 strbuf_addf(&buf
, "Merge made by %s.", wt_strategy
);
775 finish(result_commit
, buf
.buf
);
776 strbuf_release(&buf
);
781 static int suggest_conflicts(void)
786 fp
= fopen(git_path("MERGE_MSG"), "a");
788 die("Could open %s for writing", git_path("MERGE_MSG"));
789 fprintf(fp
, "\nConflicts:\n");
790 for (pos
= 0; pos
< active_nr
; pos
++) {
791 struct cache_entry
*ce
= active_cache
[pos
];
794 fprintf(fp
, "\t%s\n", ce
->name
);
795 while (pos
+ 1 < active_nr
&&
797 active_cache
[pos
+ 1]->name
))
803 printf("Automatic merge failed; "
804 "fix conflicts and then commit the result.\n");
808 static struct commit
*is_old_style_invocation(int argc
, const char **argv
)
810 struct commit
*second_token
= NULL
;
812 unsigned char second_sha1
[20];
814 if (get_sha1(argv
[1], second_sha1
))
816 second_token
= lookup_commit_reference_gently(second_sha1
, 0);
818 die("'%s' is not a commit", argv
[1]);
819 if (hashcmp(second_token
->object
.sha1
, head
))
825 static int evaluate_result(void)
830 /* Check how many files differ. */
831 init_revisions(&rev
, "");
832 setup_revisions(0, NULL
, &rev
, NULL
);
833 rev
.diffopt
.output_format
|=
834 DIFF_FORMAT_CALLBACK
;
835 rev
.diffopt
.format_callback
= count_diff_files
;
836 rev
.diffopt
.format_callback_data
= &cnt
;
837 run_diff_files(&rev
, 0);
840 * Check how many unmerged entries are
843 cnt
+= count_unmerged_entries();
848 int cmd_merge(int argc
, const char **argv
, const char *prefix
)
850 unsigned char result_tree
[20];
852 const char *head_arg
;
853 int flag
, head_invalid
= 0, i
;
854 int best_cnt
= -1, merge_was_ok
= 0, automerge_was_ok
= 0;
855 struct commit_list
*common
= NULL
;
856 const char *best_strategy
= NULL
, *wt_strategy
= NULL
;
857 struct commit_list
**remotes
= &remoteheads
;
860 if (read_cache_unmerged())
861 die("You are in the middle of a conflicted merge.");
864 * Check if we are _not_ on a detached HEAD, i.e. if there is a
867 branch
= resolve_ref("HEAD", head
, 0, &flag
);
868 if (branch
&& !prefixcmp(branch
, "refs/heads/"))
870 if (is_null_sha1(head
))
873 git_config(git_merge_config
, NULL
);
876 if (diff_use_color_default
== -1)
877 diff_use_color_default
= git_use_color_default
;
879 argc
= parse_options(argc
, argv
, builtin_merge_options
,
880 builtin_merge_usage
, 0);
883 if (!allow_fast_forward
)
884 die("You cannot combine --squash with --no-ff.");
889 usage_with_options(builtin_merge_usage
,
890 builtin_merge_options
);
893 * This could be traditional "merge <msg> HEAD <commit>..." and
894 * the way we can tell it is to see if the second token is HEAD,
895 * but some people might have misused the interface and used a
896 * committish that is the same as HEAD there instead.
897 * Traditional format never would have "-m" so it is an
898 * additional safety measure to check for it.
900 strbuf_init(&buf
, 0);
902 if (!have_message
&& is_old_style_invocation(argc
, argv
)) {
903 strbuf_addstr(&merge_msg
, argv
[0]);
907 } else if (head_invalid
) {
908 struct object
*remote_head
;
910 * If the merged head is a valid one there is no reason
911 * to forbid "git merge" into a branch yet to be born.
912 * We do the same for "git pull".
915 die("Can merge only exactly one commit into "
918 die("Squash commit into empty head not supported yet");
919 if (!allow_fast_forward
)
920 die("Non-fast-forward commit does not make sense into "
922 remote_head
= peel_to_type(argv
[0], 0, NULL
, OBJ_COMMIT
);
924 die("%s - not something we can merge", argv
[0]);
925 update_ref("initial pull", "HEAD", remote_head
->sha1
, NULL
, 0,
927 reset_hard(remote_head
->sha1
, 0);
932 /* We are invoked directly as the first-class UI. */
936 * All the rest are the commits being merged;
937 * prepare the standard merge summary message to
938 * be appended to the given message. If remote
939 * is invalid we will die later in the common
940 * codepath so we discard the error in this
943 strbuf_init(&msg
, 0);
944 for (i
= 0; i
< argc
; i
++)
945 merge_name(argv
[i
], &msg
);
946 fmt_merge_msg(option_log
, &msg
, &merge_msg
);
948 strbuf_setlen(&merge_msg
, merge_msg
.len
-1);
951 if (head_invalid
|| !argc
)
952 usage_with_options(builtin_merge_usage
,
953 builtin_merge_options
);
955 strbuf_addstr(&buf
, "merge");
956 for (i
= 0; i
< argc
; i
++)
957 strbuf_addf(&buf
, " %s", argv
[i
]);
958 setenv("GIT_REFLOG_ACTION", buf
.buf
, 0);
961 for (i
= 0; i
< argc
; i
++) {
963 struct commit
*commit
;
965 o
= peel_to_type(argv
[i
], 0, NULL
, OBJ_COMMIT
);
967 die("%s - not something we can merge", argv
[i
]);
968 commit
= lookup_commit(o
->sha1
);
969 commit
->util
= (void *)argv
[i
];
970 remotes
= &commit_list_insert(commit
, remotes
)->next
;
972 strbuf_addf(&buf
, "GITHEAD_%s", sha1_to_hex(o
->sha1
));
973 setenv(buf
.buf
, argv
[i
], 1);
977 if (!use_strategies
) {
978 if (!remoteheads
->next
)
979 add_strategies(pull_twohead
, DEFAULT_TWOHEAD
);
981 add_strategies(pull_octopus
, DEFAULT_OCTOPUS
);
984 for (i
= 0; i
< use_strategies_nr
; i
++) {
985 if (use_strategies
[i
]->attr
& NO_FAST_FORWARD
)
986 allow_fast_forward
= 0;
987 if (use_strategies
[i
]->attr
& NO_TRIVIAL
)
991 if (!remoteheads
->next
)
992 common
= get_merge_bases(lookup_commit(head
),
993 remoteheads
->item
, 1);
995 struct commit_list
*list
= remoteheads
;
996 commit_list_insert(lookup_commit(head
), &list
);
997 common
= get_octopus_merge_bases(list
);
1001 update_ref("updating ORIG_HEAD", "ORIG_HEAD", head
, NULL
, 0,
1005 ; /* No common ancestors found. We need a real merge. */
1006 else if (!remoteheads
->next
&& !common
->next
&&
1007 common
->item
== remoteheads
->item
) {
1009 * If head can reach all the merge then we are up to date.
1010 * but first the most common case of merging one remote.
1012 finish_up_to_date("Already up-to-date.");
1014 } else if (allow_fast_forward
&& !remoteheads
->next
&&
1016 !hashcmp(common
->item
->object
.sha1
, head
)) {
1017 /* Again the most common case of merging one remote. */
1022 strcpy(hex
, find_unique_abbrev(head
, DEFAULT_ABBREV
));
1024 printf("Updating %s..%s\n",
1026 find_unique_abbrev(remoteheads
->item
->object
.sha1
,
1028 strbuf_init(&msg
, 0);
1029 strbuf_addstr(&msg
, "Fast forward");
1032 " (no commit created; -m option ignored)");
1033 o
= peel_to_type(sha1_to_hex(remoteheads
->item
->object
.sha1
),
1034 0, NULL
, OBJ_COMMIT
);
1038 if (checkout_fast_forward(head
, remoteheads
->item
->object
.sha1
))
1041 finish(o
->sha1
, msg
.buf
);
1044 } else if (!remoteheads
->next
&& common
->next
)
1047 * We are not doing octopus and not fast forward. Need
1050 else if (!remoteheads
->next
&& !common
->next
&& option_commit
) {
1052 * We are not doing octopus, not fast forward, and have
1055 refresh_cache(REFRESH_QUIET
);
1056 if (allow_trivial
) {
1057 /* See if it is really trivial. */
1058 git_committer_info(IDENT_ERROR_ON_NO_NAME
);
1059 printf("Trying really trivial in-index merge...\n");
1060 if (!read_tree_trivial(common
->item
->object
.sha1
,
1061 head
, remoteheads
->item
->object
.sha1
))
1062 return merge_trivial();
1067 * An octopus. If we can reach all the remote we are up
1071 struct commit_list
*j
;
1073 for (j
= remoteheads
; j
; j
= j
->next
) {
1074 struct commit_list
*common_one
;
1077 * Here we *have* to calculate the individual
1078 * merge_bases again, otherwise "git merge HEAD^
1079 * HEAD^^" would be missed.
1081 common_one
= get_merge_bases(lookup_commit(head
),
1083 if (hashcmp(common_one
->item
->object
.sha1
,
1084 j
->item
->object
.sha1
)) {
1090 finish_up_to_date("Already up-to-date. Yeeah!");
1095 /* We are going to make a new commit. */
1096 git_committer_info(IDENT_ERROR_ON_NO_NAME
);
1099 * At this point, we need a real merge. No matter what strategy
1100 * we use, it would operate on the index, possibly affecting the
1101 * working tree, and when resolved cleanly, have the desired
1102 * tree in the index -- this means that the index must be in
1103 * sync with the head commit. The strategies are responsible
1106 if (use_strategies_nr
!= 1) {
1108 * Stash away the local changes so that we can try more
1113 memcpy(stash
, null_sha1
, 20);
1116 for (i
= 0; i
< use_strategies_nr
; i
++) {
1119 printf("Rewinding the tree to pristine...\n");
1122 if (use_strategies_nr
!= 1)
1123 printf("Trying merge strategy %s...\n",
1124 use_strategies
[i
]->name
);
1126 * Remember which strategy left the state in the working
1129 wt_strategy
= use_strategies
[i
]->name
;
1131 ret
= try_merge_strategy(use_strategies
[i
]->name
,
1133 if (!option_commit
&& !ret
) {
1136 * This is necessary here just to avoid writing
1137 * the tree, but later we will *not* exit with
1138 * status code 1 because merge_was_ok is set.
1145 * The backend exits with 1 when conflicts are
1146 * left to be resolved, with 2 when it does not
1147 * handle the given merge at all.
1150 int cnt
= evaluate_result();
1152 if (best_cnt
<= 0 || cnt
<= best_cnt
) {
1153 best_strategy
= use_strategies
[i
]->name
;
1163 /* Automerge succeeded. */
1164 write_tree_trivial(result_tree
);
1165 automerge_was_ok
= 1;
1170 * If we have a resulting tree, that means the strategy module
1171 * auto resolved the merge cleanly.
1173 if (automerge_was_ok
)
1174 return finish_automerge(common
, result_tree
, wt_strategy
);
1177 * Pick the result from the best strategy and have the user fix
1180 if (!best_strategy
) {
1182 if (use_strategies_nr
> 1)
1184 "No merge strategy handled the merge.\n");
1186 fprintf(stderr
, "Merge with strategy %s failed.\n",
1187 use_strategies
[0]->name
);
1189 } else if (best_strategy
== wt_strategy
)
1190 ; /* We already have its result in the working tree. */
1192 printf("Rewinding the tree to pristine...\n");
1194 printf("Using the %s to prepare resolving by hand.\n",
1196 try_merge_strategy(best_strategy
, common
, head_arg
);
1203 struct commit_list
*j
;
1205 for (j
= remoteheads
; j
; j
= j
->next
)
1206 strbuf_addf(&buf
, "%s\n",
1207 sha1_to_hex(j
->item
->object
.sha1
));
1208 fd
= open(git_path("MERGE_HEAD"), O_WRONLY
| O_CREAT
, 0666);
1210 die("Could open %s for writing",
1211 git_path("MERGE_HEAD"));
1212 if (write_in_full(fd
, buf
.buf
, buf
.len
) != buf
.len
)
1213 die("Could not write to %s", git_path("MERGE_HEAD"));
1215 strbuf_addch(&merge_msg
, '\n');
1216 fd
= open(git_path("MERGE_MSG"), O_WRONLY
| O_CREAT
, 0666);
1218 die("Could open %s for writing", git_path("MERGE_MSG"));
1219 if (write_in_full(fd
, merge_msg
.buf
, merge_msg
.len
) !=
1221 die("Could not write to %s", git_path("MERGE_MSG"));
1226 fprintf(stderr
, "Automatic merge went well; "
1227 "stopped before committing as requested\n");
1230 return suggest_conflicts();