diff options
| author | Carlos Martín Nieto <cmn@dwim.me> | 2014-01-15 12:51:31 +0100 |
|---|---|---|
| committer | Carlos Martín Nieto <cmn@dwim.me> | 2014-01-15 13:32:43 +0100 |
| commit | 0b28217bdae4fd64f5b6b8f4cb8a6139518d037e (patch) | |
| tree | 68ff2ad34826372104b12ed6de6dd9fecb905151 /tests/merge/merge_helpers.c | |
| parent | 3c1b3ded12afa443158287c22b81fb9419680072 (diff) | |
| download | libgit2-0b28217bdae4fd64f5b6b8f4cb8a6139518d037e.tar.gz | |
refs: remove the _with_log differentiation
Any well-behaved program should write a descriptive message to the
reflog whenever it updates a reference. Let's make this more prominent
by removing the version without the reflog parameters.
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 5660179a7..7ce5e28ff 100644 --- a/tests/merge/merge_helpers.c +++ b/tests/merge/merge_helpers.c @@ -87,7 +87,7 @@ int merge_branches(git_merge_result **result, git_repository *repo, const char * head_checkout_opts.checkout_strategy = GIT_CHECKOUT_FORCE; - cl_git_pass(git_reference_symbolic_create(&head_ref, repo, "HEAD", ours_branch, 1)); + cl_git_pass(git_reference_symbolic_create(&head_ref, repo, "HEAD", ours_branch, 1, NULL, NULL)); cl_git_pass(git_checkout_head(repo, &head_checkout_opts)); cl_git_pass(git_reference_lookup(&theirs_ref, repo, theirs_branch)); |