From: Jakub Narebski <jnareb@gmail.com>
To: Jiri Slaby <jslaby@suse.cz>
Cc: Andrew Morton <akpm@linux-foundation.org>,
git@vger.kernel.org, linux-kernel@vger.kernel.org,
jirislaby@gmail.com, Johannes Sixt <j.sixt@viscovery.net>
Subject: Re: [PATCH 1/1] gitignore: do not ignore include/linux/
Date: Fri, 05 Mar 2010 02:43:29 -0800 (PST) [thread overview]
Message-ID: <m3pr3jkq26.fsf@localhost.localdomain> (raw)
In-Reply-To: <1267780845-10547-1-git-send-email-jslaby@suse.cz>
Jiri Slaby <jslaby@suse.cz> writes:
> linux entry in .gitignore means that everything in include/linux/
> gets ignored with git 1.7.
>
> Prepend a slash to entries which are toplevel to avoid that
>
> Signed-off-by: Jiri Slaby <jslaby@suse.cz>
> Cc: Johannes Sixt <j.sixt@viscovery.net>
> ---
> .gitignore | 20 ++++++++++----------
> 1 files changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/.gitignore b/.gitignore
> index efab0eb..fe6ebb9 100644
> --- a/.gitignore
> +++ b/.gitignore
> @@ -34,16 +34,16 @@ modules.builtin
> #
> # Top-level generic files
> #
> -tags
> -TAGS
> -linux
> -vmlinux
> -vmlinuz
> -System.map
> -Module.markers
> -Module.symvers
> -!.gitignore
> -!.mailmap
> +/tags
> +/TAGS
> +/linux
> +/vmlinux
> +/vmlinuz
> +/System.map
> +/Module.markers
> +/Module.symvers
> +!/.gitignore
> +!/.mailmap
>
> #
> # Generated include files
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.
#
# Top-level generic files
#
-tags
-TAGS
-linux
-vmlinux
-vmlinuz
-System.map
-Module.markers
-Module.symvers
+/tags
+/TAGS
+/linux
+/vmlinux
+/vmlinuz
+/System.map
+/Module.markers
+/Module.symvers
!.gitignore
!.mailmap
--
Jakub Narebski
Poland
ShadeHawk on #git
next prev parent reply other threads:[~2010-03-05 10:43 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 [this message]
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
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=m3pr3jkq26.fsf@localhost.localdomain \
--to=jnareb@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=git@vger.kernel.org \
--cc=j.sixt@viscovery.net \
--cc=jirislaby@gmail.com \
--cc=jslaby@suse.cz \
--cc=linux-kernel@vger.kernel.org \
/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.