[U-Boot] [PATCH] Trivial fix to .gitignore for spl/Makefile

[U-Boot] [PATCH] Trivial fix to .gitignore for spl/Makefile

[Ralph Siemsen]

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.

Signed-off-by: Ralph Siemsen <ralphs@netwinder.org>
---
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(-)

diff --git a/.gitignore b/.gitignore
index cba5eac..a6b2d1c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,8 +47,8 @@
 /errlog
 /reloc_off
 
-!/spl/Makefile
 /spl/*
+!/spl/Makefile
 /tpl/
 
 #
-- 
1.9.0

[U-Boot] [PATCH] Trivial fix to .gitignore for spl/Makefile

[Masahiro Yamada]

Hi Ralph,

On Thu, 1 May 2014 14:18:41 -0400
Ralph Siemsen <ralphs@netwinder.org> 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.
> 
> Signed-off-by: Ralph Siemsen <ralphs@netwinder.org>


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.


Tested-by: Masahiro Yamada <yamada.m@jp.panasonic.com> [on git v1.7.9.5 / v1.8.3.2]


Best Regards
Masahiro Yamada

[U-Boot] Trivial fix to .gitignore for spl/Makefile

[Tom Rini]

On Thu, May 01, 2014 at 02:18:41PM -0400, Ralph Siemsen 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.
> 
> Signed-off-by: Ralph Siemsen <ralphs@netwinder.org>
> Tested-by: Masahiro Yamada <yamada.m@jp.panasonic.com> [on git v1.7.9.5 / v1.8.3.2]
> 

Applied to u-boot/master, thanks!

-- 
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>