delta/libgit2.git/tests/merge/driver.c, branch ethomson/https_proxy github.com: libgit2/libgit2.git Convert usage of `git_buf_free` to new `git_buf_dispose` 2018-06-10T17:34:37+00:00 Patrick Steinhardt ps@pks.im 2018-02-08T11:14:48+00:00 ecf4f33a4e327a91496f72816f9f02d923e5af05 






merge drivers: handle configured but not found driver
2016-03-17T15:06:00+00:00

Edward Thomson
ethomson@github.com

2016-02-29T02:30:00+00:00

d953c4505e09756b4b4f72b431a51867281643ca












merge driver: remove `check` callback
2016-03-17T15:06:00+00:00

Edward Thomson
ethomson@github.com

2016-02-28T14:34:11+00:00

6d8b2cdbee00f2c4e97796b52e05dd39bd655138

Since the `apply` callback can defer, the `check` callback is not
necessary.  Removing the `check` callback further makes the `payload`
unnecessary along with the `cleanup` callback.





Since the `apply` callback can defer, the `check` callback is not
necessary.  Removing the `check` callback further makes the `payload`
unnecessary along with the `cleanup` callback.







merge driver: tests for set and unset merge attribute
2016-03-17T15:02:27+00:00

Edward Thomson
ethomson@edwardthomson.com

2015-12-26T19:47:17+00:00

58d33126d44eeff69e375e500d1e77e03e2665a0

Ensure that setting the merge attribute forces the built-in default
`text` driver and does *not* honor the `merge.default` configuration
option.  Further ensure that unsetting the merge attribute forces
a conflict (the `binary` driver).





Ensure that setting the merge attribute forces the built-in default
`text` driver and does *not* honor the `merge.default` configuration
option.  Further ensure that unsetting the merge attribute forces
a conflict (the `binary` driver).







merge driver: tests for custom default merge drivers
2016-03-17T15:02:27+00:00

Edward Thomson
ethomson@edwardthomson.com

2015-12-25T06:34:39+00:00

d3f0875a60c4112f004c21aa0e02db7af9e79597












merge driver: test GIT_EMERGECONFLICT
2016-03-17T15:02:27+00:00

Edward Thomson
ethomson@edwardthomson.com

2015-12-24T05:52:02+00:00

7d307c1edc5430dce270302d539d6eab8ed054c7

When a `check` or `apply` callback function returns `GIT_EMERGECONFLICT`
stop and product a conflict.





When a `check` or `apply` callback function returns `GIT_EMERGECONFLICT`
stop and product a conflict.







merge driver: test GIT_PASSTHROUGH
2016-03-17T15:02:27+00:00

Edward Thomson
ethomson@edwardthomson.com

2015-12-24T05:44:58+00:00

59f293146503bf5e615161fe89c305f080755dd1

When a `check` or `apply` callback function returns `GIT_PASSTHROUGH`,
move on to the default merge driver.





When a `check` or `apply` callback function returns `GIT_PASSTHROUGH`,
move on to the default merge driver.







merge driver: introduce custom merge drivers
2016-03-17T15:02:26+00:00

Edward Thomson
ethomson@edwardthomson.com

2015-12-23T16:23:08+00:00

3f04219fcdcbc6369270eaf2d878d4fe7064254d

Consumers can now register custom merged drivers with
`git_merge_driver_register`.  This allows consumers to support the
merge drivers, as configured in `.gitattributes`.  Consumers will be
asked to perform the file-level merge when a custom driver is
configured.





Consumers can now register custom merged drivers with
`git_merge_driver_register`.  This allows consumers to support the
merge drivers, as configured in `.gitattributes`.  Consumers will be
asked to perform the file-level merge when a custom driver is
configured.