🌐 AI搜索 & 代理 主页
Google Git
Sign in
chromium / external / github.com / git / git / refs/tags/v2.7.1 / . / ll-merge.c
blob: 0338630fc2a5378ed33afa828db4940b34aabe82 [file] [log] [blame]
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]1/*
2 * Low level 3-way in-core file merge.
3 *
4 * Copyright (c) 2007 Junio C Hamano
5 */
6
7#include "cache.h"
8#include "attr.h"
9#include "xdiff-interface.h"
10#include "run-command.h"
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]11#include "ll-merge.h"
Junio C Hamanoef45bb12015-06-04 22:10:29[diff] [blame]12#include "quote.h"
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]13
14struct ll_merge_driver;
15
16typedef int (*ll_merge_fn)(const struct ll_merge_driver *,
17 mmbuffer_t *result,
18 const char *path,
Jonathan Niederf01de622010-03-21 00:38:58[diff] [blame]19 mmfile_t *orig, const char *orig_name,
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]20 mmfile_t *src1, const char *name1,
21 mmfile_t *src2, const char *name2,
Jonathan Nieder712516b2010-08-26 05:49:53[diff] [blame]22 const struct ll_merge_options *opts,
Junio C Hamano23a64c92010-01-16 06:37:32[diff] [blame]23 int marker_size);
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]24
25struct ll_merge_driver {
26 const char *name;
27 const char *description;
28 ll_merge_fn fn;
29 const char *recursive;
30 struct ll_merge_driver *next;
31 char *cmdline;
32};
33
34/*
35 * Built-in low-levels
36 */
37static int ll_binary_merge(const struct ll_merge_driver *drv_unused,
38 mmbuffer_t *result,
Junio C Hamanoe0e20652012-09-12 09:01:52[diff] [blame]39 const char *path,
Jonathan Niederf01de622010-03-21 00:38:58[diff] [blame]40 mmfile_t *orig, const char *orig_name,
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]41 mmfile_t *src1, const char *name1,
42 mmfile_t *src2, const char *name2,
Jonathan Nieder712516b2010-08-26 05:49:53[diff] [blame]43 const struct ll_merge_options *opts,
44 int marker_size)
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]45{
Jonathan Nieder712516b2010-08-26 05:49:53[diff] [blame]46 mmfile_t *stolen;
47 assert(opts);
48
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]49 /*
Junio C Hamanoa944af12012-09-09 04:27:19[diff] [blame]50 * The tentative merge result is the or common ancestor for an internal merge.
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]51 */
Junio C Hamanoa944af12012-09-09 04:27:19[diff] [blame]52 if (opts->virtual_ancestor) {
53 stolen = orig;
54 } else {
55 switch (opts->variant) {
56 default:
Junio C Hamanoe6d29a42012-09-15 04:39:56[diff] [blame]57 warning("Cannot merge binary files: %s (%s vs. %s)",
Junio C Hamanoe0e20652012-09-12 09:01:52[diff] [blame]58 path, name1, name2);
59 /* fallthru */
Junio C Hamanoa944af12012-09-09 04:27:19[diff] [blame]60 case XDL_MERGE_FAVOR_OURS:
61 stolen = src1;
62 break;
63 case XDL_MERGE_FAVOR_THEIRS:
64 stolen = src2;
65 break;
66 }
67 }
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]68
69 result->ptr = stolen->ptr;
70 result->size = stolen->size;
71 stolen->ptr = NULL;
Junio C Hamanoa944af12012-09-09 04:27:19[diff] [blame]72
73 /*
74 * With -Xtheirs or -Xours, we have cleanly merged;
75 * otherwise we got a conflict.
76 */
77 return (opts->variant ? 0 : 1);
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]78}
79
80static int ll_xdl_merge(const struct ll_merge_driver *drv_unused,
81 mmbuffer_t *result,
Martin Renold606475f2009-07-01 20:18:04[diff] [blame]82 const char *path,
Jonathan Niederf01de622010-03-21 00:38:58[diff] [blame]83 mmfile_t *orig, const char *orig_name,
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]84 mmfile_t *src1, const char *name1,
85 mmfile_t *src2, const char *name2,
Jonathan Nieder712516b2010-08-26 05:49:53[diff] [blame]86 const struct ll_merge_options *opts,
87 int marker_size)
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]88{
Junio C Hamano00f8f972010-01-17 05:01:28[diff] [blame]89 xmparam_t xmp;
Jonathan Nieder712516b2010-08-26 05:49:53[diff] [blame]90 assert(opts);
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]91
Jeff Kingdcd17422015-09-24 23:12:45[diff] [blame]92 if (orig->size > MAX_XDIFF_SIZE ||
93 src1->size > MAX_XDIFF_SIZE ||
94 src2->size > MAX_XDIFF_SIZE ||
95 buffer_is_binary(orig->ptr, orig->size) ||
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]96 buffer_is_binary(src1->ptr, src1->size) ||
97 buffer_is_binary(src2->ptr, src2->size)) {
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]98 return ll_binary_merge(drv_unused, result,
Martin Renold606475f2009-07-01 20:18:04[diff] [blame]99 path,
Jonathan Niederf01de622010-03-21 00:38:58[diff] [blame]100 orig, orig_name,
101 src1, name1,
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]102 src2, name2,
Jonathan Nieder712516b2010-08-26 05:49:53[diff] [blame]103 opts, marker_size);
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]104 }
105
Junio C Hamano00f8f972010-01-17 05:01:28[diff] [blame]106 memset(&xmp, 0, sizeof(xmp));
Bert Wesarg560119b2010-03-01 21:46:26[diff] [blame]107 xmp.level = XDL_MERGE_ZEALOUS;
Jonathan Nieder712516b2010-08-26 05:49:53[diff] [blame]108 xmp.favor = opts->variant;
Justin Frankel58a1ece2010-08-26 05:50:45[diff] [blame]109 xmp.xpp.flags = opts->xdl_opts;
Junio C Hamanoc236bcd2008-08-29 17:59:16[diff] [blame]110 if (git_xmerge_style >= 0)
Bert Wesarg560119b2010-03-01 21:46:26[diff] [blame]111 xmp.style = git_xmerge_style;
Junio C Hamano23a64c92010-01-16 06:37:32[diff] [blame]112 if (marker_size > 0)
113 xmp.marker_size = marker_size;
Jonathan Niederf01de622010-03-21 00:38:58[diff] [blame]114 xmp.ancestor = orig_name;
Jonathan Niedera4b5e912010-03-21 00:35:18[diff] [blame]115 xmp.file1 = name1;
116 xmp.file2 = name2;
117 return xdl_merge(orig, src1, src2, &xmp, result);
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]118}
119
120static int ll_union_merge(const struct ll_merge_driver *drv_unused,
121 mmbuffer_t *result,
122 const char *path_unused,
Jonathan Niederf01de622010-03-21 00:38:58[diff] [blame]123 mmfile_t *orig, const char *orig_name,
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]124 mmfile_t *src1, const char *name1,
125 mmfile_t *src2, const char *name2,
Jonathan Nieder712516b2010-08-26 05:49:53[diff] [blame]126 const struct ll_merge_options *opts,
127 int marker_size)
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]128{
Bert Wesargcd1d61c2010-03-01 21:46:25[diff] [blame]129 /* Use union favor */
Jonathan Nieder712516b2010-08-26 05:49:53[diff] [blame]130 struct ll_merge_options o;
131 assert(opts);
132 o = *opts;
133 o.variant = XDL_MERGE_FAVOR_UNION;
Bert Wesargcd1d61c2010-03-01 21:46:25[diff] [blame]134 return ll_xdl_merge(drv_unused, result, path_unused,
Jonathan Niederf01de622010-03-21 00:38:58[diff] [blame]135 orig, NULL, src1, NULL, src2, NULL,
Jonathan Nieder712516b2010-08-26 05:49:53[diff] [blame]136 &o, marker_size);
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]137}
138
139#define LL_BINARY_MERGE 0
140#define LL_TEXT_MERGE 1
141#define LL_UNION_MERGE 2
142static struct ll_merge_driver ll_merge_drv[] = {
143 { "binary", "built-in binary merge", ll_binary_merge },
144 { "text", "built-in 3-way text merge", ll_xdl_merge },
145 { "union", "built-in union merge", ll_union_merge },
146};
147
Jeff King5096d492015-09-24 21:06:08[diff] [blame]148static void create_temp(mmfile_t *src, char *path, size_t len)
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]149{
150 int fd;
151
Jeff King5096d492015-09-24 21:06:08[diff] [blame]152 xsnprintf(path, len, ".merge_file_XXXXXX");
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]153 fd = xmkstemp(path);
154 if (write_in_full(fd, src->ptr, src->size) != src->size)
Thomas Rast0721c312009-06-27 15:58:47[diff] [blame]155 die_errno("unable to write temp-file");
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]156 close(fd);
157}
158
159/*
160 * User defined low-level merge driver support.
161 */
162static int ll_ext_merge(const struct ll_merge_driver *fn,
163 mmbuffer_t *result,
164 const char *path,
Jonathan Niederf01de622010-03-21 00:38:58[diff] [blame]165 mmfile_t *orig, const char *orig_name,
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]166 mmfile_t *src1, const char *name1,
167 mmfile_t *src2, const char *name2,
Jonathan Nieder712516b2010-08-26 05:49:53[diff] [blame]168 const struct ll_merge_options *opts,
169 int marker_size)
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]170{
Junio C Hamano23a64c92010-01-16 06:37:32[diff] [blame]171 char temp[4][50];
René Scharfeced621b2008-11-22 23:13:00[diff] [blame]172 struct strbuf cmd = STRBUF_INIT;
Junio C Hamanoef45bb12015-06-04 22:10:29[diff] [blame]173 struct strbuf_expand_dict_entry dict[6];
174 struct strbuf path_sq = STRBUF_INIT;
Jeff Kingac0ba182009-12-30 10:53:57[diff] [blame]175 const char *args[] = { NULL, NULL };
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]176 int status, fd, i;
177 struct stat st;
Jonathan Nieder712516b2010-08-26 05:49:53[diff] [blame]178 assert(opts);
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]179
Junio C Hamanoef45bb12015-06-04 22:10:29[diff] [blame]180 sq_quote_buf(&path_sq, path);
Gary V. Vaughan66dbfd52010-05-14 09:31:33[diff] [blame]181 dict[0].placeholder = "O"; dict[0].value = temp[0];
182 dict[1].placeholder = "A"; dict[1].value = temp[1];
183 dict[2].placeholder = "B"; dict[2].value = temp[2];
184 dict[3].placeholder = "L"; dict[3].value = temp[3];
Junio C Hamanoef45bb12015-06-04 22:10:29[diff] [blame]185 dict[4].placeholder = "P"; dict[4].value = path_sq.buf;
186 dict[5].placeholder = NULL; dict[5].value = NULL;
Gary V. Vaughan66dbfd52010-05-14 09:31:33[diff] [blame]187
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]188 if (fn->cmdline == NULL)
189 die("custom merge driver %s lacks command line.", fn->name);
190
191 result->ptr = NULL;
192 result->size = 0;
Jeff King5096d492015-09-24 21:06:08[diff] [blame]193 create_temp(orig, temp[0], sizeof(temp[0]));
194 create_temp(src1, temp[1], sizeof(temp[1]));
195 create_temp(src2, temp[2], sizeof(temp[2]));
196 xsnprintf(temp[3], sizeof(temp[3]), "%d", marker_size);
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]197
René Scharfeced621b2008-11-22 23:13:00[diff] [blame]198 strbuf_expand(&cmd, fn->cmdline, strbuf_expand_dict_cb, &dict);
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]199
Jeff Kingac0ba182009-12-30 10:53:57[diff] [blame]200 args[0] = cmd.buf;
201 status = run_command_v_opt(args, RUN_USING_SHELL);
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]202 fd = open(temp[1], O_RDONLY);
203 if (fd < 0)
204 goto bad;
205 if (fstat(fd, &st))
206 goto close_bad;
207 result->size = st.st_size;
208 result->ptr = xmalloc(result->size + 1);
209 if (read_in_full(fd, result->ptr, result->size) != result->size) {
210 free(result->ptr);
211 result->ptr = NULL;
212 result->size = 0;
213 }
214 close_bad:
215 close(fd);
216 bad:
217 for (i = 0; i < 3; i++)
Alex Riesen691f1a22009-04-29 21:22:56[diff] [blame]218 unlink_or_warn(temp[i]);
René Scharfeced621b2008-11-22 23:13:00[diff] [blame]219 strbuf_release(&cmd);
Junio C Hamanoef45bb12015-06-04 22:10:29[diff] [blame]220 strbuf_release(&path_sq);
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]221 return status;
222}
223
224/*
225 * merge.default and merge.driver configuration items
226 */
227static struct ll_merge_driver *ll_user_merge, **ll_user_merge_tail;
228static const char *default_ll_merge;
229
Johannes Schindelinef90d6d2008-05-14 17:46:53[diff] [blame]230static int read_merge_config(const char *var, const char *value, void *cb)
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]231{
232 struct ll_merge_driver *fn;
Jeff Kingd731f0a2013-01-23 06:24:23[diff] [blame]233 const char *key, *name;
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]234 int namelen;
235
Tanay Abhra6ea358f2014-08-13 12:43:04[diff] [blame]236 if (!strcmp(var, "merge.default"))
237 return git_config_string(&default_ll_merge, var, value);
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]238
239 /*
240 * We are not interested in anything but "merge.<name>.variable";
241 * especially, we do not want to look at variables such as
242 * "merge.summary", "merge.tool", and "merge.verbosity".
243 */
Jeff Kingd731f0a2013-01-23 06:24:23[diff] [blame]244 if (parse_config_key(var, "merge", &name, &namelen, &key) < 0 || !name)
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]245 return 0;
246
247 /*
248 * Find existing one as we might be processing merge.<name>.var2
249 * after seeing merge.<name>.var1.
250 */
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]251 for (fn = ll_user_merge; fn; fn = fn->next)
252 if (!strncmp(fn->name, name, namelen) && !fn->name[namelen])
253 break;
254 if (!fn) {
255 fn = xcalloc(1, sizeof(struct ll_merge_driver));
256 fn->name = xmemdupz(name, namelen);
257 fn->fn = ll_ext_merge;
258 *ll_user_merge_tail = fn;
259 ll_user_merge_tail = &(fn->next);
260 }
261
Tanay Abhra6ea358f2014-08-13 12:43:04[diff] [blame]262 if (!strcmp("name", key))
263 return git_config_string(&fn->description, var, value);
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]264
Jeff Kingd731f0a2013-01-23 06:24:23[diff] [blame]265 if (!strcmp("driver", key)) {
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]266 if (!value)
267 return error("%s: lacks value", var);
268 /*
269 * merge.<name>.driver specifies the command line:
270 *
271 * command-line
272 *
273 * The command-line will be interpolated with the following
274 * tokens and is given to the shell:
275 *
276 * %O - temporary file name for the merge base.
277 * %A - temporary file name for our version.
278 * %B - temporary file name for the other branches' version.
Junio C Hamano23a64c92010-01-16 06:37:32[diff] [blame]279 * %L - conflict marker length
Junio C Hamanoef45bb12015-06-04 22:10:29[diff] [blame]280 * %P - the original path (safely quoted for the shell)
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]281 *
282 * The external merge driver should write the results in the
283 * file named by %A, and signal that it has done with zero exit
284 * status.
285 */
Jim Meyering90dce512009-06-14 19:47:54[diff] [blame]286 fn->cmdline = xstrdup(value);
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]287 return 0;
288 }
289
Tanay Abhra6ea358f2014-08-13 12:43:04[diff] [blame]290 if (!strcmp("recursive", key))
291 return git_config_string(&fn->recursive, var, value);
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]292
293 return 0;
294}
295
296static void initialize_ll_merge(void)
297{
298 if (ll_user_merge_tail)
299 return;
300 ll_user_merge_tail = &ll_user_merge;
Johannes Schindelinef90d6d2008-05-14 17:46:53[diff] [blame]301 git_config(read_merge_config, NULL);
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]302}
303
304static const struct ll_merge_driver *find_ll_merge_driver(const char *merge_attr)
305{
306 struct ll_merge_driver *fn;
307 const char *name;
308 int i;
309
310 initialize_ll_merge();
311
312 if (ATTR_TRUE(merge_attr))
313 return &ll_merge_drv[LL_TEXT_MERGE];
314 else if (ATTR_FALSE(merge_attr))
315 return &ll_merge_drv[LL_BINARY_MERGE];
316 else if (ATTR_UNSET(merge_attr)) {
317 if (!default_ll_merge)
318 return &ll_merge_drv[LL_TEXT_MERGE];
319 else
320 name = default_ll_merge;
321 }
322 else
323 name = merge_attr;
324
325 for (fn = ll_user_merge; fn; fn = fn->next)
326 if (!strcmp(fn->name, name))
327 return fn;
328
329 for (i = 0; i < ARRAY_SIZE(ll_merge_drv); i++)
330 if (!strcmp(ll_merge_drv[i].name, name))
331 return &ll_merge_drv[i];
332
333 /* default to the 3-way */
334 return &ll_merge_drv[LL_TEXT_MERGE];
335}
336
Junio C Hamano23a64c92010-01-16 06:37:32[diff] [blame]337static int git_path_check_merge(const char *path, struct git_attr_check check[2])
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]338{
Junio C Hamano23a64c92010-01-16 06:37:32[diff] [blame]339 if (!check[0].attr) {
340 check[0].attr = git_attr("merge");
341 check[1].attr = git_attr("conflict-marker-size");
342 }
Michael Haggertyd932f4e2011-08-04 04:36:33[diff] [blame]343 return git_check_attr(path, 2, check);
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]344}
345
Eyvind Bernhardsenf217f0e2010-07-02 19:20:47[diff] [blame]346static void normalize_file(mmfile_t *mm, const char *path)
347{
348 struct strbuf strbuf = STRBUF_INIT;
349 if (renormalize_buffer(path, mm->ptr, mm->size, &strbuf)) {
350 free(mm->ptr);
351 mm->size = strbuf.len;
352 mm->ptr = strbuf_detach(&strbuf, NULL);
353 }
354}
355
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]356int ll_merge(mmbuffer_t *result_buf,
357 const char *path,
Jonathan Niederf01de622010-03-21 00:38:58[diff] [blame]358 mmfile_t *ancestor, const char *ancestor_label,
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]359 mmfile_t *ours, const char *our_label,
360 mmfile_t *theirs, const char *their_label,
Jonathan Nieder712516b2010-08-26 05:49:53[diff] [blame]361 const struct ll_merge_options *opts)
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]362{
Junio C Hamano23a64c92010-01-16 06:37:32[diff] [blame]363 static struct git_attr_check check[2];
Jonathan Nieder4fb40c22011-01-16 01:08:42[diff] [blame]364 static const struct ll_merge_options default_opts;
Junio C Hamano23a64c92010-01-16 06:37:32[diff] [blame]365 const char *ll_driver_name = NULL;
366 int marker_size = DEFAULT_CONFLICT_MARKER_SIZE;
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]367 const struct ll_merge_driver *driver;
368
Jonathan Nieder4fb40c22011-01-16 01:08:42[diff] [blame]369 if (!opts)
370 opts = &default_opts;
Jonathan Nieder712516b2010-08-26 05:49:53[diff] [blame]371
372 if (opts->renormalize) {
Eyvind Bernhardsenf217f0e2010-07-02 19:20:47[diff] [blame]373 normalize_file(ancestor, path);
374 normalize_file(ours, path);
375 normalize_file(theirs, path);
376 }
Junio C Hamano23a64c92010-01-16 06:37:32[diff] [blame]377 if (!git_path_check_merge(path, check)) {
378 ll_driver_name = check[0].value;
379 if (check[1].value) {
380 marker_size = atoi(check[1].value);
381 if (marker_size <= 0)
382 marker_size = DEFAULT_CONFLICT_MARKER_SIZE;
383 }
384 }
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]385 driver = find_ll_merge_driver(ll_driver_name);
Jonathan Nieder712516b2010-08-26 05:49:53[diff] [blame]386 if (opts->virtual_ancestor && driver->recursive)
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]387 driver = find_ll_merge_driver(driver->recursive);
Jonathan Niederf01de622010-03-21 00:38:58[diff] [blame]388 return driver->fn(driver, result_buf, path, ancestor, ancestor_label,
Junio C Hamano23a64c92010-01-16 06:37:32[diff] [blame]389 ours, our_label, theirs, their_label,
Jonathan Nieder712516b2010-08-26 05:49:53[diff] [blame]390 opts, marker_size);
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]391}
Junio C Hamano85885672010-01-17 07:28:46[diff] [blame]392
393int ll_merge_marker_size(const char *path)
394{
395 static struct git_attr_check check;
396 int marker_size = DEFAULT_CONFLICT_MARKER_SIZE;
397
398 if (!check.attr)
399 check.attr = git_attr("conflict-marker-size");
Michael Haggertyd932f4e2011-08-04 04:36:33[diff] [blame]400 if (!git_check_attr(path, 1, &check) && check.value) {
Junio C Hamano85885672010-01-17 07:28:46[diff] [blame]401 marker_size = atoi(check.value);
402 if (marker_size <= 0)
403 marker_size = DEFAULT_CONFLICT_MARKER_SIZE;
404 }
405 return marker_size;
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]406}