6 #include "run-command.h"
7 #include "resolve-undo.h"
9 #include "unpack-trees.h"
12 static const char *merge_argument(struct commit
*commit
)
14 return oid_to_hex(commit
? &commit
->object
.oid
: the_hash_algo
->empty_tree
);
17 int try_merge_command(struct repository
*r
,
18 const char *strategy
, size_t xopts_nr
,
19 const char **xopts
, struct commit_list
*common
,
20 const char *head_arg
, struct commit_list
*remotes
)
22 struct strvec args
= STRVEC_INIT
;
24 struct commit_list
*j
;
26 strvec_pushf(&args
, "merge-%s", strategy
);
27 for (i
= 0; i
< xopts_nr
; i
++)
28 strvec_pushf(&args
, "--%s", xopts
[i
]);
29 for (j
= common
; j
; j
= j
->next
)
30 strvec_push(&args
, merge_argument(j
->item
));
31 strvec_push(&args
, "--");
32 strvec_push(&args
, head_arg
);
33 for (j
= remotes
; j
; j
= j
->next
)
34 strvec_push(&args
, merge_argument(j
->item
));
36 ret
= run_command_v_opt(args
.v
, RUN_GIT_CMD
);
39 discard_index(r
->index
);
40 if (repo_read_index(r
) < 0)
41 die(_("failed to read the cache"));
42 resolve_undo_clear_index(r
->index
);
47 int checkout_fast_forward(struct repository
*r
,
48 const struct object_id
*head
,
49 const struct object_id
*remote
,
52 struct tree
*trees
[MAX_UNPACK_TREES
];
53 struct unpack_trees_options opts
;
54 struct tree_desc t
[MAX_UNPACK_TREES
];
56 struct dir_struct dir
= DIR_INIT
;
57 struct lock_file lock_file
= LOCK_INIT
;
59 refresh_index(r
->index
, REFRESH_QUIET
, NULL
, NULL
, NULL
);
61 if (repo_hold_locked_index(r
, &lock_file
, LOCK_REPORT_ON_ERROR
) < 0)
64 memset(&trees
, 0, sizeof(trees
));
65 memset(&t
, 0, sizeof(t
));
67 trees
[nr_trees
] = parse_tree_indirect(head
);
68 if (!trees
[nr_trees
++]) {
69 rollback_lock_file(&lock_file
);
72 trees
[nr_trees
] = parse_tree_indirect(remote
);
73 if (!trees
[nr_trees
++]) {
74 rollback_lock_file(&lock_file
);
77 for (i
= 0; i
< nr_trees
; i
++) {
79 init_tree_desc(t
+i
, trees
[i
]->buffer
, trees
[i
]->size
);
82 memset(&opts
, 0, sizeof(opts
));
83 if (overwrite_ignore
) {
84 dir
.flags
|= DIR_SHOW_IGNORED
;
85 setup_standard_excludes(&dir
);
90 opts
.src_index
= r
->index
;
91 opts
.dst_index
= r
->index
;
93 opts
.verbose_update
= 1;
95 opts
.fn
= twoway_merge
;
96 init_checkout_metadata(&opts
.meta
, NULL
, remote
, NULL
);
97 setup_unpack_trees_porcelain(&opts
, "merge");
99 if (unpack_trees(nr_trees
, t
, &opts
)) {
100 rollback_lock_file(&lock_file
);
101 clear_unpack_trees_porcelain(&opts
);
105 clear_unpack_trees_porcelain(&opts
);
107 if (write_locked_index(r
->index
, &lock_file
, COMMIT_LOCK
))
108 return error(_("unable to write new index file"));