[PATCH] reset: unbreak hard resets with GIT_WORK_TREE
- From
Jeff King <peff@peff.net>
- Date
- Dec 30, 2009, 08:47 UTC
- Message-ID
- <20091230084702.GA19649@coredump.intra.peff.net>
- In-Reply-To
- <20091229215015.GA1529@coredump.intra.peff.net>
Commit 952dfc6 tried to tighten the safety valves for doing a "reset --hard" in a bare repository or outside the work tree, but accidentally broke the case for GIT_WORK_TREE. This patch unbreaks it.
Most git commands which need a work tree simply use NEED_WORK_TREE in git.c to die before they get to their cmd_* function. Reset, however, only needs a work tree in some cases, and so must handle the work tree itself. The error that 952dfc6 made was to simply forbid certain operations if the work tree was not set up; instead, we need to do the same thing that NEED_WORK_TREE does, which is to call setup_work_tree(). We no longer have to worry about dying in the non-worktree case, as setup_work_tree handles that for us.
Signed-off-by: Jeff King <peff@peff.net> --- Junio, this should probably go onto maint. I based it directly on 952dfc6, which is in v1.6.6 and v1.6.5.5.
builtin-reset.c | 6 ++---- t/t7103-reset-bare.sh | 6 ++++++ 2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/builtin-reset.c b/builtin-reset.c index 11d1c6e..e4418bc 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 diff --git a/t/t7103-reset-bare.sh b/t/t7103-reset-bare.sh index 68041df..afb55b3 100755 --- a/t/t7103-reset-bare.sh +++ b/t/t7103-reset-bare.sh @@ -29,6 +29,12 @@ test_expect_success 'soft reset is ok' ' (cd .git && git reset --soft) ' +test_expect_success 'hard reset works with GIT_WORK_TREE' ' + mkdir worktree && + GIT_WORK_TREE=$PWD/worktree GIT_DIR=$PWD/.git git reset --hard && + test_cmp file worktree/file +' + test_expect_success 'setup bare' ' git clone --bare . bare.git && cd bare.git
-- 1.6.6.320.g7c9b3