diff mbox

[for-2.3,v2] gitignore: Ignore more .pod files.

Message ID 1426869044-21338-1-git-send-email-eblake@redhat.com
State New
Headers show

Commit Message

Eric Blake March 20, 2015, 4:30 p.m. UTC
kvm_stat.{1,pod} started showing up as untracked files in my
directory, and I nearly accidentally merged them into a commit
with my usual habit of 'git add .'.  Rather than spelling out
each such file, just ignore the entire pattern.

Signed-off-by: Eric Blake <eblake@redhat.com>
CC: qemu-trivial@nongnu.org
---

v2: fix man page pattern

 .gitignore | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

Comments

Stefan Weil March 20, 2015, 5 p.m. UTC | #1
Am 20.03.2015 um 17:30 schrieb Eric Blake:
> kvm_stat.{1,pod} started showing up as untracked files in my
> directory, and I nearly accidentally merged them into a commit
> with my usual habit of 'git add .'.  Rather than spelling out
> each such file, just ignore the entire pattern.
>
> Signed-off-by: Eric Blake <eblake@redhat.com>
> CC: qemu-trivial@nongnu.org
> ---
>
> v2: fix man page pattern
>
>   .gitignore | 10 ++--------
>   1 file changed, 2 insertions(+), 8 deletions(-)
>
> diff --git a/.gitignore b/.gitignore
> index e32a584..aed0e1f 100644
> --- a/.gitignore
> +++ b/.gitignore
> @@ -37,14 +37,8 @@
>   /qemu-tech.html
>   /qemu-doc.info
>   /qemu-tech.info
> -/qemu.1
> -/qemu.pod
> -/qemu-img.1
> -/qemu-img.pod
>   /qemu-img
>   /qemu-nbd
> -/qemu-nbd.8
> -/qemu-nbd.pod
>   /qemu-options.def
>   /qemu-options.texi
>   /qemu-img-cmds.texi
> @@ -56,8 +50,7 @@
>   /qmp-commands.txt
>   /vscclient
>   /fsdev/virtfs-proxy-helper
> -/fsdev/virtfs-proxy-helper.1
> -/fsdev/virtfs-proxy-helper.pod
> +*.[1-9]
>   *.a
>   *.aux
>   *.cp
> @@ -70,6 +63,7 @@
>   *.ky
>   *.log
>   *.pdf
> +*.pod
>   *.cps
>   *.fns
>   *.kys

Reviewed-by: Stefan Weil <sw@weilnetz.de>

What about only supporting out-of-tree builds for future versions of QEMU?
.gitignore could be reduced to a few lines then.
Markus Armbruster March 23, 2015, 7:45 a.m. UTC | #2
Stefan Weil <sw@weilnetz.de> writes:

> Am 20.03.2015 um 17:30 schrieb Eric Blake:
>> kvm_stat.{1,pod} started showing up as untracked files in my
>> directory, and I nearly accidentally merged them into a commit
>> with my usual habit of 'git add .'.  Rather than spelling out
>> each such file, just ignore the entire pattern.
>>
>> Signed-off-by: Eric Blake <eblake@redhat.com>
>> CC: qemu-trivial@nongnu.org
>> ---
>>
>> v2: fix man page pattern
>>
>>   .gitignore | 10 ++--------
>>   1 file changed, 2 insertions(+), 8 deletions(-)
>>
>> diff --git a/.gitignore b/.gitignore
>> index e32a584..aed0e1f 100644
>> --- a/.gitignore
>> +++ b/.gitignore
>> @@ -37,14 +37,8 @@
>>   /qemu-tech.html
>>   /qemu-doc.info
>>   /qemu-tech.info
>> -/qemu.1
>> -/qemu.pod
>> -/qemu-img.1
>> -/qemu-img.pod
>>   /qemu-img
>>   /qemu-nbd
>> -/qemu-nbd.8
>> -/qemu-nbd.pod
>>   /qemu-options.def
>>   /qemu-options.texi
>>   /qemu-img-cmds.texi
>> @@ -56,8 +50,7 @@
>>   /qmp-commands.txt
>>   /vscclient
>>   /fsdev/virtfs-proxy-helper
>> -/fsdev/virtfs-proxy-helper.1
>> -/fsdev/virtfs-proxy-helper.pod
>> +*.[1-9]
>>   *.a
>>   *.aux
>>   *.cp
>> @@ -70,6 +63,7 @@
>>   *.ky
>>   *.log
>>   *.pdf
>> +*.pod
>>   *.cps
>>   *.fns
>>   *.kys
>
> Reviewed-by: Stefan Weil <sw@weilnetz.de>
>
> What about only supporting out-of-tree builds for future versions of QEMU?
> .gitignore could be reduced to a few lines then.

Yes, please!  Could you prep a patch?
Michael Tokarev March 25, 2015, 3:21 p.m. UTC | #3
20.03.2015 19:30, Eric Blake wrote:
> kvm_stat.{1,pod} started showing up as untracked files in my
> directory, and I nearly accidentally merged them into a commit
> with my usual habit of 'git add .'.  Rather than spelling out
> each such file, just ignore the entire pattern.

Applied to -trivial, thank you!

/mjt
diff mbox

Patch

diff --git a/.gitignore b/.gitignore
index e32a584..aed0e1f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,14 +37,8 @@ 
 /qemu-tech.html
 /qemu-doc.info
 /qemu-tech.info
-/qemu.1
-/qemu.pod
-/qemu-img.1
-/qemu-img.pod
 /qemu-img
 /qemu-nbd
-/qemu-nbd.8
-/qemu-nbd.pod
 /qemu-options.def
 /qemu-options.texi
 /qemu-img-cmds.texi
@@ -56,8 +50,7 @@ 
 /qmp-commands.txt
 /vscclient
 /fsdev/virtfs-proxy-helper
-/fsdev/virtfs-proxy-helper.1
-/fsdev/virtfs-proxy-helper.pod
+*.[1-9]
 *.a
 *.aux
 *.cp
@@ -70,6 +63,7 @@ 
 *.ky
 *.log
 *.pdf
+*.pod
 *.cps
 *.fns
 *.kys