mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-03-04 08:55:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix various limitations of git-backport.py.

Browse Source 
I've just tested the script and I'm going to install the patch
to all active branches.

contrib/ChangeLog:

	* git-backport.py: The script did 'git co HEAD~' when
	there was no modified ChangeLog file in a successful
	git cherry pick.
	Run cherry-pick --continue without editor.
This commit is contained in:
Martin Liska 2020-05-29 11:29:25 +02:00
parent 233ecb5e2c
commit 24663f1f6d
No known key found for this signature in database
GPG Key ID: 4DC182DC0FA73785
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
contrib/git-backport.py
View File

@ -30,9 +30,13 @@ if __name__ == '__main__':
r = subprocess.run('git cherry-pick -x %s' % args.revision, shell=True)
if r.returncode == 0:
cmd = 'git show --name-only --pretty="" -- "*ChangeLog" |' \
'xargs git checkout HEAD~'
subprocess.check_output(cmd, shell=True)
cmd = 'git show --name-only --pretty="" -- "*ChangeLog"'
changelogs = subprocess.check_output(cmd, shell=True, encoding='utf8')
changelogs = changelogs.strip()
if changelogs:
for changelog in changelogs.split('\n'):
subprocess.check_output('git checkout HEAD~ %s' % changelog,
shell=True)
subprocess.check_output('git commit --amend --no-edit', shell=True)
else:
# 1) remove all ChangeLog files from conflicts
@ -55,6 +59,7 @@ if __name__ == '__main__':
# try to continue
if len(conflicts) == len(changelogs):
subprocess.check_output('git cherry-pick --continue', shell=True)
cmd = 'git -c core.editor=true cherry-pick --continue'
subprocess.check_output(cmd, shell=True)
else:
print('Please resolve all remaining file conflicts.')