diff options
Diffstat (limited to 'builtin-reset.c')
| -rw-r--r-- | builtin-reset.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-reset.c b/builtin-reset.c index da61f20e8..52584afbd 100644 --- a/builtin-reset.c +++ b/builtin-reset.c @@ -319,7 +319,7 @@ int cmd_reset(int argc, const char **argv, const char *prefix) if (reset_type == NONE) reset_type = MIXED; /* by default */ - if (reset_type == HARD || reset_type == MERGE) + if (reset_type != SOFT && reset_type != MIXED) setup_work_tree(); if (reset_type == MIXED && is_bare_repository()) |