diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2012-10-24 01:32:01 +0400 |
|---|---|---|
| committer | Edward Thomson <ethomson@edwardthomson.com> | 2012-10-25 05:24:37 +0400 |
| commit | 03bdb2addd02948e0e42b509e5c26c6eb5e7e1de (patch) | |
| tree | 886a12f4ff2390f21f9fb3c6e9c15a1781875521 /src/reset.c | |
| parent | 632d8b230bf38cc61cd70b55a54ae2f52502b4af (diff) | |
GIT_EUNMERGED
Diffstat (limited to 'src/reset.c')
| -rw-r--r-- | src/reset.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/reset.c b/src/reset.c index aff5b9f88..66338e655 100644 --- a/src/reset.c +++ b/src/reset.c @@ -92,6 +92,7 @@ int git_reset( if (reset_type == GIT_RESET_SOFT && (git_repository_state(repo) == GIT_REPOSITORY_STATE_MERGE)) { giterr_set(GITERR_OBJECT, "%s (soft) while in the middle of a merge.", ERROR_MSG); + error = GIT_EUNMERGED; goto cleanup; } |