From: Christian Hesse <list@eworm.de>
To: jean-christophe manciot <actionmystique@gmail.com>
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 10:24:32 +0100 [thread overview]
Message-ID: <20201102102432.191561f9@leda> (raw)
In-Reply-To: <CAKcFC3Y9sVsGcntOfVuaL3i9xfYnfLa0BeyKB_vRYpDYNxKAcQ@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 1977 bytes --]
jean-christophe manciot <actionmystique@gmail.com> on Mon, 2020/11/02 09:44:
> 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.
What does `git -C git describe --long` give here?
I guess it's time to run `git submodule update`.
> $ 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)
--
main(a){char*c=/* Schoene Gruesse */"B?IJj;MEH"
"CX:;",b;for(a/* Best regards my address: */=0;b=c[a++];)
putchar(b-1/(/* Chris cc -ox -xc - && ./x */b/42*2-3)*42);}
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2020-11-02 9:24 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
2020-11-02 9:24 ` Christian Hesse [this message]
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=20201102102432.191561f9@leda \
--to=list@eworm.de \
--cc=actionmystique@gmail.com \
--cc=cgit@lists.zx2c4.com \
--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).