From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by sourceware.org (Postfix) with ESMTPS id 097BE3857C5C; Wed, 12 Jan 2022 15:54:48 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 097BE3857C5C Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=suse.cz Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.cz Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id DCA80218E4; Wed, 12 Jan 2022 15:54:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1642002886; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=EmFGwego0i16QkxUrTf9jIEmUFFAahHADxQegAOjlss=; b=ZtILem4jn3qylKiN3Mgyn8zkKw3DKcGvVF/oWM3xRHBSJK+1H7VpTvoRnYgsbH9mbIb9HH vc9Ik//RSrsP1pF5WyG1ye3ZKKwLDKrI+gOMBeHJxZ25/DwA+pdLoFncGNI8Cl3wkxr/Ca yRAbGNEAL9940gnOzLLIGjZPMVSdOG0= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1642002886; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=EmFGwego0i16QkxUrTf9jIEmUFFAahHADxQegAOjlss=; b=PA84spzqohgV9IMAzMSmfo8yavG7AO5iOJVEAjGBX27cSWEst/EJ8uQ82VgNLky6i24xnD PURN0gpZm9VVlYDg== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id BCB9213B75; Wed, 12 Jan 2022 15:54:46 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id +OgTK8b53mGmMwAAMHmgww (envelope-from ); Wed, 12 Jan 2022 15:54:46 +0000 Content-Type: multipart/mixed; boundary="------------oYkKL5zWreMWtuNo6ON3PBhH" Message-ID: <486de71c-d1fc-5ca7-4036-59462a75f116@suse.cz> Date: Wed, 12 Jan 2022 16:54:46 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.4.1 Subject: [PATCH] git-backport: support renamed .cc files in commit message. Content-Language: en-US From: =?UTF-8?Q?Martin_Li=c5=a1ka?= To: Jakub Jelinek Cc: GCC Mailing List , Martin Jambor , GCC Patches , gfortran References: <57564370-7184-ef62-039e-60b150058fd8@suse.cz> <68946bf6-4b2f-b8f3-20b3-5cf3f2fd611c@moene.org> <713a96b5-b82e-ffd7-d03b-7e05a4dede9e@suse.cz> <20220111155657.GA2646553@tucnak> <8a3f6503-7380-13bb-5731-18ff5474f68a@suse.cz> <20220111161636.GB2646553@tucnak> <78c91bbb-34d7-36f6-0d69-d8a4e7f446f5@suse.cz> In-Reply-To: <78c91bbb-34d7-36f6-0d69-d8a4e7f446f5@suse.cz> X-Spam-Status: No, score=-11.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gcc@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Jan 2022 15:54:49 -0000 This is a multi-part message in MIME format. --------------oYkKL5zWreMWtuNo6ON3PBhH Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Hi. There's a patch that enhances git-backport so that it updates commit messages for files which name ends now with .cc and is still .c on a branch. Example usage: $ git show test commit 8ed4b2cb9aa158c0ef418fd1ac66271664904604 (test) Author: Martin Liska Date: Wed Jan 12 16:08:13 2022 +0100 Fix file. gcc/ChangeLog: * ipa-icf.cc: Test me. gcc/ada/ChangeLog: * cal.c: aaa. libcpp/ChangeLog: * expr.cc: aaa. $ git gcc-backport test Auto-merging gcc/ada/cal.c Auto-merging gcc/ipa-icf.c Auto-merging libcpp/expr.c [test2 ee40feb077e] Fix file. Date: Wed Jan 12 16:08:13 2022 +0100 3 files changed, 3 insertions(+) Commit message updated: 2 .cc file(s) changed. $ git show test2 commit f59a1e736c1b68f07d83388a994df8d043e8aa6e (test2) Author: Martin Liska Date: Wed Jan 12 16:08:13 2022 +0100 Fix file. gcc/ChangeLog: * ipa-icf.c: Test me. gcc/ada/ChangeLog: * cal.c: aaa. libcpp/ChangeLog: * expr.c: aaa. (cherry picked from commit 8ed4b2cb9aa158c0ef418fd1ac66271664904604) Martin --------------oYkKL5zWreMWtuNo6ON3PBhH Content-Type: text/x-patch; charset=UTF-8; name="0001-git-backport-support-renamed-.cc-files-in-commit-mes.patch" Content-Disposition: attachment; filename*0="0001-git-backport-support-renamed-.cc-files-in-commit-mes.pa"; filename*1="tch" Content-Transfer-Encoding: base64 RnJvbSA2NDdhNmRiYWY4Y2RlNGVlMDdiOTVjNDUzMGEwM2Y3Nzc0NTAwOTE0IE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBNYXJ0aW4gTGlza2EgPG1saXNrYUBzdXNlLmN6PgpE YXRlOiBXZWQsIDEyIEphbiAyMDIyIDE2OjM1OjQxICswMTAwClN1YmplY3Q6IFtQQVRDSF0g Z2l0LWJhY2twb3J0OiBzdXBwb3J0IHJlbmFtZWQgLmNjIGZpbGVzIGluIGNvbW1pdCBtZXNz YWdlLgoKVGhlIGNoYW5nZSBjYW4gYXV0b21hdGljYWxseSB1cGRhdGUgbmFtZXMgZm9yICou Y2MgZmlsZXMgdGhhdAphcmUgcGFydCBvZiBhIGJhY2twb3J0LgoKY29udHJpYi9DaGFuZ2VM b2c6CgoJKiBnaXQtYmFja3BvcnQucHk6IFN1cHBvcnQgcmVuYW1pbmcgb2YgLmNjIGZpbGVz LgotLS0KIGNvbnRyaWIvZ2l0LWJhY2twb3J0LnB5IHwgNTAgKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrKysKIDEgZmlsZSBjaGFuZ2VkLCA1MCBpbnNlcnRpb25z KCspCgpkaWZmIC0tZ2l0IGEvY29udHJpYi9naXQtYmFja3BvcnQucHkgYi9jb250cmliL2dp dC1iYWNrcG9ydC5weQppbmRleCAyYjhlNDY4NjcxOS4uNjI3YmJkOWVlNjYgMTAwNzU1Ci0t LSBhL2NvbnRyaWIvZ2l0LWJhY2twb3J0LnB5CisrKyBiL2NvbnRyaWIvZ2l0LWJhY2twb3J0 LnB5CkBAIC0yMCw3ICsyMCwzMiBAQAogIyBCb3N0b24sIE1BIDAyMTEwLTEzMDEsIFVTQS4K IAogaW1wb3J0IGFyZ3BhcnNlCitpbXBvcnQgb3MKIGltcG9ydCBzdWJwcm9jZXNzCitpbXBv cnQgc3lzCitpbXBvcnQgdGVtcGZpbGUKKworc2NyaXB0X2ZvbGRlciA9IG9zLnBhdGguZGly bmFtZShvcy5wYXRoLmFic3BhdGgoX19maWxlX18pKQordmVyaWZ5X3NjcmlwdCA9IG9zLnBh dGguam9pbihzY3JpcHRfZm9sZGVyLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAn Z2NjLWNoYW5nZWxvZy9naXRfY2hlY2tfY29tbWl0LnB5JykKKworCitkZWYgcmVwbGFjZV9m aWxlX2luX2NoYW5nZWxvZyhsaW5lcywgZmlsZW5hbWUpOgorICAgIGlmIG5vdCBmaWxlbmFt ZS5lbmRzd2l0aCgnLmNjJyk6CisgICAgICAgIHJldHVybgorCisgICAgIyBjb25zaWRlciBh bGwgY29tcG9uZW5ldHMgb2YgYSBwYXRoOiBnY2MvaXBhLWljZi5jYworICAgIHdoaWxlIGZp bGVuYW1lOgorICAgICAgICBmb3IgaSwgbGluZSBpbiBlbnVtZXJhdGUobGluZXMpOgorICAg ICAgICAgICAgaWYgZmlsZW5hbWUgaW4gbGluZToKKyAgICAgICAgICAgICAgICBsaW5lID0g bGluZS5yZXBsYWNlKGZpbGVuYW1lLCBmaWxlbmFtZVs6LTFdKQorICAgICAgICAgICAgICAg IGxpbmVzW2ldID0gbGluZQorICAgICAgICAgICAgICAgIHJldHVybgorICAgICAgICBwYXJ0 cyA9IGZpbGVuYW1lLnNwbGl0KCcvJykKKyAgICAgICAgaWYgbGVuKHBhcnRzKSA9PSAxOgor ICAgICAgICAgICAgcmV0dXJuCisgICAgICAgIGZpbGVuYW1lID0gJy8nLmpvaW4ocGFydHNb MTpdKQorCiAKIGlmIF9fbmFtZV9fID09ICdfX21haW5fXyc6CiAgICAgcGFyc2VyID0gYXJn cGFyc2UuQXJndW1lbnRQYXJzZXIoZGVzY3JpcHRpb249J0JhY2twb3J0IGEgZ2l0IHJldmlz aW9uIGFuZCAnCkBAIC02MywzICs4OCwyOCBAQCBpZiBfX25hbWVfXyA9PSAnX19tYWluX18n OgogICAgICAgICAgICAgc3VicHJvY2Vzcy5jaGVja19vdXRwdXQoY21kLCBzaGVsbD1UcnVl KQogICAgICAgICBlbHNlOgogICAgICAgICAgICAgcHJpbnQoJ1BsZWFzZSByZXNvbHZlIGFs bCByZW1haW5pbmcgZmlsZSBjb25mbGljdHMuJykKKyAgICAgICAgICAgIHN5cy5leGl0KDEp CisKKyAgICAjIFVwZGF0ZSBjb21taXQgbWVzc2FnZSBpZiBjaGFuZ2UgZm9yIGEgLmNjIGZp bGUgd2FzIHRha2VuCisgICAgciA9IHN1YnByb2Nlc3MucnVuKGYne3ZlcmlmeV9zY3JpcHR9 IEhFQUQnLCBzaGVsbD1UcnVlLCBlbmNvZGluZz0ndXRmOCcsCisgICAgICAgICAgICAgICAg ICAgICAgIHN0ZG91dD1zdWJwcm9jZXNzLlBJUEUsIHN0ZGVycj1zdWJwcm9jZXNzLlBJUEUp CisgICAgaWYgci5yZXR1cm5jb2RlICE9IDA6CisgICAgICAgIGxpbmVzID0gci5zdGRvdXQu c3BsaXRsaW5lcygpCisgICAgICAgIGNtZCA9ICdnaXQgc2hvdyAtcyAtLWZvcm1hdD0lQicK KyAgICAgICAgY29tbWl0X21lc3NhZ2UgPSBzdWJwcm9jZXNzLmNoZWNrX291dHB1dChjbWQs IHNoZWxsPVRydWUsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgZW5jb2Rpbmc9J3V0ZjgnKS5zdHJpcCgpCisgICAgICAgIGNvbW1pdF9tZXNz YWdlID0gY29tbWl0X21lc3NhZ2Uuc3BsaXRsaW5lcygpCisKKyAgICAgICAgdG9kbyA9IFts aW5lIGZvciBsaW5lIGluIGxpbmVzIGlmICd1bmNoYW5nZWQgZmlsZSBtZW50aW9uZWQnIGlu IGxpbmVdCisgICAgICAgIGZvciBpdGVtIGluIHRvZG86CisgICAgICAgICAgICBmaWxlbmFt ZSA9IGl0ZW0uc3BsaXQoKVstMV0uc3RyaXAoJyInKQorICAgICAgICAgICAgcmVwbGFjZV9m aWxlX2luX2NoYW5nZWxvZyhjb21taXRfbWVzc2FnZSwgZmlsZW5hbWUpCisKKyAgICAgICAg d2l0aCB0ZW1wZmlsZS5OYW1lZFRlbXBvcmFyeUZpbGUoJ3cnLCBlbmNvZGluZz0ndXRmOCcs CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGRlbGV0ZT1GYWxz ZSkgYXMgdzoKKyAgICAgICAgICAgIHcud3JpdGUoJ1xuJy5qb2luKGNvbW1pdF9tZXNzYWdl KSkKKyAgICAgICAgICAgIHcuY2xvc2UoKQorICAgICAgICAgICAgc3VicHJvY2Vzcy5jaGVj a19vdXRwdXQoZidnaXQgY29tbWl0IC0tYW1lbmQgLUYge3cubmFtZX0nLAorICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgc2hlbGw9VHJ1ZSwgZW5jb2Rpbmc9J3V0Zjgn KQorICAgICAgICAgICAgb3MudW5saW5rKHcubmFtZSkKKyAgICAgICAgICAgIHByaW50KGYn Q29tbWl0IG1lc3NhZ2UgdXBkYXRlZDoge2xlbih0b2RvKX0gLmNjIGZpbGUocykgY2hhbmdl ZC4nKQotLSAKMi4zNC4xCgo= --------------oYkKL5zWreMWtuNo6ON3PBhH--