diff options
author | Russell Belfer <rb@github.com> | 2014-02-07 16:14:17 -0800 |
---|---|---|
committer | Russell Belfer <rb@github.com> | 2014-02-07 16:14:17 -0800 |
commit | 2d9291943c253e9e1520f87b13abb1e81cffdb29 (patch) | |
tree | 653489f8d29124bb0a6d32d14dfed9d9974bc267 /tests/checkout/tree.c | |
parent | 57c47af107b45b73a46a1d157f8f758edd536bc7 (diff) | |
parent | db55bb73ff4bccbaccbb4c3a7f6b1fcf09498df7 (diff) | |
download | libgit2-2d9291943c253e9e1520f87b13abb1e81cffdb29.tar.gz |
Merge pull request #2099 from libgit2/bs/more-reflog-stuff
More reflogness
Diffstat (limited to 'tests/checkout/tree.c')
-rw-r--r-- | tests/checkout/tree.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/checkout/tree.c b/tests/checkout/tree.c index 407908ad3..f433b2698 100644 --- a/tests/checkout/tree.c +++ b/tests/checkout/tree.c @@ -571,7 +571,7 @@ void test_checkout_tree__donot_update_deleted_file_by_default(void) cl_git_pass(git_oid_fromstr(&old_id, "be3563ae3f795b2b4353bcce3a527ad0a4f7f644")); cl_git_pass(git_commit_lookup(&old_commit, g_repo, &old_id)); - cl_git_pass(git_reset(g_repo, (git_object *)old_commit, GIT_RESET_HARD)); + cl_git_pass(git_reset(g_repo, (git_object *)old_commit, GIT_RESET_HARD, NULL, NULL)); cl_git_pass(p_unlink("testrepo/branch_file.txt")); cl_git_pass(git_index_remove_bypath(index ,"branch_file.txt")); |