diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2015-03-09 10:18:39 -0400 |
|---|---|---|
| committer | Edward Thomson <ethomson@edwardthomson.com> | 2015-03-09 10:18:39 -0400 |
| commit | d7c81945b0619ac707ebd0fb007bf63c3bef3037 (patch) | |
| tree | 8c5a1b725c3e2f1fe6137d7580fc27fa9ee1d5fa | |
| parent | 959482e104261286ea31f261d6694424b330938b (diff) | |
| parent | 2461e0d20f46b6cfaf222759aca4a993ddc7b215 (diff) | |
| download | libgit2-d7c81945b0619ac707ebd0fb007bf63c3bef3037.tar.gz | |
Merge pull request #2964 from git-up/fixes
Fixes
| -rw-r--r-- | src/reset.c | 2 | ||||
| -rw-r--r-- | tests/reset/reset_helpers.c | 2 |
2 files changed, 2 insertions, 2 deletions
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; 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)); |