diff mbox

gitignore: Track common.env in iotests gitignore

Message ID 60b9a8741264d4fc7042ae560ea859cd62babd1e.1425050482.git.crobinso@redhat.com
State New
Headers show

Commit Message

Cole Robinson Feb. 27, 2015, 3:21 p.m. UTC
Rather than track it in the toplevel gitignore

Signed-off-by: Cole Robinson <crobinso@redhat.com>
---
 .gitignore                    | 1 -
 tests/qemu-iotests/.gitignore | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

Comments

Eric Blake Feb. 27, 2015, 4:33 p.m. UTC | #1
On 02/27/2015 08:21 AM, Cole Robinson wrote:
> Rather than track it in the toplevel gitignore
> 
> Signed-off-by: Cole Robinson <crobinso@redhat.com>
> ---
>  .gitignore                    | 1 -
>  tests/qemu-iotests/.gitignore | 1 +
>  2 files changed, 1 insertion(+), 1 deletion(-)

I think that the fact that we have multiple .gitignore is confusing, and
would personally lean towards a patch that consolidates ALL ignores into
a single top-level file, instead of having to hunt multiple files for
patterns.  But my opinion on this matter is not strong enough for me to
provide a patch at this time...
Michael Tokarev Feb. 28, 2015, 9:56 a.m. UTC | #2
27.02.2015 19:33, Eric Blake wrote:
> On 02/27/2015 08:21 AM, Cole Robinson wrote:
>> Rather than track it in the toplevel gitignore
>>
>> Signed-off-by: Cole Robinson <crobinso@redhat.com>
>> ---
>>  .gitignore                    | 1 -
>>  tests/qemu-iotests/.gitignore | 1 +
>>  2 files changed, 1 insertion(+), 1 deletion(-)
> 
> I think that the fact that we have multiple .gitignore is confusing, and
> would personally lean towards a patch that consolidates ALL ignores into
> a single top-level file, instead of having to hunt multiple files for
> patterns.  But my opinion on this matter is not strong enough for me to
> provide a patch at this time...

Since tests/ is kind of special because it generates so many
various files in there, I think it is reasonable to have separate
.gitignore files in there.

Thanks,

/mjt
Michael Tokarev Feb. 28, 2015, 9:56 a.m. UTC | #3
Applied both to -trivial, thank you!

/mjt
diff mbox

Patch

diff --git a/.gitignore b/.gitignore
index 090f974..e32a584 100644
--- a/.gitignore
+++ b/.gitignore
@@ -109,4 +109,3 @@  cscope.*
 tags
 TAGS
 *~
-/tests/qemu-iotests/common.env
diff --git a/tests/qemu-iotests/.gitignore b/tests/qemu-iotests/.gitignore
index 0541f80..0711cbd 100644
--- a/tests/qemu-iotests/.gitignore
+++ b/tests/qemu-iotests/.gitignore
@@ -1,5 +1,6 @@ 
 check.log
 check.time
+common.env
 *.out.bad
 *.notrun
 socket_scm_helper