* [PATCH 1/1] git: update to v2.42.0 @ 2023-08-21 18:56 Christian Hesse 2023-08-21 21:06 ` Christian Hesse 0 siblings, 1 reply; 5+ messages in thread From: Christian Hesse @ 2023-08-21 18:56 UTC (permalink / raw) To: cgit; +Cc: Christian Hesse From: Christian Hesse <mail@eworm.de> Update to git version v2.42.0, this requires changes for these upstream commits: * bc5c5ec0446895f5c4139cd470066beb3c4ac6d5 cache.h: remove this no-longer-used header * aba070683295a20bdf4f49146384984961c794b2 path: move related function to path * a4e7e317f8f27f861321e6eb08b9c8c0f3ab570c config: add ctx arg to config_fn_t Signed-off-by: Christian Hesse <mail@eworm.de> --- Makefile | 2 +- cgit.h | 2 +- git | 2 +- scan-tree.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index b0de0ee..036a8e9 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.41.0 +GIT_VER = 2.42.0 GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.xz INSTALL = install COPYTREE = cp -r diff --git a/cgit.h b/cgit.h index f788fd2..dbc461f 100644 --- a/cgit.h +++ b/cgit.h @@ -6,7 +6,6 @@ #include <git-compat-util.h> #include <archive.h> -#include <cache.h> #include <commit.h> #include <diffcore.h> #include <diff.h> @@ -19,6 +18,7 @@ #include <object.h> #include <object-name.h> #include <object-store.h> +#include <path.h> #include <refs.h> #include <revision.h> #include <setup.h> diff --git a/git b/git index fe86abd..43c8a30 160000 --- a/git +++ b/git @@ -1 +1 @@ -Subproject commit fe86abd7511a9a6862d5706c6fa1d9b57a63ba09 +Subproject commit 43c8a30d150ecede9709c1f2527c8fba92c65f40 diff --git a/scan-tree.c b/scan-tree.c index 6a2f65a..84da86e 100644 --- a/scan-tree.c +++ b/scan-tree.c @@ -54,7 +54,7 @@ static void scan_tree_repo_config(const char *name, const char *value) config_fn(repo, name, value); } -static int gitconfig_config(const char *key, const char *value, void *cb) +static int gitconfig_config(const char *key, const char *value, const struct config_context *, void *cb) { const char *name; -- 2.41.0 ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/1] git: update to v2.42.0 2023-08-21 18:56 [PATCH 1/1] git: update to v2.42.0 Christian Hesse @ 2023-08-21 21:06 ` Christian Hesse [not found] ` <CAKcFC3Zu9KqRe-zeyHDkY84-5j6jiK+zF8autqTYwXVpWd7OKA@mail.gmail.com> 0 siblings, 1 reply; 5+ messages in thread From: Christian Hesse @ 2023-08-21 21:06 UTC (permalink / raw) To: cgit; +Cc: Christian Hesse [-- Attachment #1: Type: text/plain, Size: 581 bytes --] Christian Hesse <list@eworm.de> on Mon, 2023/08/21 20:56: > From: Christian Hesse <mail@eworm.de> > > Update to git version v2.42.0, this requires changes for these > upstream commits: And just another request to fast-forwarded this into master. We have a lot of breaking changes here... Also tagging a release may be reasonable... -- 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 --] ^ permalink raw reply [flat|nested] 5+ messages in thread
[parent not found: <CAKcFC3Zu9KqRe-zeyHDkY84-5j6jiK+zF8autqTYwXVpWd7OKA@mail.gmail.com>]
* Re: [PATCH 1/1] git: update to v2.42.0 [not found] ` <CAKcFC3Zu9KqRe-zeyHDkY84-5j6jiK+zF8autqTYwXVpWd7OKA@mail.gmail.com> @ 2024-01-07 19:03 ` Christian Hesse [not found] ` <CAKcFC3Z9eQpfQhQB-PU30WRoHJb7WTv2wGhM=j+vG4kffGSQsw@mail.gmail.com> 0 siblings, 1 reply; 5+ messages in thread From: Christian Hesse @ 2024-01-07 19:03 UTC (permalink / raw) To: jean-christophe manciot; +Cc: cgit [-- Attachment #1: Type: text/plain, Size: 552 bytes --] jean-christophe manciot <actionmystique@gmail.com> on Sat, 2024/01/06 16:04: > So I've seen that your request to fast-forward this 'git: update to > v2.42.0' patch into master has not been followed up. The request was to fast-forward from ch/for-jason branch: https://git.zx2c4.com/cgit/log/?h=ch/for-jason -- 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 --] ^ permalink raw reply [flat|nested] 5+ messages in thread
[parent not found: <CAKcFC3Z9eQpfQhQB-PU30WRoHJb7WTv2wGhM=j+vG4kffGSQsw@mail.gmail.com>]
* Re: [PATCH 1/1] git: update to v2.42.0 [not found] ` <CAKcFC3Z9eQpfQhQB-PU30WRoHJb7WTv2wGhM=j+vG4kffGSQsw@mail.gmail.com> @ 2024-01-08 14:37 ` Christian Hesse [not found] ` <CAKcFC3ZPoCODWz-2Z7GwP=yYm1P-uod-nLrDQa7DCNkMBCSL0w@mail.gmail.com> 0 siblings, 1 reply; 5+ messages in thread From: Christian Hesse @ 2024-01-08 14:37 UTC (permalink / raw) To: jean-christophe manciot; +Cc: cgit [-- Attachment #1: Type: text/plain, Size: 754 bytes --] jean-christophe manciot <actionmystique@gmail.com> on Mon, 2024/01/08 15:02: > Thanks Christian for your answer. > I still don't understand how you were able to apply all git update > patches to the same latest master commit. > Could you please share your workflow to obtain the result you obtained > in ch/for-jason branch? I did not apply, I created them. ;) All these patches are incremental, so you have to apply them one after another. Alternatively just clone the git repository and use the branch. -- 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 --] ^ permalink raw reply [flat|nested] 5+ messages in thread
[parent not found: <CAKcFC3ZPoCODWz-2Z7GwP=yYm1P-uod-nLrDQa7DCNkMBCSL0w@mail.gmail.com>]
* Re: [PATCH 1/1] git: update to v2.42.0 [not found] ` <CAKcFC3ZPoCODWz-2Z7GwP=yYm1P-uod-nLrDQa7DCNkMBCSL0w@mail.gmail.com> @ 2024-01-08 15:07 ` Christian Hesse 0 siblings, 0 replies; 5+ messages in thread From: Christian Hesse @ 2024-01-08 15:07 UTC (permalink / raw) To: jean-christophe manciot; +Cc: cgit [-- Attachment #1: Type: text/plain, Size: 561 bytes --] jean-christophe manciot <actionmystique@gmail.com> on Mon, 2024/01/08 15:57: > > All these patches are incremental, so you have to apply them one after > > another. > > That's exactly what I did as explained in the first e-mail I sent you. No idea... It should apply. Do you have local modifications for that file? -- 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 --] ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-01-08 15:08 UTC | newest] Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2023-08-21 18:56 [PATCH 1/1] git: update to v2.42.0 Christian Hesse 2023-08-21 21:06 ` Christian Hesse [not found] ` <CAKcFC3Zu9KqRe-zeyHDkY84-5j6jiK+zF8autqTYwXVpWd7OKA@mail.gmail.com> 2024-01-07 19:03 ` Christian Hesse [not found] ` <CAKcFC3Z9eQpfQhQB-PU30WRoHJb7WTv2wGhM=j+vG4kffGSQsw@mail.gmail.com> 2024-01-08 14:37 ` Christian Hesse [not found] ` <CAKcFC3ZPoCODWz-2Z7GwP=yYm1P-uod-nLrDQa7DCNkMBCSL0w@mail.gmail.com> 2024-01-08 15:07 ` Christian Hesse
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).