* [PATCH 1/1] RFC: git: update to v2.20.0-rc0
@ 2018-11-20 16:32 list
2018-11-20 17:27 ` konstantin
2018-11-21 21:00 ` [PATCH 1/1] RFC: git: update to v2.20.0-rc1 list
0 siblings, 2 replies; 4+ messages in thread
From: list @ 2018-11-20 16:32 UTC (permalink / raw)
From: Christian Hesse <mail at eworm.de>
Update to git version v2.20.0-rc0. Required changes follow upstream commits:
* 611e42a5980a3a9f8bb3b1b49c1abde63c7a191e
(xdiff: provide a separate emit callback for hunks)
Signed-off-by: Christian Hesse <mail at eworm.de>
---
Makefile | 4 ++--
git | 2 +-
shared.c | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
index 1c49b50..11bf249 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.19.1
-GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.gz
+GIT_VER = 2.20.0.rc0
+GIT_URL = https://www.kernel.org/pub/software/scm/git/testing/git-$(GIT_VER).tar.gz
INSTALL = install
COPYTREE = cp -r
MAN5_TXT = $(wildcard *.5.txt)
diff --git a/git b/git
index cae598d..26aa9fc 160000
--- a/git
+++ b/git
@@ -1 +1 @@
-Subproject commit cae598d9980661a978e2df4fb338518f7bf09572
+Subproject commit 26aa9fc81d4c7f6c3b456a29da0b7ec72e5c6595
diff --git a/shared.c b/shared.c
index 7560f5f..a2c0d03 100644
--- a/shared.c
+++ b/shared.c
@@ -325,7 +325,7 @@ int cgit_diff_files(const struct object_id *old_oid,
diff_params.flags |= XDF_IGNORE_WHITESPACE;
emit_params.ctxlen = context > 0 ? context : 3;
emit_params.flags = XDL_EMIT_FUNCNAMES;
- emit_cb.outf = filediff_cb;
+ emit_cb.out_line = filediff_cb;
emit_cb.priv = fn;
xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb);
if (file1.size)
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 1/1] RFC: git: update to v2.20.0-rc0
2018-11-20 16:32 [PATCH 1/1] RFC: git: update to v2.20.0-rc0 list
@ 2018-11-20 17:27 ` konstantin
2018-11-20 19:17 ` list
2018-11-21 21:00 ` [PATCH 1/1] RFC: git: update to v2.20.0-rc1 list
1 sibling, 1 reply; 4+ messages in thread
From: konstantin @ 2018-11-20 17:27 UTC (permalink / raw)
On Tue, Nov 20, 2018 at 05:32:56PM +0100, Christian Hesse wrote:
> +GIT_URL = https://www.kernel.org/pub/software/scm/git/testing/git-$(GIT_VER).tar.gz
I recommend you switch to .xz tarballs, because the .gz ones will soon
no longer be produced. We were supposed to stop on September 1st, but
extended the window a bit until next year.
-K
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 1/1] RFC: git: update to v2.20.0-rc0
2018-11-20 17:27 ` konstantin
@ 2018-11-20 19:17 ` list
0 siblings, 0 replies; 4+ messages in thread
From: list @ 2018-11-20 19:17 UTC (permalink / raw)
Konstantin Ryabitsev <konstantin at linuxfoundation.org> on Tue, 2018/11/20
12:27:
> On Tue, Nov 20, 2018 at 05:32:56PM +0100, Christian Hesse wrote:
> > +GIT_URL =
> > https://www.kernel.org/pub/software/scm/git/testing/git-$(GIT_VER).tar.gz
>
> I recommend you switch to .xz tarballs, because the .gz ones will soon
> no longer be produced. We were supposed to stop on September 1st, but
> extended the window a bit until next year.
I tried that some years ago [0], but the change was reverted "to make OpenBSD
people happy" [1]. Looks like it is time for the change, finally. ;)
[0]
https://git.zx2c4.com/cgit/commit/?id=a87c9d8a9779eab0499efd3c44e090a28c7d1cdf
[1]
https://git.zx2c4.com/cgit/commit/?id=b12273001459d72571a7625ffd085502f2a3844c
--
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/20181120/29f39760/attachment.asc>
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 1/1] RFC: git: update to v2.20.0-rc1
2018-11-20 16:32 [PATCH 1/1] RFC: git: update to v2.20.0-rc0 list
2018-11-20 17:27 ` konstantin
@ 2018-11-21 21:00 ` list
1 sibling, 0 replies; 4+ messages in thread
From: list @ 2018-11-21 21:00 UTC (permalink / raw)
From: Christian Hesse <mail at eworm.de>
Update to git version v2.20.0-rc1. Required changes follow upstream commits:
* 00436bf1b1c2a8fe6cf5d2c2457d419d683042f4
(archive: initialize archivers earlier)
* 611e42a5980a3a9f8bb3b1b49c1abde63c7a191e
(xdiff: provide a separate emit callback for hunks)
Signed-off-by: Christian Hesse <mail at eworm.de>
---
Makefile | 4 ++--
git | 2 +-
shared.c | 2 +-
ui-snapshot.c | 1 +
4 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
index 4aaf2dc..88cfe5f 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.19.1
-GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.xz
+GIT_VER = 2.20.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 cae598d..7f4e641 160000
--- a/git
+++ b/git
@@ -1 +1 @@
-Subproject commit cae598d9980661a978e2df4fb338518f7bf09572
+Subproject commit 7f4e64169352e03476b0ea64e7e2973669e491a2
diff --git a/shared.c b/shared.c
index 7560f5f..a2c0d03 100644
--- a/shared.c
+++ b/shared.c
@@ -325,7 +325,7 @@ int cgit_diff_files(const struct object_id *old_oid,
diff_params.flags |= XDF_IGNORE_WHITESPACE;
emit_params.ctxlen = context > 0 ? context : 3;
emit_params.flags = XDL_EMIT_FUNCNAMES;
- emit_cb.outf = filediff_cb;
+ emit_cb.out_line = filediff_cb;
emit_cb.priv = fn;
xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb);
if (file1.size)
diff --git a/ui-snapshot.c b/ui-snapshot.c
index 85efe64..9461d51 100644
--- a/ui-snapshot.c
+++ b/ui-snapshot.c
@@ -156,6 +156,7 @@ static int make_snapshot(const struct cgit_snapshot_format *format,
ctx.page.mimetype = xstrdup(format->mimetype);
ctx.page.filename = xstrdup(filename);
cgit_print_http_headers();
+ init_archivers();
format->write_func(hex, prefix);
return 0;
}
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-11-21 21:00 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-11-20 16:32 [PATCH 1/1] RFC: git: update to v2.20.0-rc0 list
2018-11-20 17:27 ` konstantin
2018-11-20 19:17 ` list
2018-11-21 21:00 ` [PATCH 1/1] RFC: git: update to v2.20.0-rc1 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).