[-- Attachment #1.1.1: Type: text/plain, Size: 775 bytes --] Hi, is it possible to have cgit show log from one commit to another? Something like the equivalent of gitweb's http://localhost:4321/cgi-bin/gitweb.cgi?p=.git;a=shortlog;h=update-lexers;hp=master Thank you, Matěj -- http://matej.ceplovi.cz/blog/, @mcepl@floss.social GPG Finger: 3C76 A027 CA45 AD70 98B5 BC1D 7920 5802 880B C9D8 We are told that [St. Anthony] once fell into dejection, finding uninterrupted contemplation above his strength; but was taught to apply himself at intervals to manual labour by a vision of an angel who appeared platting mats of palm-tree leaves, then rising to pray, and after some time sitting down again to work; and who at length said to him, “Do thus, and thou shalt be saved.” -- Life of St. Anthony [-- Attachment #1.2: E09FEF25D96484AC.asc --] [-- Type: application/pgp-keys, Size: 3102 bytes --] -----BEGIN PGP PUBLIC KEY BLOCK----- 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 wwCdEnRlCGlvnO78R0FgKXlt3RyzGuE= =sxoW -----END PGP PUBLIC KEY BLOCK----- [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 216 bytes --]
From: Christian Hesse <mail@eworm.de> Update to git version v2.44.0, no additional changes required. 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 17a40b1..c3ee267 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.43.2 +GIT_VER = 2.44.0 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 efb050b..3c2a3fd 160000 --- a/git +++ b/git @@ -1 +1 @@ -Subproject commit efb050becb6bc703f76382e1f1b6273100e6ace3 +Subproject commit 3c2a3fdc388747b9eaf4a4a4f2035c1c9ddb26d0 -- 2.43.2
From: Christian Hesse <mail@eworm.de> Update to git version v2.44.0-rc1, no additional changes required. Signed-off-by: Christian Hesse <mail@eworm.de> --- Makefile | 4 ++-- git | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 17a40b1..a1535ab 100644 --- a/Makefile +++ b/Makefile @@ -14,8 +14,8 @@ htmldir = $(docdir) pdfdir = $(docdir) mandir = $(prefix)/share/man SHA1_HEADER = <openssl/sha.h> -GIT_VER = 2.43.2 -GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.xz +GIT_VER = 2.44.0.rc1 +GIT_URL = https://www.kernel.org/pub/software/scm/git/testing/git-$(GIT_VER).tar.xz INSTALL = install COPYTREE = cp -r MAN5_TXT = $(wildcard *.5.txt) diff --git a/git b/git index efb050b..edae91a 160000 --- a/git +++ b/git @@ -1 +1 @@ -Subproject commit efb050becb6bc703f76382e1f1b6273100e6ace3 +Subproject commit edae91a4cf221d44c8c891d5519b26fce17d56bb -- 2.43.1
From: Christian Hesse <mail@eworm.de> Update to git version v2.43.2, no additional changes required. (Git v2.43.1 fails to build, thus skipping.) 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 5e8b85a..17a40b1 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.43.0 +GIT_VER = 2.43.2 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 564d025..efb050b 160000 --- a/git +++ b/git @@ -1 +1 @@ -Subproject commit 564d0252ca632e0264ed670534a51d18a689ef5d +Subproject commit efb050becb6bc703f76382e1f1b6273100e6ace3 -- 2.43.1
From: Christian Hesse <mail@eworm.de> Update to git version v2.44.0-rc0, no additional changes required. Signed-off-by: Christian Hesse <mail@eworm.de> --- Makefile | 4 ++-- git | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 5e8b85a..aaf9243 100644 --- a/Makefile +++ b/Makefile @@ -14,8 +14,8 @@ htmldir = $(docdir) pdfdir = $(docdir) mandir = $(prefix)/share/man SHA1_HEADER = <openssl/sha.h> -GIT_VER = 2.43.0 -GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.xz +GIT_VER = 2.44.0.rc0 +GIT_URL = https://www.kernel.org/pub/software/scm/git/testing/git-$(GIT_VER).tar.xz INSTALL = install COPYTREE = cp -r MAN5_TXT = $(wildcard *.5.txt) diff --git a/git b/git index 564d025..c875e0b 160000 --- a/git +++ b/git @@ -1 +1 @@ -Subproject commit 564d0252ca632e0264ed670534a51d18a689ef5d +Subproject commit c875e0b8e036c12cfbf6531962108a063c7a821c -- 2.43.1
[-- Attachment #1: Type: text/plain, Size: 916 bytes --] Loïc <lagiraudiere+cgit@free.fr> on Sat, 2024/02/03 18:20: > Hi all, > > When I create a reference to a precise line in a file (for instance a > hyperlink to "https://git.zx2c4.com/cgit/tree/cgit.css#n321" ), I miss a > visual feedback, on the line I want to highlight. > > To implement this feature, I suggest to add a curved arrow ahead of the > line number. > That could be done by adding the following stylesheet to cgit.css > > div#cgit table.blob td.linenumbers a:target:before {color: > red;content: "\2BA9";} Pushed here, but I can not tell if or when this will see any more attraction: https://git.zx2c4.com/cgit/log/?h=ch/highlight-line -- 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 --]
[-- Attachment #1: Type: text/plain, Size: 509 bytes --] Hi all, When I create a reference to a precise line in a file (for instance a hyperlink to "https://git.zx2c4.com/cgit/tree/cgit.css#n321" ), I miss a visual feedback, on the line I want to highlight. To implement this feature, I suggest to add a curved arrow ahead of the line number. That could be done by adding the following stylesheet to cgit.css div#cgit table.blob td.linenumbers a:target:before {color: red;content: "\2BA9";} (patch attached) Thank you for your attention Regards Loïc [-- Attachment #2: 0001-Add-a-curved-arrow-ahead-of-the-line-number.patch --] [-- Type: text/x-patch, Size: 855 bytes --] From 8dd54834a1fec71b4b278fe137bc1856ea6b41cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc?= <lagiraudiere+cgit@free.fr> Date: Sat, 3 Feb 2024 15:59:57 +0100 Subject: [PATCH] Add a curved arrow ahead of the line number, to highlight the line specified in the URL. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Loïc <lagiraudiere+cgit@free.fr> --- cgit.css | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/cgit.css b/cgit.css index 1b848cf..f5b41ba 100644 --- a/cgit.css +++ b/cgit.css @@ -330,6 +330,11 @@ div#cgit table.ssdiff td.lineno a:hover { color: black; } +div#cgit table.blob td.linenumbers a:target:before { + color: red; + content: "\2BA9"; +} + div#cgit table.blame td.hashes, div#cgit table.blame td.lines, div#cgit table.blame td.linenumbers { -- 2.40.1
[-- Attachment #1: Type: text/plain, Size: 1619 bytes --] On Tue Jan 30, 2024 at 12:47 PM CET, Christian Hesse wrote: > Matěj Cepl <mcepl@cepl.eu> on Tue, 2024/01/30 12:11: > > On Tue Jan 30, 2024 at 11:43 AM CET, Matěj Cepl wrote: > > > On Tue Jan 30, 2024 at 9:05 AM CET, Christian Hesse wrote: > > > > There's a patch available: > > > > https://git.zx2c4.com/cgit/log/?h=ch/default-pages > > > > > > > > But is has not been merged to the master branch. > > > > > > Cgit however isn’t completely dead, is it (looking at the log, > > > there seems to be still some life in it)? So, what’s keeping this > > > patch from being merged? Is it so bad, dangerous? > > > > Oh silly me, the patch is old, but you have just published > > it. Sorry for being hasty! > > Yes, it is old, and it has been there for a long time. I did just rebase it > right now. > > These days Jason is not very active reviewing, merging & co... Hmm, I don’t know, even with this /etc/cgitrc (https://da.gd/CAU6W) when I go to https://git.cepl.eu/cgit/aerc/ I get the summary. I don’t see anything in the /var/log/httpd/git*log. Any thoughts? More debugging? Best, Matěj -- http://matej.ceplovi.cz/blog/, @mcepl@floss.social GPG Finger: 3C76 A027 CA45 AD70 98B5 BC1D 7920 5802 880B C9D8 If only there were evil people somewhere insidiously committing evil deeds, and it were necessary only to separate them from the rest of us and destroy them. But the line dividing good and evil cuts through the heart of every human being. And who is willing to destroy a piece of his own heart? -- Aleksandr Solzhenitsyn: The Gulag Archipelago [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 216 bytes --]
[-- Attachment #1: Type: text/plain, Size: 1031 bytes --] Matěj Cepl <mcepl@cepl.eu> on Tue, 2024/01/30 12:11: > On Tue Jan 30, 2024 at 11:43 AM CET, Matěj Cepl wrote: > > On Tue Jan 30, 2024 at 9:05 AM CET, Christian Hesse wrote: > > > There's a patch available: > > > https://git.zx2c4.com/cgit/log/?h=ch/default-pages > > > > > > But is has not been merged to the master branch. > > > > Cgit however isn’t completely dead, is it (looking at the log, > > there seems to be still some life in it)? So, what’s keeping this > > patch from being merged? Is it so bad, dangerous? > > Oh silly me, the patch is old, but you have just published > it. Sorry for being hasty! Yes, it is old, and it has been there for a long time. I did just rebase it right now. These days Jason is not very active reviewing, merging & co... -- 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 --]
[-- Attachment #1: Type: text/plain, Size: 826 bytes --] On Tue Jan 30, 2024 at 11:43 AM CET, Matěj Cepl wrote: > On Tue Jan 30, 2024 at 9:05 AM CET, Christian Hesse wrote: > > There's a patch available: > > https://git.zx2c4.com/cgit/log/?h=ch/default-pages > > > > But is has not been merged to the master branch. > > Cgit however isn’t completely dead, is it (looking at the log, > there seems to be still some life in it)? So, what’s keeping this > patch from being merged? Is it so bad, dangerous? Oh silly me, the patch is old, but you have just published it. Sorry for being hasty! Best, Matěj -- http://matej.ceplovi.cz/blog/, @mcepl@floss.social GPG Finger: 3C76 A027 CA45 AD70 98B5 BC1D 7920 5802 880B C9D8 How many Bavarian Illuminati does it take to screw in a light bulb? Three: one to screw it in, and one to confuse the issue. [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 216 bytes --]
[-- Attachment #1: Type: text/plain, Size: 521 bytes --] On Tue Jan 30, 2024 at 9:05 AM CET, Christian Hesse wrote: > There's a patch available: > https://git.zx2c4.com/cgit/log/?h=ch/default-pages > > But is has not been merged to the master branch. And, of course, thank you very much for pointing me in the right direction! Best, Matěj -- http://matej.ceplovi.cz/blog/, @mcepl@floss.social GPG Finger: 3C76 A027 CA45 AD70 98B5 BC1D 7920 5802 880B C9D8 Wise walks steady step, while fools around them dance contemporary dances. -- Franz Kafka [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 216 bytes --]
[-- Attachment #1: Type: text/plain, Size: 659 bytes --] On Tue Jan 30, 2024 at 9:05 AM CET, Christian Hesse wrote: > There's a patch available: > https://git.zx2c4.com/cgit/log/?h=ch/default-pages > > But is has not been merged to the master branch. Cgit however isn’t completely dead, is it (looking at the log, there seems to be still some life in it)? So, what’s keeping this patch from being merged? Is it so bad, dangerous? Best, Matěj -- http://matej.ceplovi.cz/blog/, @mcepl@floss.social GPG Finger: 3C76 A027 CA45 AD70 98B5 BC1D 7920 5802 880B C9D8 I disapprove of what you say, but I will defend to the death your right to say it. -- mistakenly attributed to Voltaire [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 216 bytes --]
[-- Attachment #1: Type: text/plain, Size: 1102 bytes --] Matěj Cepl <mcepl@cepl.eu> on Mon, 2024/01/29 23:43: > Hi, > > I would like basically what was already asked before on the > cgit-pink list, but I haven’t found any actionable reply to it, > https://causal.agency/list/thread/20220629162034.1235e11ad8fd08b47e8fcf07%40posteo.net.html > > The summary page for example on https://git.cepl.eu/cgit/nntplib/ > seems to me much less useful as a default than the about page > (https://git.cepl.eu/cgit/nntplib/about/), tree > (https://git.cepl.eu/cgit/nntplib/tree/), or log > (https://git.cepl.eu/cgit/nntplib/log/) tabs. Is there a way how > to configure this default page? Or would it be possible to write > some kind of filter, which would change the tab displayed? There's a patch available: https://git.zx2c4.com/cgit/log/?h=ch/default-pages But is has not been merged to the master 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 --]
[-- Attachment #1: Type: text/plain, Size: 856 bytes --] Hi, I would like basically what was already asked before on the cgit-pink list, but I haven’t found any actionable reply to it, https://causal.agency/list/thread/20220629162034.1235e11ad8fd08b47e8fcf07%40posteo.net.html The summary page for example on https://git.cepl.eu/cgit/nntplib/ seems to me much less useful as a default than the about page (https://git.cepl.eu/cgit/nntplib/about/), tree (https://git.cepl.eu/cgit/nntplib/tree/), or log (https://git.cepl.eu/cgit/nntplib/log/) tabs. Is there a way how to configure this default page? Or would it be possible to write some kind of filter, which would change the tab displayed? Thank you for any reply, Matěj -- http://matej.ceplovi.cz/blog/, @mcepl@floss.social GPG Finger: 3C76 A027 CA45 AD70 98B5 BC1D 7920 5802 880B C9D8 A day without sunshine is like night. [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 216 bytes --]
[-- 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 --]
[-- 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 --]
[-- 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 --]
with git: 1:2.43.0-0ppa1~ubuntu23.10.1 $ git checkout 1.2.3-54-g00ecfaa $ git am patch_file # contains the 'Update to git version v2.42.0' email Applying: Update to git version v2.42.0, this requires changes for these error: patch failed: Makefile:14 error: Makefile: patch does not apply error: patch failed: cgit.h:6 error: cgit.h: patch does not apply error: patch failed: git:1 error: git: patch does not apply error: patch failed: scan-tree.c:54 error: scan-tree.c: patch does not apply Patch failed at 0001 Update to git version v2.42.0, this requires changes for these hint: Use 'git am --show-current-patch=diff' to see the failed patch When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". $ git am --show-current-patch=diff --- 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 Am I doing something wrong? -- Jean-Christophe
From: Christian Hesse <mail@eworm.de> Update to git version v2.43.0, no additional changes required. 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 3c080fc..5e8b85a 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.42.1 +GIT_VER = 2.43.0 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 61a22dd..564d025 160000 --- a/git +++ b/git @@ -1 +1 @@ -Subproject commit 61a22ddaf0626111193a17ac12f366bd6d167dff +Subproject commit 564d0252ca632e0264ed670534a51d18a689ef5d -- 2.42.1
From: Christian Hesse <mail@eworm.de> Update to git version v2.43.0-rc2, no additional changes required. Signed-off-by: Christian Hesse <mail@eworm.de> --- Makefile | 4 ++-- git | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 3c080fc..e716a09 100644 --- a/Makefile +++ b/Makefile @@ -14,8 +14,8 @@ htmldir = $(docdir) pdfdir = $(docdir) mandir = $(prefix)/share/man SHA1_HEADER = <openssl/sha.h> -GIT_VER = 2.42.1 -GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.xz +GIT_VER = 2.43.0.rc2 +GIT_URL = https://www.kernel.org/pub/software/scm/git/testing/git-$(GIT_VER).tar.xz INSTALL = install COPYTREE = cp -r MAN5_TXT = $(wildcard *.5.txt) diff --git a/git b/git index 61a22dd..cfb8a6e 160000 --- a/git +++ b/git @@ -1 +1 @@ -Subproject commit 61a22ddaf0626111193a17ac12f366bd6d167dff +Subproject commit cfb8a6e9a93adbe81efca66e6110c9b4d2e57169 -- 2.42.1
From: Christian Hesse <mail@eworm.de> (This time for real! 😜) Update to git version v2.43.0-rc1, no additional changes required. Signed-off-by: Christian Hesse <mail@eworm.de> --- Makefile | 4 ++-- git | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 3c080fc..8bacfaf 100644 --- a/Makefile +++ b/Makefile @@ -14,8 +14,8 @@ htmldir = $(docdir) pdfdir = $(docdir) mandir = $(prefix)/share/man SHA1_HEADER = <openssl/sha.h> -GIT_VER = 2.42.1 -GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.xz +GIT_VER = 2.43.0.rc1 +GIT_URL = https://www.kernel.org/pub/software/scm/git/testing/git-$(GIT_VER).tar.xz INSTALL = install COPYTREE = cp -r MAN5_TXT = $(wildcard *.5.txt) diff --git a/git b/git index 61a22dd..dadef80 160000 --- a/git +++ b/git @@ -1 +1 @@ -Subproject commit 61a22ddaf0626111193a17ac12f366bd6d167dff +Subproject commit dadef801b365989099a9929e995589e455c51fed -- 2.42.1
[-- Attachment #1: Type: text/plain, Size: 503 bytes --] Todd Zullinger <tmz@pobox.com> on Tue, 2023/11/07 10:35: > > Update to git version v2.43.0-rc1, no additional changes required. > > s/rc1/rc0 (or wait until tomorrow and update GIT_VER ;) Ups... :) > Thanks for keeping things synced! You are welcome! -- 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 --]
Christian Hesse wrote: > From: Christian Hesse <mail@eworm.de> > > Update to git version v2.43.0-rc1, no additional changes required. s/rc1/rc0 (or wait until tomorrow and update GIT_VER ;) Thanks for keeping things synced! > Signed-off-by: Christian Hesse <mail@eworm.de> > --- > Makefile | 4 ++-- > git | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/Makefile b/Makefile > index 3c080fc..9ca0446 100644 > --- a/Makefile > +++ b/Makefile > @@ -14,8 +14,8 @@ htmldir = $(docdir) > pdfdir = $(docdir) > mandir = $(prefix)/share/man > SHA1_HEADER = <openssl/sha.h> > -GIT_VER = 2.42.1 > -GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.xz > +GIT_VER = 2.43.0.rc0 > +GIT_URL = https://www.kernel.org/pub/software/scm/git/testing/git-$(GIT_VER).tar.xz > INSTALL = install > COPYTREE = cp -r > MAN5_TXT = $(wildcard *.5.txt) > diff --git a/git b/git > index 61a22dd..bc52045 160000 > --- a/git > +++ b/git > @@ -1 +1 @@ > -Subproject commit 61a22ddaf0626111193a17ac12f366bd6d167dff > +Subproject commit bc5204569f7db44d22477485afd52ea410d83743 -- Todd
From: Christian Hesse <mail@eworm.de> Update to git version v2.43.0-rc1, no additional changes required. Signed-off-by: Christian Hesse <mail@eworm.de> --- Makefile | 4 ++-- git | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 3c080fc..9ca0446 100644 --- a/Makefile +++ b/Makefile @@ -14,8 +14,8 @@ htmldir = $(docdir) pdfdir = $(docdir) mandir = $(prefix)/share/man SHA1_HEADER = <openssl/sha.h> -GIT_VER = 2.42.1 -GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.xz +GIT_VER = 2.43.0.rc0 +GIT_URL = https://www.kernel.org/pub/software/scm/git/testing/git-$(GIT_VER).tar.xz INSTALL = install COPYTREE = cp -r MAN5_TXT = $(wildcard *.5.txt) diff --git a/git b/git index 61a22dd..bc52045 160000 --- a/git +++ b/git @@ -1 +1 @@ -Subproject commit 61a22ddaf0626111193a17ac12f366bd6d167dff +Subproject commit bc5204569f7db44d22477485afd52ea410d83743 -- 2.42.1
From: Christian Hesse <mail@eworm.de> Update to git version v2.42.1, no additional changes required. 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 036a8e9..3c080fc 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.42.0 +GIT_VER = 2.42.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 43c8a30..61a22dd 160000 --- a/git +++ b/git @@ -1 +1 @@ -Subproject commit 43c8a30d150ecede9709c1f2527c8fba92c65f40 +Subproject commit 61a22ddaf0626111193a17ac12f366bd6d167dff -- 2.42.0