Skip to contentSkip to conversation

Trivial fix to .gitignore for spl/Makefile

PATCH In review Ralph Siemsen 3 participants 3 messages May 1, 2014 – May 13, 2014

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Trivial fix to .gitignore for spl/Makefile

Trivial fix to .gitignore for spl/Makefile

According to the gitignore man page:

"An optional prefix "!" which negates the pattern; any matching file excluded by a previous pattern will become included again." ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
So the directory exclude "/spl/*" must come before the exception for spl/Makefile otherwise it has no effect.

---
Note: feel free to adjust the commit message to remove the
gratuitous ascii art emphasis, etc.
Note2: kindly CC: me on any replies

---
 .gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
.gitignore +1 -1
index cba5eac..a6b2d1c 100644
@@ -47,8 +47,8 @@
 /errlog
 /reloc_off
 
-!/spl/Makefile
 /spl/*
+!/spl/Makefile
 /tpl/
 
 #
Signature · 1 line
1.9.0
#1 lore raw

PATCH 1/1 Trivial fix to .gitignore for spl/Makefile

Hi Ralph,

Quoted 11 lines · On Thu, 1 May 2014 14:18:41 -0400 Ralph Siemsen <[email protected]> wrote:

Trivial fix to .gitignore for spl/Makefile

According to the gitignore man page:

"An optional prefix "!" which negates the pattern; any matching file excluded by a previous pattern will become included again." ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
So the directory exclude "/spl/*" must come before the exception for spl/Makefile otherwise it has no effect.

I am Ccing Dan Murphy, the author of commit 86a8b3a207 just in case.

I am not sure if this change is trivial or not.
But anyway this patch worked for me
on git v1.7.9.5 and v1.8.3.2.

Best Regards
Masahiro Yamada

#2 lore raw
In reply to Ralph Siemsen
Quoted 4 lines · Ralph Siemsen

Trivial fix to .gitignore for spl/Makefile

According to the gitignore man page:

Quoted 9 lines

"An optional prefix "!" which negates the pattern; any matching file excluded by a previous pattern will become included again." ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
So the directory exclude "/spl/*" must come before the exception for spl/Makefile otherwise it has no effect.

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140512/b08afc78/attachment.pgp>