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: Mon, 2 Nov 2020 09:44:22 +0100 [thread overview]
Message-ID: <CAKcFC3Y9sVsGcntOfVuaL3i9xfYnfLa0BeyKB_vRYpDYNxKAcQ@mail.gmail.com> (raw)
In-Reply-To: <CAKcFC3byrHx_0Uu7RwbDSM8=8eRBF2DP0MRsh13+NhtmsJNp6A@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 1444 bytes --]
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
[-- Attachment #2: 0005-git2.29.1.patch --]
[-- Type: text/x-patch, Size: 706 bytes --]
Signed-off-by: Christian Hesse <mail@eworm.de>
---
Makefile | 2 +-
git | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index c947b63..eb60388 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ htmldir = $(docdir)
pdfdir = $(docdir)
mandir = $(prefix)/share/man
SHA1_HEADER = <openssl/sha.h>
-GIT_VER = 2.29.0
+GIT_VER = 2.29.1
GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.xz
INSTALL = install
COPYTREE = cp -r
diff --git a/git b/git
index 69986e1..b927c80 160000
--- a/git
+++ b/git
@@ -1 +1 @@
-Subproject commit 69986e19ffcfb9af674ae5180689ab7bbf92ed28
+Subproject commit b927c80531cca9b9107754186532e8cb00884008
--
next prev parent reply other threads:[~2020-11-02 8:44 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
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 [this message]
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=CAKcFC3Y9sVsGcntOfVuaL3i9xfYnfLa0BeyKB_vRYpDYNxKAcQ@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).