From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-4.0 required=3.0 tests=AWL,BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_NONE shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id DDA4D1F463 for ; Mon, 9 Dec 2019 15:20:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726522AbfLIPUW convert rfc822-to-8bit (ORCPT ); Mon, 9 Dec 2019 10:20:22 -0500 Received: from esg256-2.itc.swri.org ([129.162.232.95]:56962 "EHLO esg256-2.itc.swri.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726265AbfLIPUV (ORCPT ); Mon, 9 Dec 2019 10:20:21 -0500 X-Greylist: delayed 3689 seconds by postgrey-1.27 at vger.kernel.org; Mon, 09 Dec 2019 10:20:20 EST Received: from smtp.swri.org (mbx260-2.adm.swri.edu [129.162.29.120]) by esg256-2.itc.swri.edu (8.16.0.27/8.16.0.27) with ESMTPS id xB9EIhSf016412 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Mon, 9 Dec 2019 08:18:43 -0600 Received: from mbx260-2.adm.swri.edu (129.162.29.120) by mbx260-2.adm.swri.edu (129.162.29.120) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 9 Dec 2019 08:18:43 -0600 Received: from mbx260-2.adm.swri.edu ([192.168.222.13]) by mbx260-2.adm.swri.edu ([192.168.222.13]) with mapi id 15.00.1497.000; Mon, 9 Dec 2019 08:18:43 -0600 From: "Strain, Roger L." To: "marc@msys.ch" CC: "git@vger.kernel.org" , "Johannes.Schindelin@gmx.de" , "gitster@pobox.com" , "ns@nadavsinai.com" , "pclouds@gmail.com" Subject: Re: Regression in git-subtree.sh, introduced in 2.20.1, after 315a84f9aa0e2e629b0680068646b0032518ebed Thread-Topic: Regression in git-subtree.sh, introduced in 2.20.1, after 315a84f9aa0e2e629b0680068646b0032518ebed Thread-Index: AQHVrbKXNpX9IVDGJUeg6jm3c9jaIqeyPikAgAAAxYCAAAFhgA== Date: Mon, 9 Dec 2019 14:18:43 +0000 Message-ID: References: <3b9408a9bd87ea488c4a6b9bc2583aba56ce3949.camel@swri.org> In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: Evolution 3.28.5-0ubuntu0.18.04.1 x-ms-exchange-messagesentrepresentingtype: 1 x-ms-exchange-transport-fromentityheader: Hosted x-originating-ip: [129.162.26.94] Content-Type: text/plain; charset="iso-8859-15" Content-ID: <17E18C3EB8C7E044B959B0736E89100D@sw.pvt> Content-Transfer-Encoding: 8BIT MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2019-12-09_04:,, signatures=0 X-Proofpoint-Spam-Details: rule=inbound_policy_notspam policy=inbound_policy score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=-40 reason=mlx scancount=1 engine=8.0.1-1911140001 definitions=main-1912090124 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org As I said, I'm using a custom script here. I don't know if anybody else benefited from the change and hasn't said anything, but I won't object to someone submitting that revert. -- Roger -----Original Message----- From: Marc Balmer To: "Strain, Roger L." Cc: ns@nadavsinai.com , git@vger.kernel.org < git@vger.kernel.org>, Johannes.Schindelin@gmx.de < Johannes.Schindelin@gmx.de>, gitster@pobox.com , pclouds@gmail.com Subject: Re: Regression in git-subtree.sh, introduced in 2.20.1, after 315a84f9aa0e2e629b0680068646b0032518ebed Date: Mon, 09 Dec 2019 15:13:47 +0100 Roger, I am all for reverting it. if that does not cause any other regressions or headaches (or both...) - Marc Am 09.12.2019 um 15:11 schrieb Strain, Roger L. : I haven't been able to find anything relating to the issue, but I also haven't had a repo that exposes the problem to test more thoroughly against. If this happens to be a public repo somewhere, I'd be more than happy to take a second look. That being said, if the community feels it would be better to revert the changes that were introduced, I won't object. I've had to further customize the script for our internal use, and those changes aren't something that would be useful for the public at large. (A few changes relate to the presence/absence of a specific file, which I certainly wouldn't expect anyone else to have.) Short story is we're going to have to use a custom script going forward, so keeping or reverting the changes here make no difference to us. I still feel that the changes which were made make the script more correct, but clearly there's some undiagnosed logic error somewhere. Honestly, I'm surprised we didn't see this particular issue show up on our own repo; it's ridiculously large and complex. At least if it had, I'd be able to troubleshoot it more reliably. -- Roger Strain -----Original Message----- From: Nadav SInai To: roger.strain@swri.org Cc: Johannes.Schindelin@gmx.de, git@vger.kernel.org, gitster@pobox.com, marc@msys.ch, pclouds@gmail.com Subject: RE: Regression in git-subtree.sh, introduced in 2.20.1, after 315a84f9aa0e2e629b0680068646b0032518ebed Date: Sun, 08 Dec 2019 12:30:48 +0200 [EXTERNAL EMAIL] Hi, I'm curious if any of you had any luck in preventing that seg-fault in git-subtree script I'm encountering it myself using git 2.24.0.windows.2., seg-fault is in the same while loop (currently on line 757) When I tried your suggestion of adding the ($parents) ($rev) to the progress print I see that the last commit have only one revision printed like this: 259/290 (523) [271] (843dd34090d36dfabd6a2e3e8459a4887427313b) (a69ee056f66acf66c63f89f55d26c0cc17036623) 259/290 (525) [273] (f5eea1a3cbe1e16acba53e8a9fe07b6525a8b97c) (843dd34090d36dfabd6a2e3e8459a4887427313b) 259/290 (527) [275] (82303752a428cf1d789ac9f156008adb2798b7b5) (f5eea1a3cbe1e16acba53e8a9fe07b6525a8b97c) 259/290 (528) [276] (7187897883c9fb4d33d4c87a02b876f8603728ff05f0945ae2ce9f98a35135) 259/290 (529) [277] (a00a3665343439a426671958dd90ed0407a22cad9ac9f156008adb2798b7b5) 259/290 (530) [278] (90beb94ebd331c457d79d05341453f5829a50bfcd4c87a02b876f8603728ff) 259/290 (531) [279] (9582e0acbed1910173564e250f350b5cc4291a7f671958dd90ed0407a22cad) 259/290 (532) [280] (f183930d6fabd3dccdddc5ec35d754ad28caf3b879d05341453f5829a50bfc) 259/290 (533) [281] (c9309f3a38c41f7991d9e78ddb47f7e85b8521eb564e250f350b5cc4291a7f) 259/290 (534) [282] (3bcf08f63a0e2b93ecc376bd679a16c80e99e7b1ddc5ec35d754ad28caf3b8) 259/290 (535) [283] (134621bb55a0470cdf6519ce08d6909af43ce0e5d9e78ddb47f7e85b8521eb) 259/290 (536) [284] (edb3471fbba29748f9784d29b3cee1dee2df4b37c376bd679a16c80e99e7b1) 259/290 (537) [285] (dd947a095df07a32dfd56666a395a7c42b25ca116519ce08d6909af43ce0e5) 259/290 (538) [286] (a639e09d2cbe1ea1149c080c1c95b8b018340ae2784d29b3cee1dee2df4b37) C:/Program Files/Git/mingw64/libexec/git-core\git-subtree: line 757: 8853 Done eval "$grl" 8854 Segmentation fault (core dumped) | while read rev parents; do process_split_commit "$rev" "$parents" 0; done I downgraded git to 2.19.0-windows.1 and it works now. I'm thankful for your insights Nadav Sinai Web Tech lead Philips-Algotec