Patchwork [U-Boot,U-Boot,1/3] spl: common: Properly ignore spl/Makefile in .gitignore

login
register
mail settings
Submitter Dan Murphy
Date Jan. 10, 2014, 1:02 p.m.
Message ID <1389358937-30151-1-git-send-email-dmurphy@ti.com>
Download mbox | patch
Permalink /patch/309263/
State Superseded
Headers show

Comments

Dan Murphy - Jan. 10, 2014, 1:02 p.m.
The spl directory is ignored by git as these objects are created
during spl creation.  The only file not created is the Makefile.

This file can be modified and checked in via git.

Due to the order of rule precedence having the whole directory
ignored first then indicating not to ignore the Makefile is not correct
the message to force adding the Makefile is still shown.

So reorder the .gitignore for the Makefile and indicate that the Makefile
does not need to be ignored first and then indicate everything else in spl
should be ignored after wards.

Signed-off-by: Dan Murphy <dmurphy@ti.com>
---
 .gitignore |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch

diff --git a/.gitignore b/.gitignore
index 3b14c25..7f006c8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -57,8 +57,8 @@ 
 /errlog
 /reloc_off
 
-/spl/
 !/spl/Makefile
+/spl/*
 /tpl/
 
 /include/generated/