[U-Boot] [PATCH 1/2] git-mailrc: Replace tabs with spaces in alias entries
patman's _ReadAliasFile only splits on spaces, not tabs, so the entries for dinh and maxime weren't being recognised as valid. I'll fix patman in a separate patch, but this makes all the entries consistent.
Signed-off-by: Adam Sampson ats@offog.org ---
doc/git-mailrc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/doc/git-mailrc b/doc/git-mailrc index af8e3358a9..3a490beee2 100644 --- a/doc/git-mailrc +++ b/doc/git-mailrc @@ -20,7 +20,7 @@ alias alisonwang Alison Wang alison.wang@nxp.com alias angelo_ts Angelo Dureghello angelo@sysam.it alias bmeng Bin Meng bmeng.cn@gmail.com alias danielschwierzeck Daniel Schwierzeck daniel.schwierzeck@gmail.com -alias dinh Dinh Nguyen dinguyen@kernel.org +alias dinh Dinh Nguyen dinguyen@kernel.org alias hs Heiko Schocher hs@denx.de alias iwamatsu Nobuhiro Iwamatsu iwamatsu@nigauri.org alias jaehoon Jaehoon Chung jh80.chung@samsung.com @@ -33,7 +33,7 @@ alias marex Marek Vasut marex@denx.de alias mariosix Mario Six mario.six@gdsys.cc alias masahiro Masahiro Yamada yamada.masahiro@socionext.com alias mateusz Mateusz Kulikowski mateusz.kulikowski@gmail.com -alias maxime Maxime Ripard maxime.ripard@free-electrons.com +alias maxime Maxime Ripard maxime.ripard@free-electrons.com alias monstr Michal Simek monstr@monstr.eu alias prafulla Prafulla Wadaskar prafulla@marvell.com alias prom Minkyu Kang mk7.kang@samsung.com
Previously the first three words in a git-mailrc alias entry could only be separated by spaces. git-send-email and Mutt both allow arbitrary whitespace here.
Signed-off-by: Adam Sampson ats@offog.org ---
tools/patman/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/patman/settings.py b/tools/patman/settings.py index 94ea5b5a1b..ca4334426b 100644 --- a/tools/patman/settings.py +++ b/tools/patman/settings.py @@ -263,7 +263,7 @@ def _ReadAliasFile(fname): line = line.strip() if not line or line.startswith('#'): continue - words = line.split(' ', 2) + words = line.split(None, 2) if len(words) < 3 or words[0] != 'alias': if not bad_line: bad_line = "%s:%d:Invalid line '%s'" % (fname, linenum,
On 27 June 2018 at 06:38, Adam Sampson ats@offog.org wrote:
Previously the first three words in a git-mailrc alias entry could only be separated by spaces. git-send-email and Mutt both allow arbitrary whitespace here.
Signed-off-by: Adam Sampson ats@offog.org
tools/patman/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Reviewed-by: Simon Glass sjg@chromium.org
On 29 June 2018 at 22:19, Simon Glass sjg@chromium.org wrote:
On 27 June 2018 at 06:38, Adam Sampson ats@offog.org wrote:
Previously the first three words in a git-mailrc alias entry could only be separated by spaces. git-send-email and Mutt both allow arbitrary whitespace here.
Signed-off-by: Adam Sampson ats@offog.org
tools/patman/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Reviewed-by: Simon Glass sjg@chromium.org
Applied to u-boot-dm, thanks!
On 27 June 2018 at 06:38, Adam Sampson ats@offog.org wrote:
patman's _ReadAliasFile only splits on spaces, not tabs, so the entries for dinh and maxime weren't being recognised as valid. I'll fix patman in a separate patch, but this makes all the entries consistent.
Signed-off-by: Adam Sampson ats@offog.org
doc/git-mailrc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Reviewed-by: Simon Glass sjg@chromium.org
On 29 June 2018 at 22:19, Simon Glass sjg@chromium.org wrote:
On 27 June 2018 at 06:38, Adam Sampson ats@offog.org wrote:
patman's _ReadAliasFile only splits on spaces, not tabs, so the entries for dinh and maxime weren't being recognised as valid. I'll fix patman in a separate patch, but this makes all the entries consistent.
Signed-off-by: Adam Sampson ats@offog.org
doc/git-mailrc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Reviewed-by: Simon Glass sjg@chromium.org
Applied to u-boot-dm, thanks!
participants (2)
-
Adam Sampson -
Simon Glass