2
0
mirror of https://git.zx2c4.com/cgit/ synced 2024-11-16 12:12:52 +00:00
Commit Graph

1589 Commits

Author SHA1 Message Date
Christian Hesse
89ee517122 git: update to v2.37.1
Update to git version v2.37.1, no additional changes required.

Signed-off-by: Christian Hesse <mail@eworm.de>
2022-12-19 15:09:39 +01:00
Christian Hesse
2486d70752 git: update to v2.37.0
Update to git version v2.37.0, no additional changes required.

Signed-off-by: Christian Hesse <mail@eworm.de>
2022-12-19 15:09:39 +01:00
Christian Hesse
bcdfb2197f git: update to v2.36.1
Update to git version v2.36.1, no additional changes required.

Signed-off-by: Christian Hesse <mail@eworm.de>
2022-12-19 15:09:39 +01:00
June McEnroe
b9ff119549 shared: fix bad free in cgit_diff_tree
Since git commit 244c27242f44e6b88e3a381c90bde08d134c274b,

> diff.[ch]: have diff_free() call clear_pathspec(opts.pathspec)

calling diff_flush calls free(3) on opts.pathspec.items, so it can't
be a pointer to a stack variable.

Signed-off-by: Christian Hesse <mail@eworm.de>
2022-12-19 15:09:34 +01:00
Christian Hesse
bb02e24ec2 git: update to v2.36.0
Update to git version v2.36.0, this requires changes for these
upstream commits:

* 95433eeed9eac439eb21eb30105354b15e71302e
  diff: add ability to insert additional headers for paths

Signed-off-by: Christian Hesse <mail@eworm.de>
2022-04-18 22:15:36 +02:00
Christian Hesse
cc9b717c87 git: update to v2.35.3
Update to git version v2.35.3, no additional changes required.

Signed-off-by: Christian Hesse <mail@eworm.de>
2022-04-18 22:10:41 +02:00
Christian Hesse
9761994243 git: update to v2.35.2
Update to git version v2.35.2, no additional changes required.

Signed-off-by: Christian Hesse <mail@eworm.de>
2022-04-12 19:01:23 +02:00
Christian Hesse
bbbaa29a96 git: update to v2.35.1
Update to git version v2.35.1, no additional changes required.

Signed-off-by: Christian Hesse <mail@eworm.de>
2022-01-29 10:20:25 +01:00
Christian Hesse
73e98c16e8 git: update to v2.35.0
Update to git version v2.35.0, no additional changes required.

Signed-off-by: Christian Hesse <mail@eworm.de>
2022-01-24 20:45:20 +01:00
Christian Hesse
11be5b8182 git: update to v2.34.1
Update to git version v2.34.1, no additional changes required.

Signed-off-by: Christian Hesse <mail@eworm.de>
2021-11-24 21:12:12 +01:00
Christian Hesse
b8f2b675df git: update to v2.34.0
Update to git version v2.34.0, this requires changes for these
upstream commits:

* abf897bacd2d36b9dbd07c70b4a2f97a084704ee
  string-list.[ch]: remove string_list_init() compatibility function

Signed-off-by: Christian Hesse <mail@eworm.de>
2021-11-15 22:53:04 +01:00
Christian Hesse
45eff40655 git: update to v2.33.0
Update to git version v2.33.0, no additional changes required.

Signed-off-by: Christian Hesse <mail@eworm.de>
2021-11-03 15:34:52 +01:00
Christian Hesse
5258c297ba git: update to v2.32.0
Update to git version v2.32.0, this requires changes for these
upstream commits:

* 47957485b3b731a7860e0554d2bd12c0dce1c75a
  tree.h API: simplify read_tree_recursive() signature

Signed-off-by: Christian Hesse <mail@eworm.de>
2021-06-08 12:37:46 +02:00
Christian Hesse
6dbbffe015 git: update to v2.31.1
Update to git version v2.31.1, no additional changes required.

Signed-off-by: Christian Hesse <mail@eworm.de>
2021-05-18 22:53:49 +02:00
Christian Hesse
62eb8db452 md2html: use proper formatting for hr
This addressed a non-existent background image and made the element
invisible. Drop the style and use something sane.

Signed-off-by: Christian Hesse <mail@eworm.de>
2021-05-12 15:32:50 +02:00
Christian Hesse
d889cae811 git: update to v2.31.0
Update to git version v2.31.0, this requires changes for these
upstream commits:

* 36a317929b8f0c67d77d54235f2d20751c576cbb
  refs: switch peel_ref() to peel_iterated_oid()

Signed-off-by: Christian Hesse <mail@eworm.de>
2021-03-16 11:28:43 +01:00
Christian Hesse
4ffadc1e0c git: update to v2.30.1
Update to git version v2.30.1, no additional changes required.

Signed-off-by: Christian Hesse <mail@eworm.de>
2021-02-10 16:13:53 +01:00
Todd Zullinger
bd6f5683f6 tests: t0107: support older and/or non-GNU tar
The untar tests for various compression algorithms use shortcut options
from GNU tar to handle decompression.  These options may not be provided
by non-GNU tar nor even by slightly older GNU tar versions which ship on
many systems.

An example of the latter case is the --zstd option.  This was added in
GNU tar-1.32 (2019-02-23)¹.  This version of tar is not provided by
CentOS/RHEL, in particular.  In Debian, --zstd has been backported to
the tar-1.30 release.

Avoid the requirement on any specific implementations or versions of tar
by piping decompressed output to tar.  This is compatible with older GNU
tar releases as well as tar implementations from other vendors.  (It may
also be a slight benefit that this more closely matches what the
snapshot creation code does.)

¹ Technically, the --zstd option was first released in tar-1.31
  (2019-01-02), but this release was very short-lived and is no longer
  listed on the GNU Tar release page.

Signed-off-by: Todd Zullinger <tmz@pobox.com>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
2020-12-29 21:06:17 +01:00
Jason A. Donenfeld
f69626c68e md2html: use sane_lists extension
This allows for cleaner nesting semantics and matches github more
closely.

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
2020-12-29 12:33:48 +01:00
Christian Hesse
cef27b670a git: update to v2.30.0
Update to git version v2.30.0, this requires changes for these
upstream commits:

* 88894aaeeae92e8cb41143cc2e045f50289dc790
  blame: simplify 'setup_scoreboard' interface

* 1fbfdf556f2abc708183caca53ae4e2881b46ae2
  banned.h: mark non-reentrant gmtime, etc as banned

Signed-off-by: Christian Hesse <mail@eworm.de>
2020-12-29 12:29:42 +01:00
Christian Hesse
b1739247b1 git: update to v2.29.2
Update to git version v2.29.2.

No changes required.

Signed-off-by: Christian Hesse <mail@eworm.de>
2020-10-30 22:26:05 +01:00
Christian Hesse
fe99c76ee4 git: update to v2.29.1
Update to git version v2.29.1. No functional change, but we want latest
and greated version number, no? 😜

Signed-off-by: Christian Hesse <mail@eworm.de>
2020-10-27 10:39:46 +01:00
Christian Hesse
adcc4f822f tests: try with commit-graph
Git 2.24.0 enabled commit-graph by default and caused crashes without
necessary update. Let's test to work with commit-graph.

Signed-off-by: Christian Hesse <mail@eworm.de>
2020-10-22 00:04:10 +02:00
Christian Hesse
a1039ab175 tests: do not copy snapshots to /tmp/
No idea why this was added... Possibly to inspect the snapshot manually?
Let's drop it.

Signed-off-by: Christian Hesse <mail@eworm.de>
2020-10-22 00:03:01 +02:00
Christian Hesse
a4de0e810b global: replace hard coded hash length
With sha1 we had a guaranteed length of 40 hex chars. This changes now
that we have to support sha256 with 64 hex chars... Support both.

Signed-off-by: Christian Hesse <mail@eworm.de>
2020-10-20 23:57:12 +02:00
Christian Hesse
779631c6dc global: replace references to 'sha1' with 'oid'
For some time now sha1 is considered broken and upstream is working to
replace it with sha256. Replace all references to 'sha1' with 'oid',
just as upstream does.

Signed-off-by: Christian Hesse <mail@eworm.de>
2020-10-20 23:57:12 +02:00
Christian Hesse
629659d2cf git: update to v2.29.0
Update to git version v2.29.0, this requires changes for these
upstream commits:

* dbbcd44fb47347a3fdbee88ea21805b7f4ac0b98
  strvec: rename files from argv-array to strvec

* 873cd28a8b17ff21908c78c7929a7615f8c94992
  argv-array: rename to strvec

* d70a9eb611a9d242c1d26847d223b8677609305b
  strvec: rename struct fields

* 6a67c759489e1025665adf78326e9e0d0981bab5
  test-lib-functions: restrict test_must_fail usage

Signed-off-by: Christian Hesse <mail@eworm.de>
2020-10-19 20:27:28 +02:00
Christian Hesse
205837d468 git: update to v2.28.0
Update to git version v2.28.0.

No changes required.

Signed-off-by: Christian Hesse <mail@eworm.de>
2020-07-27 20:36:14 +02:00
Christian Hesse
f780396c0a git: update to v2.27.0
Update to git version v2.27.0.

No changes required.

Signed-off-by: Christian Hesse <mail@eworm.de>
2020-06-02 10:10:15 +02:00
Christian Hesse
0462f08d85 git: update to v2.26.0
Update to git version v2.26.0.

No changes required.

Signed-off-by: Christian Hesse <mail@eworm.de>
2020-03-23 07:43:00 +01:00
Jason A. Donenfeld
55fa25adb0 Bump version
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
2020-03-13 17:49:52 -06:00
Jason A. Donenfeld
6a8d6d4b50 global: use proper accessors for maybe_tree
A previous commit changed ->tree to ->maybe_tree throughout, which may
have worked at the time, but wasn't safe, because maybe_tree is loaded
lazily. This manifested itself in crashes when using the "follow" log
feature. The proper fix is to use the correct contextual accessors
everytime we want access to maybe_tree. Thankfully, the commit.cocci
script takes care of creating mostly-correct patches that we could then
fix up, resulting in this commit here.

Fixes: 255b78f ("git: update to v2.18.0")
Reviewed-by: Christian Hesse <mail@eworm.de>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
2020-03-13 17:48:34 -06:00
Christian Hesse
892ba8c3cc ui-snapshot: add support for zstd compression
This patch adds support for zstd [0] compressed snapshots (*.tar.zst).
We enable multiple working threads (-T0), but keep default compression
level. The latter can be influenced by environment variable.

[0] https://www.zstd.net/

Signed-off-by: Christian Hesse <mail@eworm.de>
2020-03-12 19:56:39 -06:00
Christian Hesse
cc230bf044 tests: add tests for xz compressed snapshots
Signed-off-by: Christian Hesse <mail@eworm.de>
2020-03-12 19:56:39 -06:00
Hanspeter Portner
06671f4b21 ui-snapshot: add support for lzip compression
This patch adds support for lzip [1] compressed snapshots (*.tar.lz)

[1] https://www.nongnu.org/lzip/

Signed-off-by: Hanspeter Portner <dev@open-music-kontrollers.ch>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
2020-02-26 09:57:40 +08:00
Christian Hesse
fde897b817 git: update to v2.25.1
Update to git version v2.25.1.

No changes required.
2020-02-17 13:08:02 +01:00
Christian Hesse
5e49023b01 tests: allow to skip git version tests
This allows to run tests non-tagged git checkout or when bisecting.

Signed-off-by: Christian Hesse <mail@eworm.de>
2020-01-13 15:17:19 -05:00
Jason A. Donenfeld
fa146ccabd Bump version
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
2020-01-13 15:04:14 -05:00
Christian Hesse
bd68c98879 git: update to v2.25.0
Update to git version v2.25.0.

Upstream renamed 'init_display_notes()' to 'load_display_notes()' in
commit 1e6ed5441a61b5085978e0429691e2e2425f6846 ("notes: rename to
load_display_notes()").

Signed-off-by: Christian Hesse <mail@eworm.de>
2020-01-13 14:50:55 -05:00
Christian Hesse
ca98c9e7bf tests: skip tests if strace is not functional
Chances are that strace is available but not functional due to
restricted permissions:

strace: test_ptrace_get_syscall_info: PTRACE_TRACEME: Operation not permitted
strace: ptrace(PTRACE_TRACEME, ...): Operation not permitted
+++ exited with 1 +++

Just skip the tests then.

Signed-off-by: Christian Hesse <mail@eworm.de>
2019-12-11 11:04:02 +01:00
Christian Hesse
d8e5dd25a0 git: update to v2.24.1
Update to git version v2.24.1.

No changes required.

Signed-off-by: Christian Hesse <mail@eworm.de>
2019-12-10 20:57:24 +01:00
Christian Hesse
583aa5d80e ui-repolist: do not return unsigned (negative) value
The function read_agefile() returns time_t, which is a signed datatime.
We should not return unsigned (negative) value here.

Reported-by: Johannes Stezenbach <js@linuxtv.org>
Signed-off-by: Christian Hesse <mail@eworm.de>
2019-11-22 13:35:50 +01:00
Christian Hesse
bfabd4519c git: update to v2.24.0
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@eworm.de>
2019-11-08 22:55:58 +01:00
Christian Hesse
8fc0c81bbb git: update to v2.23.0
Update to git version v2.23.0.

No changes required.

Signed-off-by: Christian Hesse <mail@eworm.de>
2019-10-25 11:40:17 +02:00
Christian Hesse
034e3c7d56 git: update to v2.22.0
Update to git version v2.22.0.

Upstream commit bce9db6d ("trace2: use system/global config for default
trace2 settings") caused a regression. We have to unset HOME and
XDG_CONFIG_HOME before early loading of config from trace2 code kicks in.

Signed-off-by: Christian Hesse <mail@eworm.de>
2019-10-25 11:40:17 +02:00
Christian Hesse
e1ad15d368 ui-tree: allow per repository override for enable-blame
The blame operation can cause high cost in terms of CPU load for huge
repositories. Let's add a per repository override for enable-blame.

Signed-off-by: Christian Hesse <mail@eworm.de>
2019-06-25 21:40:59 +02:00
Christian Hesse
27a6d69ab3 tests: successfully validate rc versions
For testing versions the version string differs for git tag (v2.22.0-rc3)
and tarball file name (2.22.0.rc3). Let's fix validation for testing
versions.

Signed-off-by: Christian Hesse <mail@eworm.de>
2019-06-05 15:38:14 +02:00
Christian Hesse
985fba80d0 git: update to v2.21.0
Update to git version v2.21.0. Required changes follow upstream commits:

* 6a7895fd8a3bd409f2b71ffc355d5142172cc2a0
  (commit: prepare free_commit_buffer and release_commit_memory for
  any repo)

* e092073d643b17c82d72cf692fbfaea9c9796f11
  (tree.c: make read_tree*() take 'struct repository *')

Signed-off-by: Christian Hesse <mail@eworm.de>
Reviewed-by: John Keeping <john@keeping.me.uk>
2019-06-05 15:37:49 +02:00
Christian Hesse
68de710c1c ui-ssdiff: ban strncat()
Git version v2.21.0 marks strncat() as banned (commit
ace5707a803eda0f1dde3d776dc3729d3bc7759a), so replace it.

Signed-off-by: Christian Hesse <mail@eworm.de>
2019-06-05 15:37:49 +02:00
Christian Hesse
ccba7eb9d0 global: make 'char *path' const where possible
Signed-off-by: Christian Hesse <mail@eworm.de>
2019-06-05 15:37:49 +02:00