git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Taylor Hedberg <tmhedberg@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Bertrand BENOIT <projettwk@users.sourceforge.net>, git@vger.kernel.org
Subject: Re: Bug report - local (and git ignored) file silently removed after checkout
Date: Sun, 20 Nov 2011 17:19:30 -0500	[thread overview]
Message-ID: <20111120221930.GF14902@foodlogiq3-xp-d620.thebe.ath.cx> (raw)
In-Reply-To: <7vehx2ijf8.fsf@alter.siamese.dyndns.org>

[-- Attachment #1: Type: text/plain, Size: 624 bytes --]

Junio C Hamano, Sun 2011-11-20 @ 13:16:27-0800:
> We do not have "not tracked, but precious (e.g. your TODO)" category;
> from time to time we have discussed possibilities of adding such to
> enrich the categorization, but nobody stepped up to actually do the
> work of designing let alone coding such a beast.

If I'm not mistaken, files ignored by .git/info/exclude rather than
.gitignore do exhibit this behavior. That is, Git will refuse a checkout
with an error message if it would overwrite a path listed in that file.

I don't know if that's actually intended behavior, but I've noticed it
before and made use of it.

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

  reply	other threads:[~2011-11-20 22:28 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 [this message]
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
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=20111120221930.GF14902@foodlogiq3-xp-d620.thebe.ath.cx \
    --to=tmhedberg@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=projettwk@users.sourceforge.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).