proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-06-06 21:47:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2964 from git-up/fixes

Browse Source 
Fixes
This commit is contained in:
Edward Thomson 2015-03-09 10:18:39 -04:00
commit d7c81945b0
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/reset.c
View File

@ -149,7 +149,7 @@ int git_reset(
if (reset_type == GIT_RESET_HARD) { if (reset_type == GIT_RESET_HARD) {
/* overwrite working directory with HEAD */ /* overwrite working directory with HEAD */
opts.checkout_strategy = GIT_CHECKOUT_FORCE | GIT_CHECKOUT_SKIP_UNMERGED; opts.checkout_strategy = GIT_CHECKOUT_FORCE;
if ((error = git_checkout_tree(repo, (git_object *)tree, &opts)) < 0) if ((error = git_checkout_tree(repo, (git_object *)tree, &opts)) < 0)
goto cleanup; goto cleanup;

2
tests/reset/reset_helpers.c
View File

@ -7,7 +7,7 @@ void reflog_check(git_repository *repo, const char *refname,
git_reflog *log; git_reflog *log;
const git_reflog_entry *entry; const git_reflog_entry *entry;
exp_email = exp_email; GIT_UNUSED(exp_email);
cl_git_pass(git_reflog_read(&log, repo, refname)); cl_git_pass(git_reflog_read(&log, repo, refname));
cl_assert_equal_i(exp_count, git_reflog_entrycount(log)); cl_assert_equal_i(exp_count, git_reflog_entrycount(log));