On Tue, Jun 21, 2016 at 10:20:14PM +0100, Kieran Bingham wrote:
> On 21/06/16 22:11, Omar Sandoval wrote:
> > From: Omar Sandoval <[email protected]>
> >
> > Since scripts/gdb/linux/constants.py is autogenerated, this should have
> > been added to .gitignore when it was introduced.
> >
> > Fixes: f197d75fcad1 ("scripts/gdb: provide linux constants")
> > Signed-off-by: Omar Sandoval <[email protected]>
> > ---
> > Thanks, Kieran, I totally missed the comment in top-level .gitignore.
> >
> > scripts/gdb/linux/.gitignore | 1 +
> > 1 file changed, 1 insertion(+)
> >
> > diff --git a/scripts/gdb/linux/.gitignore b/scripts/gdb/linux/.gitignore
> > index 52e4e61140d1..d5abd6ce9425 100644
> > --- a/scripts/gdb/linux/.gitignore
> > +++ b/scripts/gdb/linux/.gitignore
> > @@ -1,2 +1,3 @@
> > *.pyc
> > *.pyo
> > +/constants.py
>
> Does this work with '/' at the beginning of the line?
> It looks like all the other sub-tree .gitignores don't use a leading /
> on their ignores
>
> If you're happy, I'd like to drop the leading '/'.
>
> (I think I can do this silently as I pick the patch if you approve,
> rather than send another patch for a one-byte change)
>
> Other than that:
>
> Signed-off-by: Kieran Bingham <[email protected]>
> --
> Regards
>
> Kieran Bingham
Yeah, it should still be relative to the path containing the .gitignore:
----
$ mkdir test
$ cd test
$ git init
Initialized empty Git repository in /tmp/test/.git/
$ mkdir foo
$ touch foo/bar
$ git add foo/bar
$ git commit -m "Initial commit"
[master (root-commit) c9075695cce0] Initial commit
1 file changed, 0 insertions(+), 0 deletions(-)
create mode 100644 foo/bar
$ touch asdf foo/asdf
$ git status
On branch master
Untracked files:
(use "git add <file>..." to include in what will be committed)
asdf
foo/asdf
nothing added to commit but untracked files present (use "git add" to track)
$ echo "/asdf" > foo/.gitignore
$ git add foo/.gitignore
$ git commit -m "Test"
[master dc92ad57d7e8] Test
1 file changed, 1 insertion(+)
create mode 100644 foo/.gitignore
$ git status
On branch master
Untracked files:
(use "git add <file>..." to include in what will be committed)
asdf
nothing added to commit but untracked files present (use "git add" to track)
----
tools/thermal/tmon/.gitignore also uses the leading slash.
If you want to drop the /, I'm okay with it.
--
Omar
