delta/libgit2.git, branch cmn/clone-submodule

submodule: add test initialising and cloning a repo

2015-05-12T09:13:41+00:00

We have a few tests checking each step, but we do not yet have a test
which tests the documented workflow for creating a submodule, namely
`setup_add` followed by cloning into it, followed by `add_finalize`.

Add such a test to protect against regressions in this workflow.

Merge pull request #3018 from ethomson/stash_apply

2015-05-12T08:29:58+00:00

Stash apply

checkout: better document the `baseline_index` opt

2015-05-11T18:13:31+00:00

stash application: document new API in CHANGELOG

2015-05-11T18:12:50+00:00

stash: propagate the error when writing a tree

2015-05-11T18:12:47+00:00

stash_apply: provide progress callbacks

2015-05-11T18:12:42+00:00

stash_apply: provide its own options structure

2015-05-11T18:12:39+00:00

stash: test checkout notify callbacks

2015-05-11T18:12:35+00:00

stash apply: default to at least GIT_CHECKOUT_SAFE

2015-05-11T18:12:31+00:00

stash: return GIT_EMERGECONFLICT on merge conflict

2015-05-11T18:12:27+00:00