From: jean-christophe manciot <actionmystique@gmail.com>
To: Christian Hesse <list@eworm.de>
Cc: cgit@lists.zx2c4.com, Christian Hesse <mail@eworm.de>
Subject: Re: [PATCH 1/1] git: update to v2.29.1
Date: Sat, 31 Oct 2020 09:56:37 +0100 [thread overview]
Message-ID: <CAKcFC3Zv46aKQMs5owbj+A0Fj7Jh03SgyokyLR_fELUS9zpTzA@mail.gmail.com> (raw)
In-Reply-To: <20201027094233.41187-1-list@eworm.de>
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
next prev parent reply other threads:[~2020-10-31 8:56 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-27 9:42 Christian Hesse
2020-10-31 8:56 ` jean-christophe manciot [this message]
2020-10-31 9:20 ` jean-christophe manciot
2020-11-01 20:17 ` Christian Hesse
2020-11-02 7:27 ` jean-christophe manciot
2020-11-02 8:44 ` jean-christophe manciot
2020-11-02 9:24 ` Christian Hesse
2020-11-04 13:55 ` jean-christophe manciot
2020-11-04 14:10 ` Christian Hesse
2020-11-04 15:05 ` jean-christophe manciot
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=CAKcFC3Zv46aKQMs5owbj+A0Fj7Jh03SgyokyLR_fELUS9zpTzA@mail.gmail.com \
--to=actionmystique@gmail.com \
--cc=cgit@lists.zx2c4.com \
--cc=list@eworm.de \
--cc=mail@eworm.de \
/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: link
Be 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 NNTP newsgroup(s).