delta/libgit2.git/tests/merge/workdir, branch ethomson/diff_parse

fileops: rename to "futils.h" to match function signatures

2019-07-20T17:11:20+00:00

Our file utils functions all have a "futils" prefix, e.g.
`git_futils_touch`. One would thus naturally guess that their
definitions and implementation would live in files "futils.h" and
"futils.c", respectively, but in fact they live in "fileops.h".

Rename the files to match expectations.

tests: merge::analysis: use variants to deduplicate test suites

2019-06-13T09:59:50+00:00

Since commit 394951ad4 (tests: allow for simple data-driven
tests, 2019-06-07), we have the ability to run a given test suite
with multiple variants. Use this new feature to deduplicate the
test suites for merge::{trees,workdir}::analysis into a single
test suite.

Review fixes:

2019-06-10T10:22:02+00:00

- whitespace -> tabs
- comment style
- improve repo naming in merge/trees/analysis tests.

Refactor testing:

2019-06-10T10:22:02+00:00

- move duplication between merge/trees/ and merge/workdir/ into merge/analysis{.c,.h}
- remove merge-resolve.git resource, open the existing merge-resolve as a bare repo instead.

merge: add doc header to analysis tests

2019-06-10T10:22:02+00:00

object_type: use new enumeration names

2018-12-01T11:54:57+00:00

Use the new object_type enumeration names within the codebase.

Merge pull request #4770 from tiennou/feature/merge-analysis-any-branch

2018-11-30T08:46:14+00:00

Allow merge analysis against any reference

Merge branch 'issue-4203'

2018-10-20T19:18:04+00:00

merge: make analysis possible against a non-HEAD reference

2018-10-19T18:39:17+00:00

This moves the current merge analysis code into a more generic version
that can work against any reference.

Also change the tests to check returned analysis values exactly.

Merge pull request #4702 from tiennou/fix/coverity

2018-07-20T10:56:49+00:00

Assorted Coverity fixes