public inbox for gcc-cvs@sourceware.org help / color / mirror / Atom feed
From: Jakub Jelinek <jakub@gcc.gnu.org> To: gcc-cvs@gcc.gnu.org Subject: [gcc(refs/vendors/redhat/heads/gcc-8-branch)] gcc-changelog: fix combining of arguments. Date: Thu, 17 Sep 2020 17:12:55 +0000 (GMT) [thread overview] Message-ID: <20200917171255.907E2398E43F@sourceware.org> (raw) https://gcc.gnu.org/g:aa35f1c0af22f2d76568f573f7a6601fc0dbb731 commit aa35f1c0af22f2d76568f573f7a6601fc0dbb731 Author: Martin Liska <mliska@suse.cz> Date: Wed Jul 29 14:13:42 2020 +0200 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. Diff: --- contrib/git-backport.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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'
reply other threads:[~2020-09-17 17:12 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200917171255.907E2398E43F@sourceware.org \ --to=jakub@gcc.gnu.org \ --cc=gcc-cvs@gcc.gnu.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).