MatCat.OpenSource/8sa1-gcc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

gcc-changelog: fix combining of arguments.

Browse Source 
contrib/ChangeLog:

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

	* git-backport.py: fix how are ChangeLog paths combined.
This commit is contained in:
Martin Liska 2020-07-29 14:13:42 +02:00
parent 6af8284719
commit 5175857714
No known key found for this signature in database
GPG Key ID: 4DC182DC0FA73785
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/git-backport.py
View File

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