diff options
author | Junio C Hamano <gitster@pobox.com> | 2010-01-20 12:22:58 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-01-20 12:22:58 -0800 |
commit | 806e5c8682c8621b19529c21899dcb14a1035d11 (patch) | |
tree | c1fe88e5faa88f61548393583acd89092e7521d7 /builtin-reset.c | |
parent | Merge branch 'tr/maint-1.6.5-bash-prompt-show-submodule-changes' into maint-1... (diff) | |
parent | reset: unbreak hard resets with GIT_WORK_TREE (diff) | |
download | tgif-806e5c8682c8621b19529c21899dcb14a1035d11.tar.xz |
Merge branch 'jk/maint-1.6.5-reset-hard' into maint-1.6.5
* 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 11d1c6e4d6..e4418bced2 100644 --- a/builtin-reset.c +++ b/builtin-reset.c @@ -286,10 +286,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 |