diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-01-10 08:52:53 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-10 08:52:53 -0800 |
| commit | 0b4ae29f0328fb8c270030abad132e8f50e05381 (patch) | |
| tree | 7c95d5b74f47a5c98a35ede8498d4bdbc8b6ff02 /builtin-reset.c | |
| parent | 84d52cabe7044786b5cc448ffeb97b7c1e667156 (diff) | |
| parent | cd0f0f68e1074e684a014e1714104693097caabc (diff) | |
| download | git-0b4ae29f0328fb8c270030abad132e8f50e05381.tar.gz git-0b4ae29f0328fb8c270030abad132e8f50e05381.tar.xz | |
Merge branch 'jk/maint-1.6.5-reset-hard'
* jk/maint-1.6.5-reset-hard:
reset: unbreak hard resets with GIT_WORK_TREE
Diffstat (limited to 'builtin-reset.c')
| -rw-r--r-- | builtin-reset.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/builtin-reset.c b/builtin-reset.c index 31babd0b9..5b647422d 100644 --- a/builtin-reset.c +++ b/builtin-reset.c @@ -285,10 +285,8 @@ 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) - && !is_inside_work_tree()) - die("%s reset requires a work tree", - reset_type_names[reset_type]); + if (reset_type == HARD || reset_type == MERGE) + setup_work_tree(); /* Soft reset does not touch the index file nor the working tree * at all, but requires them in a good order. Other resets reset |