diff options
| author | Martin Liska <mliska@suse.cz> | 2020-07-29 14:13:42 +0200 |
|---|---|---|
| committer | Martin Liska <mliska@suse.cz> | 2020-07-29 14:17:43 +0200 |
| commit | 5175857714cc37b01c4349f37253aea39c6a59b4 (patch) | |
| tree | 452b8d64e265bc350e18b2294957ed1e97a1faf7 | |
| parent | 6af8284719d151087a1c1e4da210cc5a9fa4a478 (diff) | |
| download | gcc-5175857714cc37b01c4349f37253aea39c6a59b4.zip gcc-5175857714cc37b01c4349f37253aea39c6a59b4.tar.gz gcc-5175857714cc37b01c4349f37253aea39c6a59b4.tar.bz2 | |
gcc-changelog: fix combining of arguments.
contrib/ChangeLog:
2020-07-29 Martin Liska <mliska@suse.cz>
* git-backport.py: fix how are ChangeLog paths combined.
| -rwxr-xr-x | contrib/git-backport.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/git-backport.py b/contrib/git-backport.py index 3a9413d..2b8e468 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' |