From: David Rientjes <rientjes@google.com>
To: "Américo Wang" <xiyou.wangcong@gmail.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
Jiri Slaby <jirislaby@gmail.com>,
Jakub Narebski <jnareb@gmail.com>, Jiri Slaby <jslaby@suse.cz>,
Andrew Morton <akpm@linux-foundation.org>,
git@vger.kernel.org, linux-kernel@vger.kernel.org,
Johannes Sixt <j.sixt@viscovery.net>
Subject: Re: [PATCH 1/1] gitignore: do not ignore include/linux/
Date: Wed, 10 Mar 2010 02:25:51 -0800 (PST) [thread overview]
Message-ID: <alpine.DEB.2.00.1003100223090.30021@chino.kir.corp.google.com> (raw)
In-Reply-To: <2375c9f91003100211vbe66a49g1bec37b2dcf609c2@mail.gmail.com>
[-- Attachment #1: Type: TEXT/PLAIN, Size: 940 bytes --]
On Wed, 10 Mar 2010, Américo Wang wrote:
> >> >> +!/.gitignore
> >> >> +!/.mailmap
> >> >
> >> > Actually you want to *not ignore* .gitignore and .mailmap (and
> >> > .gitattributes which is missing here) anywhere, not only as top-level
> >> > file. So .gitignore and .mailmap should not be prepended with slash.
> >>
> >> <and moved out of the 'Top-level generic files' section then>
> >>
> >
> > Please either revert 3b2a8c8f3c65 or merge the fixed up patch for
> > 2.6.34-rc2, otherwise include/linux will continue to be ignored by git
> > just like it is for 2.6.34-rc1.
>
> Why not apply the patch from Jiri? Since this problem is introduced
> by new version of git, not that commit.
>
Like I said, please either revert the commit that added "linux" to
.gitignore or merge Jiri's patch. I'm not interested in engaging in a
discussion about what can or cannot be merged during rc cycles, I just
hope this is resolved for rc2.
next prev parent reply other threads:[~2010-03-10 10:26 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-05 8:55 gitignore broken in git 1.7.0.1: slash checks leading dirs Jiri Slaby
2010-03-05 9:05 ` Johannes Sixt
2010-03-05 9:07 ` Jiri Slaby
2010-03-05 9:16 ` Johannes Sixt
2010-03-05 9:20 ` [PATCH 1/1] gitignore: do not ignore include/linux/ Jiri Slaby
2010-03-05 10:43 ` Jakub Narebski
2010-03-05 15:19 ` Jiri Slaby
2010-03-10 10:07 ` David Rientjes
2010-03-10 10:11 ` Américo Wang
2010-03-10 10:25 ` David Rientjes [this message]
2010-03-08 2:08 ` Américo Wang
2010-03-05 9:29 ` gitignore broken in git 1.7.0.1: slash checks leading dirs Jiri Slaby
2010-03-05 17:25 ` Jonathan Nieder
2010-03-05 19:30 ` Jiri Slaby
2010-03-05 15:12 ` Jonathan Nieder
2010-03-05 15:15 ` Jonathan Nieder
2010-03-05 15:34 ` Johannes Sixt
2010-03-05 15:56 ` [PATCH] gitignore.5: Clarify matching rules Jonathan Nieder
2010-03-05 17:01 ` gitignore broken in git 1.7.0.1: slash checks leading dirs 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=alpine.DEB.2.00.1003100223090.30021@chino.kir.corp.google.com \
--to=rientjes@google.com \
--cc=akpm@linux-foundation.org \
--cc=git@vger.kernel.org \
--cc=j.sixt@viscovery.net \
--cc=jirislaby@gmail.com \
--cc=jnareb@gmail.com \
--cc=jslaby@suse.cz \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
--cc=xiyou.wangcong@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).