On Sat, Feb 15, 2014 at 4:14 PM, Nguyễn Thái Ngọc Duy <pclouds@xxxxxxxxx> wrote: > --mixed does mainly two things: read_from_tree(), which does not > require a worktree, and refresh_index(), which does. .. and I should have run the entire test suite before sending this. It breaks t7103.5 (reset --mixed in bare repository). That test seems wrong though, in my opinon.. > > Reported-by: Patrick Palka <patrick@xxxxxxxxxxxx> > Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@xxxxxxxxx> > --- > builtin/reset.c | 2 +- > t/t7102-reset.sh | 11 +++++++++++ > 2 files changed, 12 insertions(+), 1 deletion(-) > > diff --git a/builtin/reset.c b/builtin/reset.c > index 6004803..9928c28 100644 > --- a/builtin/reset.c > +++ b/builtin/reset.c > @@ -320,7 +320,7 @@ int cmd_reset(int argc, const char **argv, const char *prefix) > if (reset_type == NONE) > reset_type = MIXED; /* by default */ > > - if (reset_type != SOFT && reset_type != MIXED) > + if (reset_type != SOFT) > setup_work_tree(); > > if (reset_type == MIXED && is_bare_repository()) > diff --git a/t/t7102-reset.sh b/t/t7102-reset.sh > index 8d4b50d..ee117e2 100755 > --- a/t/t7102-reset.sh > +++ b/t/t7102-reset.sh > @@ -535,4 +535,15 @@ test_expect_success 'reset with paths accepts tree' ' > git diff HEAD --exit-code > ' > > +test_expect_success 'reset --mixed sets up work tree' ' > + git init mixed_worktree && > + ( > + cd mixed_worktree && > + test_commit dummy > + ) && > + : >expect && > + git --git-dir=mixed_worktree/.git --work-tree=mixed_worktree reset >actual && > + test_cmp expect actual > +' > + > test_done > -- > 1.8.5.2.240.g8478abd > -- Duy -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html