Skip to contentSkip to conversation

contrib/gitdm: Fix a typo

PATCH Applied Philippe Mathieu-Daudé 5 participants 7 messages Jan 11, 2019 – Jan 17, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 contrib/gitdm: Fix a typo

Typo comes from upstream git://git.lwn.net/gitdm.git.

---
 contrib/gitdm/filetypes.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
contrib/gitdm/filetypes.txt +1 -1
index 15d6f803b9..165b71b3f9 100644
@@ -4,7 +4,7 @@
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
-# (at your option  any later version.
+# (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
Signature · 1 line
2.17.2
Reviewed-by on v1 1/1
#1 lore raw
Quoted 12 lines · Philippe Mathieu-Daudé

Typo comes from upstream git://git.lwn.net/gitdm.git.

---
 contrib/gitdm/filetypes.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
contrib/gitdm/filetypes.txt +0 -0
index 15d6f803b9..165b71b3f9 100644

contrib/gitdm/filetypes.txt line 10

Quoted 8 lines
contrib/gitdm/filetypes.txt +1 -1
@@ -4,7 +4,7 @@
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
-# (at your option  any later version.
+# (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
Quoted 5 lines

--
2.17.2

#2 lore raw
In reply to Philippe Mathieu-Daudé
Patchew URL: https://patchew.org/QEMU/[email protected]/

Patchew URL: https://patchew.org/QEMU/[email protected]/

Hi,

This series seems to have some coding style problems. See output below for more information:

Message-id: [email protected]
Type: series
Subject: [Qemu-devel] [PATCH] contrib/gitdm: Fix a typo

=== TEST SCRIPT BEGIN ===
#!/bin/bash
git config --local diff.renamelimit 0
git config --local diff.renames True
git config --local diff.algorithm histogram ./scripts/checkpatch.pl --mailback --color=always base.. === TEST SCRIPT END ===

Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
Switched to a new branch 'test'
c995f5f contrib/gitdm: Fix a typo

=== OUTPUT BEGIN ===
Unknown option: color
Usage:

checkpatch.pl [OPTION]... [FILE]...
checkpatch.pl [OPTION]... [GIT-REV-LIST]

Version: 0.31

Options:

  -q, --quiet                quiet
  --no-tree                  run without a kernel tree
  --no-signoff               do not check for 'Signed-off-by' line
  --patch                    treat FILE as patchfile
  --branch                   treat args as GIT revision list
  --emacs                    emacs compile window format
  --terse                    one line per report
  -f, --file                 treat FILE as regular source file
  --strict                   fail if only warnings are found
  --root=PATH                PATH to the kernel tree root
  --no-summary               suppress the per-file summary
  --mailback                 only produce a report in case of warnings/errors
  --summary-file             include the filename in summary
  --debug KEY=[0|1]          turn on/off debugging of KEY, where KEY is one of

'values', 'possible', 'type', and 'attr' (default is all off)
--test-only=WORD report only warnings/errors containing WORD
literally
-h, --help, --version display this help and exit

When FILE is - read standard input.
=== OUTPUT END ===

Test command exited with code: 1

The full log is available at
http://patchew.org/logs/[email protected]/testing.checkpatch/?type=message.
---
Email generated automatically by Patchew [http://patchew.org/].
Please send your feedback to [email protected]

#3 lore raw
Quoted 11 lines · On 1/11/19 10:28 PM, [email protected] wrote:

Patchew URL: https://patchew.org/QEMU/[email protected]/

Hi,

This series seems to have some coding style problems. See output below for more information:

Message-id: [email protected]
Type: series
Subject: [Qemu-devel] [PATCH] contrib/gitdm: Fix a typo

Quoted 6 lines

=== TEST SCRIPT BEGIN ===
#!/bin/bash
git config --local diff.renamelimit 0
git config --local diff.renames True
git config --local diff.algorithm histogram ./scripts/checkpatch.pl --mailback --color=always base..

I suppose Paolo expected his PR to land to upgrade patchew, and patchew is still processing from an old queue?

Quoted 48 lines

=== TEST SCRIPT END ===

Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
Switched to a new branch 'test'
c995f5f contrib/gitdm: Fix a typo

=== OUTPUT BEGIN ===
Unknown option: color
Usage:

checkpatch.pl [OPTION]... [FILE]...
checkpatch.pl [OPTION]... [GIT-REV-LIST]

Version: 0.31

Options:

  -q, --quiet                quiet
  --no-tree                  run without a kernel tree
  --no-signoff               do not check for 'Signed-off-by' line
  --patch                    treat FILE as patchfile
  --branch                   treat args as GIT revision list
  --emacs                    emacs compile window format
  --terse                    one line per report
  -f, --file                 treat FILE as regular source file
  --strict                   fail if only warnings are found
  --root=PATH                PATH to the kernel tree root
  --no-summary               suppress the per-file summary
  --mailback                 only produce a report in case of warnings/errors
  --summary-file             include the filename in summary
  --debug KEY=[0|1]          turn on/off debugging of KEY, where KEY is one of

'values', 'possible', 'type', and 'attr' (default is all off)
--test-only=WORD report only warnings/errors containing WORD
literally
-h, --help, --version display this help and exit

When FILE is - read standard input.
=== OUTPUT END ===

Test command exited with code: 1

The full log is available at
http://patchew.org/logs/[email protected]/testing.checkpatch/?type=message.
---
Email generated automatically by Patchew [http://patchew.org/].
Please send your feedback to [email protected]

#4 lore raw
Quoted 12 lines · Philippe Mathieu-Daudé
Quoted 11 lines · On 1/11/19 10:28 PM, [email protected] wrote:

Patchew URL: https://patchew.org/QEMU/[email protected]/

Hi,

This series seems to have some coding style problems. See output below for more information:

Message-id: [email protected]
Type: series
Subject: [Qemu-devel] [PATCH] contrib/gitdm: Fix a typo

Quoted 9 lines
Quoted 6 lines

=== TEST SCRIPT BEGIN ===
#!/bin/bash
git config --local diff.renamelimit 0
git config --local diff.renames True
git config --local diff.algorithm histogram ./scripts/checkpatch.pl --mailback --color=always base..

I suppose Paolo expected his PR to land to upgrade patchew, and patchew is still processing from an old queue?

Yeah, patchew was still processing tags that didn't have my PR applied.

Anyhow, I'll hijack this to note that now:

1) The test script for checkpatch is now much simple, compare
https://patchew.org/QEMU/[email protected]/ (old) to https://patchew.org/QEMU/[email protected]/
(new). Improvement of "cut and paste" ability was a nice side effect of the new TAP-based "make check", and this goes in the same direction.

2) Patchew is showing colored output---for now only for checkpatch. :) More precisely, output is captured from a PTY, via script(1). This turned out to be a bit more tricky than I expected (script doesn't like having its stdin redirected from /dev/null), but it's fixed now.

3) I bumped the tester from -j8 to -j14, hoping that the queue will be smaller, and temporarily deployed a second tester on my own workstation. This in turn caused some issues because pulling a git repo with 12000
tags is not for the faint of heart, but everything should be running normally now and future deployments will optimize this (check
https://patchew.org/Patchew/ to see the issues).

Paolo

#5 lore raw
In reply to Philippe Mathieu-Daudé
Patchew URL: https://patchew.org/QEMU/[email protected]/

Patchew URL: https://patchew.org/QEMU/[email protected]/

Hi,

This series seems to have some coding style problems. See output below for more information:

Subject: [Qemu-devel] [PATCH] contrib/gitdm: Fix a typo
Type: series
Message-id: [email protected]

=== TEST SCRIPT BEGIN ===
#!/bin/bash
git config --local diff.renamelimit 0
git config --local diff.renames True
git config --local diff.algorithm histogram ./scripts/checkpatch.pl --mailback --color=always base.. === TEST SCRIPT END ===

Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384 Traceback (most recent call last):
File "patchew-tester2/src/patchew-cli", line 521, in test_one

    git_clone_repo(clone, r["repo"], r["head"], logf, True)

File "patchew-tester2/src/patchew-cli", line 48, in git_clone_repo
stdout=logf, stderr=logf)
File "/usr/lib64/python3.3/subprocess.py", line 544, in check_call
raise CalledProcessError(retcode, cmd)
subprocess.CalledProcessError: Command '['git', 'remote', 'add', '-f', '--mirror=fetch', '3c8cf5a9c21ff8782164d1def7f44bd888713384', 'https://github.com/patchew-project/qemu']' returned non-zero exit status -9

The full log is available at
http://patchew.org/logs/[email protected]/testing.checkpatch/?type=message.
---
Email generated automatically by Patchew [http://patchew.org/].
Please send your feedback to [email protected]

#6 lore raw
In reply to Philippe Mathieu-Daudé
Quoted 13 lines · Philippe Mathieu-Daudé

Typo comes from upstream git://git.lwn.net/gitdm.git.

---
  contrib/gitdm/filetypes.txt | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
contrib/gitdm/filetypes.txt +0 -0
index 15d6f803b9..165b71b3f9 100644

contrib/gitdm/filetypes.txt line 10

Quoted 8 lines
contrib/gitdm/filetypes.txt +1 -1
@@ -4,7 +4,7 @@
  # This program is free software; you can redistribute it and/or modify
  # it under the terms of the GNU General Public License as published by
  # the Free Software Foundation; either version 2 of the License, or
-# (at your option  any later version.
+# (at your option) any later version.
  #
  # This program is distributed in the hope that it will be useful,
  # but WITHOUT ANY WARRANTY; without even the implied warranty of

Applied to my trivial-patches branch.

Thanks,
Laurent