From b5ab878f4c3ec6134c043a8c22d22290da1e3403 Mon Sep 17 00:00:00 2001 From: Pierre-Olivier Latour Date: Sun, 8 Mar 2015 14:09:50 -0700 Subject: [PATCH 1/2] Fixed build warning --- tests/reset/reset_helpers.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/reset/reset_helpers.c b/tests/reset/reset_helpers.c index ec67b8634..e6acec9ef 100644 --- a/tests/reset/reset_helpers.c +++ b/tests/reset/reset_helpers.c @@ -7,7 +7,7 @@ void reflog_check(git_repository *repo, const char *refname, git_reflog *log; const git_reflog_entry *entry; - exp_email = exp_email; + GIT_UNUSED(exp_email); cl_git_pass(git_reflog_read(&log, repo, refname)); cl_assert_equal_i(exp_count, git_reflog_entrycount(log)); From 2461e0d20f46b6cfaf222759aca4a993ddc7b215 Mon Sep 17 00:00:00 2001 From: Pierre-Olivier Latour Date: Sun, 8 Mar 2015 14:10:02 -0700 Subject: [PATCH 2/2] Removed unnecessary GIT_CHECKOUT_SKIP_UNMERGED for GIT_RESET_HARD --- src/reset.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/reset.c b/src/reset.c index f42a0b3ae..351ecaa2a 100644 --- a/src/reset.c +++ b/src/reset.c @@ -149,7 +149,7 @@ int git_reset( if (reset_type == GIT_RESET_HARD) { /* 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) goto cleanup;