All of lore.kernel.org
 help / color / mirror / Atom feed
From: Michael J Gruber <git@drmicha.warpmail.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Guilherme <guibufolo@gmail.com>
Subject: Re: [PATCH] check-ignore: clarify treatment of tracked files
Date: Mon, 08 Dec 2014 17:13:08 +0100	[thread overview]
Message-ID: <5485CE14.3080207@drmicha.warpmail.net> (raw)
In-Reply-To: <xmqqzjb3rx1u.fsf@gitster.dls.corp.google.com>

Junio C Hamano schrieb am 04.12.2014 um 21:15:
> Michael J Gruber <git@drmicha.warpmail.net> writes:
> 
>> By default, check-ignore does not list tracked files at all since
>> they are not subject to ignore patterns.
>>
>> Make this clearer in the man page.
>>
>> Reported-by: Guilherme <guibufolo@gmail.com>
>> Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
>> ---
>> That really is a bit confusing. Does this help?
> 
> Thanks.
> 
> "git check-ignore" is a tool to debug your .gitignore settings when
> your expectation does not match the reality, so having this new
> sentence here is a good thing to do, but I wonder if there is a more
> prominent and central place where people learn about the ignore
> mechanism the first place.  If we had this sentence there, too, that
> may reduce the need to debug their .gitignore settings in the first
> place.
> 
> Perhaps Documentation/gitignore.txt?  Documentation/user-manual.txt?

gitignore.txt has

DESCRIPTION
       A gitignore file specifies intentionally untracked files that Git
should ignore. Files already tracked by Git are not affected; see the
       NOTES below for details.

I doesn't get any clearer. But then the notes read:

NOTES
       The purpose of gitignore files is to ensure that certain files
not tracked by Git remain untracked.

       To ignore uncommitted changes in a file that is already tracked,
use git update-index --assume-unchanged.

       To stop tracking a file that is currently tracked, use git rm
--cached.

That is again clear for our case (line 1), but line 2 is troublesome,
isn't it?

user-manual mainly refers to gitignore. So I guess it's good, but that
line about assume-unchanged doesn't quite match with the discussion in
another current thread.

Michael

      reply	other threads:[~2014-12-08 16:13 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-12-04  9:06 git add <single file> and git add <list of files> behave differentely for ignored files Guilherme
2014-12-04 11:11 ` Konstantin Khomoutov
2014-12-04 11:49   ` Guilherme
2014-12-04 15:02 ` Michael J Gruber
2014-12-04 15:23   ` [PATCH] check-ignore: clarify treatment of tracked files Michael J Gruber
2014-12-04 20:15     ` Junio C Hamano
2014-12-08 16:13       ` Michael J Gruber [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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=5485CE14.3080207@drmicha.warpmail.net \
    --to=git@drmicha.warpmail.net \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=guibufolo@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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.