gcc-changelog: fix combining of arguments.

Message ID 66fb63b8-5e5d-bc37-5f4d-4954c7a07340@suse.cz
State New
Headers show
Series
  • gcc-changelog: fix combining of arguments.
Related show

Commit Message

Martin Liška July 29, 2020, 12:19 p.m.
One obvious fix we've just hit with Honza.

Martin

contrib/ChangeLog:

2020-07-29  Martin Liska  <mliska@suse.cz>

	* git-backport.py: fix how are ChangeLog paths combined.
---
  contrib/git-backport.py | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

-- 
2.27.0

Patch

diff --git a/contrib/git-backport.py b/contrib/git-backport.py
index 3a9413dcd27..2b8e4686719 100755
--- a/contrib/git-backport.py
+++ b/contrib/git-backport.py
@@ -46,7 +46,7 @@  if __name__ == '__main__':
          conflicts = out.strip().split('\n')
          changelogs = [c for c in conflicts if c.endswith('ChangeLog')]
          if changelogs:
-            cmd = 'git checkout --theirs %s' % '\n'.join(changelogs)
+            cmd = 'git checkout --theirs %s' % ' '.join(changelogs)
              subprocess.check_output(cmd, shell=True)
          # 2) remove all ChangeLog files from index
          cmd = 'git diff --name-only --diff-filter=M HEAD'