From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham autolearn_force=no version=3.4.4 Received: (qmail 16347 invoked from network); 2 Nov 2020 08:44:42 -0000 Received: from krantz.zx2c4.com (192.95.5.69) by inbox.vuxu.org with ESMTPUTF8; 2 Nov 2020 08:44:42 -0000 Received: by krantz.zx2c4.com (ZX2C4 Mail Server) with ESMTP id 3e971d8d; Mon, 2 Nov 2020 08:41:59 +0000 (UTC) Return-Path: Received: from mail-ej1-x643.google.com (mail-ej1-x643.google.com [2a00:1450:4864:20::643]) by krantz.zx2c4.com (ZX2C4 Mail Server) with ESMTPS id bcd2185d (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for ; Mon, 2 Nov 2020 08:41:55 +0000 (UTC) Received: by mail-ej1-x643.google.com with SMTP id s25so3843228ejy.6 for ; Mon, 02 Nov 2020 00:44:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=8SQ6mvQ0GaxCa3ZRThkfprcY8/oG/gNITa/kxStBcVg=; b=VsjziDGJoV+Ydvq5v4X80QbfRX4Lp624XaldhJy2AoULp6GTlaWBnKS4YJ1Mlj3yHz TiBl8oMkc82CSUgmjuStx+mwFgPYy4MfZ/aZj6A+xOFsB8/OydHdb+LSxkXdsEpvZ/lm 41rN6eIXSmA5uftxiXANdLD793lDjWwS1I4HMrxFk8zo7wJfzlcwU9QeUXAkddxBGShv jteYVzQubxLPFUtHQsiR/nPwnBP/Y0peRFaE9oEpm7Hni8PXYbCuWTL7Wv2HoSJ2bvR6 j04boiO8x6EfGLfYJxbJKJcpFN8oe09g9yXVatMFSAP6+ANFNNwFgzs9B6lEEjDKMlhj 1D2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=8SQ6mvQ0GaxCa3ZRThkfprcY8/oG/gNITa/kxStBcVg=; b=QwNBHPXW/c5Wvik3CQndkNaDs/Mi2Y6cqosHheHj6d/oOdv9jK3qBnkKcvPDY5N2Lc gC2R2U45LMPjJ4R+CGHxrQnXcvotO7u+QNBQuLRCQewyroPFWWN0YyGMWJTIGQV35bgI isfoDfuUor9AywJYfR8VELkh/IojvtZTC9tz+udbqK3dO2ecF0jyGLKHsS5svT4HhONI KrdeiDG9C5jvBzlaDBqhQ6/XYj+63TciuLYhP9hK9IpUzfgt9h69B4vuEuiIS4FB9LQ0 RsmWRm2eQqDLcmOEHeaPZSHv/VgKRgQg6t2nM1dEWRw8X+6qhfJL9TAFc/MBXMXkt20V ZIGQ== X-Gm-Message-State: AOAM533sjBcsusOcy5oaGotOUM8dQx8ScWm0Gskk9CXKaWmtm395SQQn 7GT/4tzkJs5X1gkcxfKRELibEUPcSbAzkGnruM8= X-Google-Smtp-Source: ABdhPJz58tx674+CbG+KfzcrVAj9+f2Ut8CGHlbKB6GH2KbEKdX9x40ReIVW5oW/EU2coiOmkNrVCHJklSxvscyxk44= X-Received: by 2002:a17:906:3a55:: with SMTP id a21mr13960849ejf.357.1604306671919; Mon, 02 Nov 2020 00:44:31 -0800 (PST) MIME-Version: 1.0 References: <20201027094233.41187-1-list@eworm.de> <20201101211741.2b77b503@leda> In-Reply-To: From: jean-christophe manciot Date: Mon, 2 Nov 2020 09:44:22 +0100 Message-ID: Subject: Re: [PATCH 1/1] git: update to v2.29.1 To: Christian Hesse Cc: cgit@lists.zx2c4.com, Christian Hesse Content-Type: multipart/mixed; boundary="0000000000004a818b05b31bc153" X-BeenThere: cgit@lists.zx2c4.com X-Mailman-Version: 2.1.30rc1 Precedence: list List-Id: List for cgit developers and users List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: cgit-bounces@lists.zx2c4.com Sender: "CGit" --0000000000004a818b05b31bc153 Content-Type: text/plain; charset="UTF-8" Even simpler by cloning into a new folder: $ git clone https://git.zx2c4.com/cgit . ... $ git submodule update --init --recursive Submodule 'git' (https://git.kernel.org/pub/scm/git/git.git) registered for path 'git' Cloning into '/git-cgit/git'... Submodule path 'git': checked out '69986e19ffcfb9af674ae5180689ab7bbf92ed28' Submodule 'sha1collisiondetection' (https://github.com/cr-marcstevens/sha1collisiondetection.git) registered for path 'git/sha1collisiondetection' Cloning into '/git-cgit/git/sha1collisiondetection'... Submodule path 'git/sha1collisiondetection': checked out '855827c583bc30645ba427885caa40c5b81764d2' $ git apply --verbose --check ../0005-git2.29.1.patch Checking patch Makefile... Checking patch git... $ git apply --verbose ../0005-git2.29.1.patch Checking patch Makefile... Checking patch git... warning: unable to rmdir 'git': Directory not empty Applied patch Makefile cleanly. Applied patch git cleanly. $ make ... $ make test ... SUBDIR tests ok 1 - extract Git version from Makefile not ok 2 - test Git version matches Makefile # # ( cat ../../git/GIT-VERSION-FILE || echo "No GIT-VERSION-FILE" ) | # sed -e "s/GIT_VERSION[ ]*=[ ]*//" -e "s/\\.dirty$//" >git_version && # sed -e "s/-/./g" makefile_version >makefile_git_version && # test_cmp git_version makefile_git_version # not ok 3 - test submodule version matches Makefile # ... The patch is attached (copied from first post) -- Jean-Christophe --0000000000004a818b05b31bc153 Content-Type: text/x-patch; charset="US-ASCII"; name="0005-git2.29.1.patch" Content-Disposition: attachment; filename="0005-git2.29.1.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_kh0arcwi0 U2lnbmVkLW9mZi1ieTogQ2hyaXN0aWFuIEhlc3NlIDxtYWlsQGV3b3JtLmRlPgotLS0KIE1ha2Vm aWxlIHwgMiArLQogZ2l0ICAgICAgfCAyICstCiAyIGZpbGVzIGNoYW5nZWQsIDIgaW5zZXJ0aW9u cygrKSwgMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9NYWtlZmlsZSBiL01ha2VmaWxlCmlu ZGV4IGM5NDdiNjMuLmViNjAzODggMTAwNjQ0Ci0tLSBhL01ha2VmaWxlCisrKyBiL01ha2VmaWxl CkBAIC0xNCw3ICsxNCw3IEBAIGh0bWxkaXIgPSAkKGRvY2RpcikKIHBkZmRpciA9ICQoZG9jZGly KQogbWFuZGlyID0gJChwcmVmaXgpL3NoYXJlL21hbgogU0hBMV9IRUFERVIgPSA8b3BlbnNzbC9z aGEuaD4KLUdJVF9WRVIgPSAyLjI5LjAKK0dJVF9WRVIgPSAyLjI5LjEKIEdJVF9VUkwgPSBodHRw czovL3d3dy5rZXJuZWwub3JnL3B1Yi9zb2Z0d2FyZS9zY20vZ2l0L2dpdC0kKEdJVF9WRVIpLnRh ci54egogSU5TVEFMTCA9IGluc3RhbGwKIENPUFlUUkVFID0gY3AgLXIKZGlmZiAtLWdpdCBhL2dp dCBiL2dpdAppbmRleCA2OTk4NmUxLi5iOTI3YzgwIDE2MDAwMAotLS0gYS9naXQKKysrIGIvZ2l0 CkBAIC0xICsxIEBACi1TdWJwcm9qZWN0IGNvbW1pdCA2OTk4NmUxOWZmY2ZiOWFmNjc0YWU1MTgw Njg5YWI3YmJmOTJlZDI4CitTdWJwcm9qZWN0IGNvbW1pdCBiOTI3YzgwNTMxY2NhOWI5MTA3NzU0 MTg2NTMyZThjYjAwODg0MDA4Ci0tCg== --0000000000004a818b05b31bc153--