2009-04-27 04:06:40

by Hitoshi Mitake

[permalink] [raw]
Subject: [PATCH] ihex2fw should be ignored by scripts/.gitignore because ihex2fw is in scripts directory

Hi

I found this message from git-status on not modified clone of Linus's tree,

# Not currently on any branch.
# Untracked files:
# (use "git add <file>..." to include in what will be committed)
#
# scripts/ihex2fw
nothing added to commit but untracked files present (use "git add" to track)

This isn't a something fatal.
But I think this is not comfortable.

So I wrote the little patch to fix this. Please use.

Signed-off-by: Hitoshi Mitake <[email protected]>

---
firmware/.gitignore | 2 +-
scripts/.gitignore | 1 +
2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/firmware/.gitignore b/firmware/.gitignore
index d9c6901..e292d92 100644
--- a/firmware/.gitignore
+++ b/firmware/.gitignore
@@ -3,4 +3,4 @@
*.bin
*.csp
*.dsp
-ihex2fw
+
diff --git a/scripts/.gitignore b/scripts/.gitignore
index b939fbd..52cab46 100644
--- a/scripts/.gitignore
+++ b/scripts/.gitignore
@@ -7,3 +7,4 @@ pnmtologo
bin2c
unifdef
binoffset
+ihex2fw
--
1.5.6.5


2009-04-27 06:39:21

by David Woodhouse

[permalink] [raw]
Subject: Re: [PATCH] ihex2fw should be ignored by scripts/.gitignore because ihex2fw is in scripts directory

On Mon, 2009-04-27 at 12:43 +0900, Hitoshi Mitake wrote:
>
> I found this message from git-status on not modified clone of Linus's
> tree,
>
> # Not currently on any branch.
> # Untracked files:
> # (use "git add <file>..." to include in what will be committed)
> #
> # scripts/ihex2fw
> nothing added to commit but untracked files present (use "git add" to
> track)

Actually, ihex2fw should never have been moved from the firmware/
directory to scripts/. I've already moved it back, so the .gitignore
files are correct as they are.

--
David Woodhouse Open Source Technology Centre
[email protected] Intel Corporation

2009-04-27 11:04:42

by Hitoshi Mitake

[permalink] [raw]
Subject: Re: [PATCH] ihex2fw should be ignored by scripts/.gitignore because ihex2fw is in scripts directory

On Mon, Apr 27, 2009 at 15:39, David Woodhouse <[email protected]> wrote:
> On Mon, 2009-04-27 at 12:43 +0900, Hitoshi Mitake wrote:
>>
>> I found this message from git-status on not modified clone of Linus's
>> tree,
>>
>> # Not currently on any branch.
>> # Untracked files:
>> # ? (use "git add <file>..." to include in what will be committed)
>> #
>> # ? ? ? scripts/ihex2fw
>> nothing added to commit but untracked files present (use "git add" to
>> track)
>
> Actually, ihex2fw should never have been moved from the firmware/
> directory to scripts/. I've already moved it back, so the .gitignore
> files are correct as they are.
>

I didn't know that. Thanks.