diff options
| author | Carlos Martín Nieto <cmn@dwim.me> | 2015-01-07 12:23:05 +0000 |
|---|---|---|
| committer | Carlos Martín Nieto <cmn@dwim.me> | 2015-03-03 14:40:50 +0100 |
| commit | 659cf2029f322ea876d663d85783b48945227e8f (patch) | |
| tree | 435e9185c38d96656e21db83fc736b5294499b10 /tests/merge/merge_helpers.c | |
| parent | 99b68a2aecfaa24f252f265d61b230b8e2576dd2 (diff) | |
| download | libgit2-659cf2029f322ea876d663d85783b48945227e8f.tar.gz | |
Remove the signature from ref-modifying functions
The signature for the reflog is not something which changes
dynamically. Almost all uses will be NULL, since we want for the
repository's default identity to be used, making it noise.
In order to allow for changing the identity, we instead provide
git_repository_set_ident() and git_repository_ident() which allow a user
to override the choice of signature.
Diffstat (limited to 'tests/merge/merge_helpers.c')
| -rw-r--r-- | tests/merge/merge_helpers.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/merge/merge_helpers.c b/tests/merge/merge_helpers.c index 9a6ead984..33710f403 100644 --- a/tests/merge/merge_helpers.c +++ b/tests/merge/merge_helpers.c @@ -90,7 +90,7 @@ int merge_branches(git_repository *repo, head_checkout_opts.checkout_strategy = GIT_CHECKOUT_FORCE; - cl_git_pass(git_reference_symbolic_create(&head_ref, repo, "HEAD", ours_branch, 1, NULL, NULL)); + cl_git_pass(git_reference_symbolic_create(&head_ref, repo, "HEAD", ours_branch, 1, NULL)); cl_git_pass(git_checkout_head(repo, &head_checkout_opts)); cl_git_pass(git_reference_lookup(&theirs_ref, repo, theirs_branch)); |