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 4425 invoked from network); 31 Oct 2020 08:56:57 -0000 Received: from krantz.zx2c4.com (192.95.5.69) by inbox.vuxu.org with ESMTPUTF8; 31 Oct 2020 08:56:57 -0000 Received: by krantz.zx2c4.com (ZX2C4 Mail Server) with ESMTP id 42dfe624; Sat, 31 Oct 2020 08:54:29 +0000 (UTC) Return-Path: Received: from mail-ej1-x641.google.com (mail-ej1-x641.google.com [2a00:1450:4864:20::641]) by krantz.zx2c4.com (ZX2C4 Mail Server) with ESMTPS id c9da0d1d (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for ; Sat, 31 Oct 2020 08:54:26 +0000 (UTC) Received: by mail-ej1-x641.google.com with SMTP id p5so11857007ejj.2 for ; Sat, 31 Oct 2020 01:56:49 -0700 (PDT) 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=zdX7byZzAzj4gmd9ZWI/ZcSCv0UJw6HXDKvcXNonO4w=; b=s3JtWqQchDAaAXTql8X4vQToxRqTuhAojWVWlvNtkgRZ6b8Lkzk+hpf+hENz1w2wY3 GnIlRbPUVdbgT/hCiAL5mmxn2PS7xj5tWZtMghJ0SmzAM0bOaO8kstU+UZK9MGCPOJw9 GtJ810I5T754x0UChB1pd/kx1ch1pUJi/0HdzAEYXJEnDrqwa0MzqtnYCDcWGaAZsOaQ OQ8acLgn2qeNy9tYAZGRaXgaf0w0PwydT+FJCCtQmBpEBRJR+0Mtti09e/A1GaTk2P4C bYilTs0pSUyyXdJraSiBOnTlqbpn2BH0bqlQfXFaUxCL2QFUqIuK3hrDzenCficSaDsY J7Dw== 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=zdX7byZzAzj4gmd9ZWI/ZcSCv0UJw6HXDKvcXNonO4w=; b=qJ6KvZJStx7zrl9znX4244I0vxHr+UFls/Eleja/J0NCtH9sazVYeZg2c+MTwWOGLR VLzZS2aHgAfAzI5WmmmkIdno88Dn1n01r3CKFurRFfypjJgSGKyfcUzf62mwFyDgFKVS BGs4ZCi3Xko7qdRhajirK5tsjFqEObSIfy6ilNBI3IUkaVSp3FGiaMbf9SZvN/Yvov2a s+/OL/RWGqB+LZz3SpqMIbGGK692CtG0qaqIKhGwaEHi8PizbSBxHJETkQE3R1cvGiVc VUi1BQMEq3SJnJl7Ta5bdPRPLBlxeqInfvsD7v2AhZmD4yo8A5dSmtZsBqcn7PqalpFj QBcQ== X-Gm-Message-State: AOAM5333m+DtrFNZawuT0WbOWaOLp72A5eJ/p0oeDzWEdvXV4igH830d p+xoU2FM8z68qyTJwwUJsefCWWkjo3d12bBsAFI= X-Google-Smtp-Source: ABdhPJzwDGdhhjtug1JjaiD1rmXQIyiouVeei294eu107u/M844W7nYq8GgeSJCzwh+xV1+ONVplp3MNz4lZgahaJBQ= X-Received: by 2002:a17:906:398b:: with SMTP id h11mr6560087eje.277.1604134607626; Sat, 31 Oct 2020 01:56:47 -0700 (PDT) MIME-Version: 1.0 References: <20201027094233.41187-1-list@eworm.de> In-Reply-To: <20201027094233.41187-1-list@eworm.de> From: jean-christophe manciot Date: Sat, 31 Oct 2020 09:56:37 +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: text/plain; charset="UTF-8" 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" Hey Christian, I tried to apply yesterday (when the latest tag of 'git' submodule was v2.29.1) the following patches in sequence over v1.2.3-8-gadcc4f8: - 'ui-tree: add about link in tree view list' 1/2 - 'ui-tree: add about link in tree view list' 2/2 - 'Make default pages configurable' - 'ui-commit: show subject in page title' - 'git: update to v2.29.1' --------------------------------------------------------------- Applying 'ui-tree: add about link in tree view list' 1/2 patch --------------------------------------------------------------- Checking patch ui-shared.c... Checking patch ui-shared.h... Checking patch ui-tree.c... Applied patch ui-shared.c cleanly. Applied patch ui-shared.h cleanly. Applied patch ui-tree.c cleanly. --------------------------------------------------------------- Applying 'ui-tree: add about link in tree view list' 2/2 patch --------------------------------------------------------------- Checking patch ui-tree.c... Applied patch ui-tree.c cleanly. ------------------------------------------------- Applying 'Make default pages configurable' patch ------------------------------------------------- Checking patch cgit.c... Hunk #1 succeeded at 56 (offset 10 lines). Hunk #2 succeeded at 143 (offset 10 lines). Hunk #3 succeeded at 159 (offset 10 lines). Hunk #4 succeeded at 383 (offset 10 lines). Hunk #5 succeeded at 404 (offset 10 lines). Hunk #6 succeeded at 814 (offset 5 lines). Checking patch cgit.h... Checking patch cgitrc.5.txt... Hunk #3 succeeded at 485 (offset 3 lines). Checking patch cmd.c... Checking patch ui-repolist.c... Checking patch ui-shared.c... Hunk #2 succeeded at 1006 (offset 6 lines). Hunk #3 succeeded at 1095 (offset 6 lines). Checking patch ui-shared.h... Applied patch cgit.c cleanly. Applied patch cgit.h cleanly. Applied patch cgitrc.5.txt cleanly. Applied patch cmd.c cleanly. Applied patch ui-repolist.c cleanly. Applied patch ui-shared.c cleanly. Applied patch ui-shared.h cleanly. ------------------------------------------------------- Applying 'ui-commit: show subject in page title' patch ------------------------------------------------------- Checking patch ui-commit.c... Applied patch ui-commit.c cleanly. ---------------------------------------- Applying 'git: update to v2.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. The build fails with: 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 # # if ! test -e ../../git/.git # then # echo "git/ is not a Git repository" >&2 # else # ( # cd ../.. && # sm_oid=$(git ls-files --stage -- git | # sed -e "s/^[0-9]* \\([0-9a-f]*\\) [0-9] .*$/\\1/") && # cd git && # git describe --match "v[0-9]*" $sm_oid # ) | sed -e "s/^v//" -e "s/-/./" >sm_version && # test_cmp sm_version makefile_version # fi # # failed 2 among 3 test(s) 1..3 There is no such issue when applying the four first patches over the same commit. -- Jean-Christophe