diff options
| author | Edward Thomson <ethomson@microsoft.com> | 2014-05-23 14:50:51 -0700 |
|---|---|---|
| committer | Edward Thomson <ethomson@edwardthomson.com> | 2014-07-01 17:32:15 -0400 |
| commit | 967f5a76b1c89f1f93840407fd2afd1e8005dad6 (patch) | |
| tree | 6f8c392d63aa0d7dc6e9a254cb37fdbecb7b9937 /tests | |
| parent | 1453bd20897d074a3f65d86f0d2bbb72ed23d071 (diff) | |
| download | libgit2-967f5a76b1c89f1f93840407fd2afd1e8005dad6.tar.gz | |
git_checkout_index: checkout other indexes
git_checkout_index can now check out other git_index's (that are not
necessarily the repository index). This allows checkout_index to use
the repository's index for stat cache information instead of the index
data being checked out. git_merge and friends now check out their
indexes directly instead of trying to blend it into the running index.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/merge/workdir/dirty.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/merge/workdir/dirty.c b/tests/merge/workdir/dirty.c index 776e4ea69..2f776853e 100644 --- a/tests/merge/workdir/dirty.c +++ b/tests/merge/workdir/dirty.c @@ -97,7 +97,7 @@ static int merge_branch(void) cl_git_pass(git_oid_fromstr(&their_oids[0], MERGE_BRANCH_OID)); cl_git_pass(git_merge_head_from_id(&their_heads[0], repo, &their_oids[0])); - checkout_opts.checkout_strategy = GIT_CHECKOUT_SAFE | GIT_CHECKOUT_ALLOW_CONFLICTS; + checkout_opts.checkout_strategy = GIT_CHECKOUT_SAFE; error = git_merge(repo, (const git_merge_head **)their_heads, 1, &merge_opts, &checkout_opts); git_merge_head_free(their_heads[0]); |