List for cgit developers and users
 help / color / mirror / Atom feed
* [PATCH 1/1] git: update to v2.24.0
@ 2019-11-04  8:46 list
  2019-11-08  7:58 ` list
  0 siblings, 1 reply; 5+ messages in thread
From: list @ 2019-11-04  8:46 UTC (permalink / raw)


From: Christian Hesse <mail at eworm.de>

Update to git version v2.24.0, no changes required.

Signed-off-by: Christian Hesse <mail at eworm.de>
---
 Makefile | 2 +-
 git      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 96ad7cd..8a29dd9 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.23.0
+GIT_VER = 2.24.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 5fa0f52..da72936 160000
--- a/git
+++ b/git
@@ -1 +1 @@
-Subproject commit 5fa0f5238b0cd46cfe7f6fa76c3f526ea98148d9
+Subproject commit da72936f544fec5a335e66432610e4cef4430991


^ permalink raw reply	[flat|nested] 5+ messages in thread

* [PATCH 1/1] git: update to v2.24.0
  2019-11-04  8:46 [PATCH 1/1] git: update to v2.24.0 list
@ 2019-11-08  7:58 ` list
  2019-11-08  8:15   ` list
  0 siblings, 1 reply; 5+ messages in thread
From: list @ 2019-11-08  7:58 UTC (permalink / raw)


Christian Hesse <list at eworm.de> on Mon, 2019/11/04 09:46:
> Update to git version v2.24.0, no changes required.

For any reason this starts crashing for me... Seen this on one host only,
though. No idea what's the issue, will have to investigate.
-- 
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);}
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <http://lists.zx2c4.com/pipermail/cgit/attachments/20191108/5cd122bb/attachment.asc>


^ permalink raw reply	[flat|nested] 5+ messages in thread

* [PATCH 1/1] git: update to v2.24.0
  2019-11-08  7:58 ` list
@ 2019-11-08  8:15   ` list
  2019-11-08 20:54     ` list
  0 siblings, 1 reply; 5+ messages in thread
From: list @ 2019-11-08  8:15 UTC (permalink / raw)


Christian Hesse <list at eworm.de> on Fri, 2019/11/08 08:58:
> Christian Hesse <list at eworm.de> on Mon, 2019/11/04 09:46:
> > Update to git version v2.24.0, no changes required.  
> 
> For any reason this starts crashing for me... Seen this on one host only,
> though. No idea what's the issue, will have to investigate.

This happens after running `git gc` in a repository. cgit with git v2.23.0
does not have this issue.

The issue happens anywhere around or in print_commit() in ui.log.c. 
-- 
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);}
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <http://lists.zx2c4.com/pipermail/cgit/attachments/20191108/6570a646/attachment.asc>


^ permalink raw reply	[flat|nested] 5+ messages in thread

* [PATCH 1/1] git: update to v2.24.0
  2019-11-08  8:15   ` list
@ 2019-11-08 20:54     ` list
  2019-11-08 21:58       ` [PATCH v2 " list
  0 siblings, 1 reply; 5+ messages in thread
From: list @ 2019-11-08 20:54 UTC (permalink / raw)


Christian Hesse <list at eworm.de> on Fri, 2019/11/08 09:15:
> Christian Hesse <list at eworm.de> on Fri, 2019/11/08 08:58:
> > Christian Hesse <list at eworm.de> on Mon, 2019/11/04 09:46:  
> > > Update to git version v2.24.0, no changes required.    
> > 
> > For any reason this starts crashing for me... Seen this on one host only,
> > though. No idea what's the issue, will have to investigate.  
> 
> This happens after running `git gc` in a repository. cgit with git v2.23.0
> does not have this issue.
> 
> The issue happens anywhere around or in print_commit() in ui.log.c. 

This is caused by commit-graph being enabled by default now:

https://git.zx2c4.com/git/commit/?id=31b1de6a09bad59cc0d88419925486afc7add277

I guess `git gc` created the file objects/info/commit-graph for me, so I
found this to be the trigger.
-- 
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);}
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <http://lists.zx2c4.com/pipermail/cgit/attachments/20191108/222eee7c/attachment.asc>


^ permalink raw reply	[flat|nested] 5+ messages in thread

* [PATCH v2 1/1] git: update to v2.24.0
  2019-11-08 20:54     ` list
@ 2019-11-08 21:58       ` list
  0 siblings, 0 replies; 5+ messages in thread
From: list @ 2019-11-08 21:58 UTC (permalink / raw)


From: Christian Hesse <mail at eworm.de>

Update to git version v2.24.0.

Never use get_cached_commit_buffer() directly, use repo_get_commit_buffer()
instead. The latter calls the former anyway. This fixes segmentation fault
when commit-graph is enabled and get_cached_commit_buffer() does not return
the expected result.

Signed-off-by: Christian Hesse <mail at eworm.de>
---
 Makefile  | 2 +-
 git       | 2 +-
 parsing.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 96ad7cd..8a29dd9 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.23.0
+GIT_VER = 2.24.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 5fa0f52..da72936 160000
--- a/git
+++ b/git
@@ -1 +1 @@
-Subproject commit 5fa0f5238b0cd46cfe7f6fa76c3f526ea98148d9
+Subproject commit da72936f544fec5a335e66432610e4cef4430991
diff --git a/parsing.c b/parsing.c
index 7b3980e..93b4767 100644
--- a/parsing.c
+++ b/parsing.c
@@ -129,7 +129,7 @@ struct commitinfo *cgit_parse_commit(struct commit *commit)
 {
 	const int sha1hex_len = 40;
 	struct commitinfo *ret;
-	const char *p = get_cached_commit_buffer(the_repository, commit, NULL);
+	const char *p = repo_get_commit_buffer(the_repository, commit, NULL);
 	const char *t;
 
 	ret = xcalloc(1, sizeof(struct commitinfo));


^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2019-11-08 21:58 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-11-04  8:46 [PATCH 1/1] git: update to v2.24.0 list
2019-11-08  7:58 ` list
2019-11-08  8:15   ` list
2019-11-08 20:54     ` list
2019-11-08 21:58       ` [PATCH v2 " list

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).