From: Nguyen Thai Ngoc Duy <pclouds@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Johannes Sixt <j.sixt@viscovery.net>,
Taylor Hedberg <tmhedberg@gmail.com>,
Bertrand BENOIT <projettwk@users.sourceforge.net>,
git@vger.kernel.org
Subject: Re: [PATCH] Add test that checkout does not overwrite entries in .git/info/exclude
Date: Sun, 27 Nov 2011 17:13:13 +0700 [thread overview]
Message-ID: <CACsJy8AXLBNSPmeEJjD1QX2zF1ic+S9kb_+4=EBO9xd07xhAYQ@mail.gmail.com> (raw)
In-Reply-To: <7vk46th5bz.fsf@alter.siamese.dyndns.org>
On Mon, Nov 21, 2011 at 10:18 PM, Junio C Hamano <gitster@pobox.com> wrote:
> In the medium term, I think one reasonable way forward solving the "TODO
> that used to be tracked but now untracked and ignored" issue is to
> introduce "info/exclude-override" that comes between command line and
> in-tree patterns. The info/exclude file is designed as the fallback
> definition to be used when all other sources are too lax, and comes near
> the precedence stack; the "TODO" situation however calls for an override
> that is stronger than the in-tree patterns.
Short term, should we allow an option to disregard ignored status
(i.e. all files are precious)? Something like [2/2]
[1/2] checkout,merge: loosen overwriting untracked file check based on
info/exclude
[2/2] checkout,merge: disallow overwriting ignored files with
--no-overwrite-ignore
--
Duy
next prev parent reply other threads:[~2011-11-27 10:13 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-20 13:42 Bug report - local (and git ignored) file silently removed after checkout Bertrand BENOIT
2011-11-20 21:16 ` Junio C Hamano
2011-11-20 22:19 ` Taylor Hedberg
2011-11-21 3:36 ` Junio C Hamano
2011-11-21 7:23 ` [PATCH] Add test that checkout does not overwrite entries in .git/info/exclude Johannes Sixt
2011-11-21 7:45 ` Philip Oakley
2011-11-21 7:59 ` Junio C Hamano
2011-11-21 7:50 ` Junio C Hamano
2011-11-21 8:52 ` Nguyen Thai Ngoc Duy
2011-11-21 17:27 ` Junio C Hamano
2011-11-23 11:31 ` Nguyen Thai Ngoc Duy
2011-11-21 8:17 ` Nguyen Thai Ngoc Duy
2011-11-21 15:18 ` Junio C Hamano
2011-11-21 15:44 ` Bertrand BENOIT
2011-11-23 11:40 ` Nguyen Thai Ngoc Duy
2011-11-23 17:16 ` Junio C Hamano
2011-11-24 1:35 ` Nguyen Thai Ngoc Duy
2011-11-24 5:17 ` Junio C Hamano
2011-11-24 5:39 ` Nguyen Thai Ngoc Duy
2011-11-27 10:13 ` Nguyen Thai Ngoc Duy [this message]
2011-11-27 10:15 ` [PATCH 1/2] checkout,merge: loosen overwriting untracked file check based on info/exclude Nguyễn Thái Ngọc Duy
2011-11-27 10:15 ` [PATCH 2/2] checkout,merge: disallow overwriting ignored files with --no-overwrite-ignore Nguyễn Thái Ngọc Duy
2011-11-29 18:17 ` [PATCH 1/2] checkout,merge: loosen overwriting untracked file check based on info/exclude Junio C Hamano
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='CACsJy8AXLBNSPmeEJjD1QX2zF1ic+S9kb_+4=EBO9xd07xhAYQ@mail.gmail.com' \
--to=pclouds@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j.sixt@viscovery.net \
--cc=projettwk@users.sourceforge.net \
--cc=tmhedberg@gmail.com \
/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).