From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
Cc: Junio C Hamano <gitster@pobox.com>, Fyn Fynn <fynfynn@gmail.com>,
Nguyen Thai Ngoc Duy <pclouds@gmail.com>,
Nanako Shiraishi <nanako3@lavabit.com>,
git@vger.kernel.org
Subject: Re: [PATCH] reset: unbreak hard resets with GIT_WORK_TREE
Date: Wed, 30 Dec 2009 09:54:54 -0800 [thread overview]
Message-ID: <7v8wck2vpt.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: 20091230084702.GA19649@coredump.intra.peff.net
Jeff King <peff@peff.net> writes:
> 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.
Sounds very sane to me. Thanks.
prev parent reply other threads:[~2009-12-30 17:55 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-29 6:47 Possible bug in 1.6.6 with reset --hard and $GIT_WORK_TREE Fyn Fynn
2009-12-29 8:12 ` Tay Ray Chuan
2009-12-29 8:38 ` Nguyen Thai Ngoc Duy
2009-12-29 11:04 ` Nanako Shiraishi
2009-12-29 11:36 ` Nguyen Thai Ngoc Duy
2009-12-29 21:09 ` Fyn Fynn
2009-12-29 21:50 ` Jeff King
2009-12-30 8:47 ` [PATCH] reset: unbreak hard resets with GIT_WORK_TREE Jeff King
2009-12-30 17:54 ` Junio C Hamano [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7v8wck2vpt.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=fynfynn@gmail.com \
--cc=git@vger.kernel.org \
--cc=nanako3@lavabit.com \
--cc=pclouds@gmail.com \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).