Commit graph

546 commits

Author SHA1 Message Date
Johannes Agricola
e08d954573
Clean up a few #[allow]s (#2614) 2025-04-16 10:45:08 +02:00
Johannes Agricola
7f88934d05
Bump msrv to 1.81 (#2613)
Co-authored-by: Naseschwarz <naseschwarz@0x53a.de>
2025-04-16 09:21:06 +02:00
Joshix-1
711210b97b
Run git-hooks more correctly (#2483) 2025-04-15 15:01:39 +02:00
extrawurst
9781608584
upgrade dirs (#2569) 2025-04-15 09:22:50 +02:00
extrawurst
eeebb0a647
fix cargo deny advisory warning (#2598) 2025-04-07 18:02:34 +02:00
extrawurst
cc907996f4
fix latest clippy (#2597) 2025-04-07 16:06:00 +02:00
Johannes Agricola
7f75307f6e
Resolve core.hooksPath relative to GIT_WORK_TREE (#2571)
* Resolve core.hooksPath relative to GIT_WORK_TREE

git supports relative values in core.hooksPath.

`man git-config`:

> A relative path is taken as relative to the directory where the hooks are
> run (see the "DESCRIPTION" section of githooks[5]).

`man githooks`:

> Before Git invokes a hook, it changes its working directory to either
> $GIT_DIR in a bare repository or the root of the working tree in a >
> non-bare repository.

I.e. relative paths in core.hooksPath in non-bare repositories are always
relative to GIT_WORK_TREE.

There is a further exception; I believe this is not considered for path
resolution:

> An exception are hooks triggered during a push (pre-receive, update,
> post-receive, post-update, push-to-checkout) which are always executed
> in $GIT_DIR.

* Favor Repository::workdir() over path().parent()

This more clearly errors in case of bare repositories instead of using
the parent directory of the bare repository.

---------

Co-authored-by: Naseschwarz <naseschwarz@0x53a.de>
Co-authored-by: extrawurst <776816+extrawurst@users.noreply.github.com>
2025-04-04 15:28:44 +02:00
Johannes Agricola
89f73d2ec2
Disable dotted range commit yanking (#2577)
The algorithm for computing marked_consecutive assumes that commits are
consecutive in the commit graph if they are consecutive in the
linearized log used in` commitlist.rs`. That is not universally correct,
as siblings may also be displayed consecutively in this list.

For now, this just removes generating commit lists in dotted range
notation.

Co-authored-by: Naseschwarz <naseschwarz@0x53a.de>
2025-04-04 15:27:50 +02:00
Lena
92ef9f6fde
Respect .mailmap (#2485) 2025-03-19 14:44:02 +01:00
vlad-anger
979fa68837
Push with refspec (#2542)
* push: respect `branch.*.merge` when push default is upstream
2025-03-18 18:35:39 +01:00
Johannes Agricola
a91132d187
Bump git2 from 0.20.0 to 0.20.1 (#2567)
* Bump git2 from 0.20.0 to 0.20.1

Bumps [git2](https://github.com/rust-lang/git2-rs) from 0.20.0 to 0.20.1.
- [Changelog](https://github.com/rust-lang/git2-rs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rust-lang/git2-rs/compare/git2-0.20.0...git2-0.20.1)

---
updated-dependencies:
- dependency-name: git2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* Avoid passing reference into struct

git2-rs changed the lifetime of the result of Patch::hunk() to reference
the patch struct:
https://github.com/rust-lang/git2-rs/pull/1141

Thus, returning a patch struct and a reference into it is flagged by the
borrow checker upon move when returning.

This patch avoids returning both alltogether by separating retrieving
and retrieving the patch.

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Naseschwarz <naseschwarz@0x53a.de>
2025-03-18 09:09:11 +01:00
Vasley
4031b0d1a7
Change links to point to gitui-org instead of extrawurst (#2538) 2025-03-16 15:33:28 +01:00
dependabot[bot]
58b4e2c21e
Bump gix from 0.69.1 to 0.70.0 (#2492)
Bumps [gix](https://github.com/GitoxideLabs/gitoxide) from 0.69.1 to 0.70.0.
- [Release notes](https://github.com/GitoxideLabs/gitoxide/releases)
- [Changelog](https://github.com/GitoxideLabs/gitoxide/blob/main/CHANGELOG.md)
- [Commits](https://github.com/GitoxideLabs/gitoxide/compare/gix-v0.69.1...gix-v0.70.0)

---
updated-dependencies:
- dependency-name: gix
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-01-21 12:07:56 +01:00
extrawurst
7ec62279e8
prepare for rc (#2479) 2025-01-13 22:26:14 +01:00
extrawurst
01ad0615b2
git2 upgrade (#2473) 2025-01-10 15:28:52 +01:00
extrawurst
89db83839d
Gix upgrade (#2472) 2025-01-10 14:19:27 +01:00
extrawurst
d72617f5c2
some cargo upgrades (#2471) 2025-01-10 12:55:30 +01:00
extrawurst
66af52ae70 rust 1.84 update 2025-01-09 17:38:44 +01:00
extrawurst
640bf333fc
Fix ci (#2447) 2024-12-10 09:44:01 +01:00
dependabot[bot]
809cb41668
Bump serial_test from 3.1.1 to 3.2.0 (#2428)
Bumps [serial_test](https://github.com/palfrey/serial_test) from 3.1.1 to 3.2.0.
- [Release notes](https://github.com/palfrey/serial_test/releases)
- [Commits](https://github.com/palfrey/serial_test/compare/v3.1.1...v3.2.0)

---
updated-dependencies:
- dependency-name: serial_test
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-11-15 10:40:20 +01:00
Christoph Rüßler
b49bacfac1
Bump gix from 0.66.0 to 0.67.0 and adapt to API changes (#2422)
* Bump gix from 0.66.0 to 0.67.0

Bumps [gix](https://github.com/GitoxideLabs/gitoxide) from 0.66.0 to 0.67.0.
- [Release notes](https://github.com/GitoxideLabs/gitoxide/releases)
- [Changelog](https://github.com/GitoxideLabs/gitoxide/blob/main/CHANGELOG.md)
- [Commits](https://github.com/GitoxideLabs/gitoxide/compare/gix-v0.66.0...gix-v0.67.0)

---
updated-dependencies:
- dependency-name: gix
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Adapt to API changes

* Update backtrace

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-11-08 09:53:43 +01:00
Christoph Rüßler
9c4bd29fc8
Improve test for env variables (#2409)
* Add test for AsyncLog respecting GIT_DIR

* Mark test as serial

* Mark additional test as serial

* Unwrap result to get more info in error case

---------

Co-authored-by: extrawurst <776816+extrawurst@users.noreply.github.com>
2024-10-29 09:42:25 +01:00
extrawurst
d7765c4239 fix doc comments to please new rust version lints 2024-10-18 18:02:02 +02:00
extrawurst
c4f517acb5 Revert "Add test for AsyncLog respecting GIT_DIR (#2387)"
This reverts commit 9c433b4de3.
2024-10-17 11:28:40 +02:00
dependabot[bot]
15e444ee3a
Bump ssh-key from 0.6.6 to 0.6.7 (#2390)
Bumps [ssh-key](https://github.com/RustCrypto/SSH) from 0.6.6 to 0.6.7.
- [Commits](https://github.com/RustCrypto/SSH/compare/ssh-key/v0.6.6...ssh-key/v0.6.7)

---
updated-dependencies:
- dependency-name: ssh-key
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-10-16 11:19:36 +02:00
Christoph Rüßler
9c433b4de3
Add test for AsyncLog respecting GIT_DIR (#2387) 2024-10-15 20:20:03 +02:00
extrawurst
f52586885e git2-hooks version bump 2024-09-30 11:24:06 +02:00
Robin
d4f9400e04
Remotes popup (#2350)
Co-authored-by: extrawurst <mail@rusticorn.com>
Co-authored-by: extrawurst <776816+extrawurst@users.noreply.github.com>
2024-09-18 16:31:21 +02:00
Christoph Rüßler
2b8ef40289
Fix log crashing in subdirectories (#2301)
* Fix log crashing in subdirectories
Replace `gix::open` by `gix::discover`. `gix::open` errors when the
passed directory is not a git repository.
* Add test for AsyncLog in sub-directory
* Respect env variables when discovering repo

---------

Co-authored-by: extrawurst <776816+extrawurst@users.noreply.github.com>
2024-09-17 11:37:52 +02:00
extrawurst
0f5cf893f7 fix fmt 2024-09-11 22:24:32 +02:00
extrawurst
134ef734a4 clippy fix 2024-09-11 21:30:34 +02:00
extrawurst
0a5e2ef1ed gix update 2024-09-11 21:27:14 +02:00
extrawurst
b89672b134 rust 1.80 clippy fixes 2024-07-26 13:24:52 +07:00
extrawurst
ce923e6fe4
supply libgit2 with flag to respect env variables (#2299)
closes #2298
2024-07-25 11:16:01 +07:00
dependabot[bot]
8e00264943 Bump gix from 0.63.0 to 0.64.0
Bumps [gix](https://github.com/Byron/gitoxide) from 0.63.0 to 0.64.0.
- [Release notes](https://github.com/Byron/gitoxide/releases)
- [Changelog](https://github.com/Byron/gitoxide/blob/main/CHANGELOG.md)
- [Commits](https://github.com/Byron/gitoxide/compare/gix-v0.63.0...gix-v0.64.0)

---
updated-dependencies:
- dependency-name: gix
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-07-25 10:52:29 +07:00
Christoph Rüßler
d30de223fe
Add LogWalkerWithoutFilter, using gitoxide (#2275)
* Add LogWalkerWithoutFilter, using gitoxide
* Use feature revision for gix

---------

Co-authored-by: extrawurst <776816+extrawurst@users.noreply.github.com>
2024-07-08 09:25:44 +02:00
dependabot[bot]
423b5ff3d1 Bump git2 from 0.18.3 to 0.19.0
Bumps [git2](https://github.com/rust-lang/git2-rs) from 0.18.3 to 0.19.0.
- [Changelog](https://github.com/rust-lang/git2-rs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rust-lang/git2-rs/compare/git2-0.18.3...git2-0.19.0)

---
updated-dependencies:
- dependency-name: git2
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-06-27 12:45:18 +02:00
extrawurst
7f161d61cd release prep 2024-06-02 14:24:02 +02:00
extrawurst
93fee307d6 version bump 2024-05-16 19:14:32 +02:00
Christoph Rüßler
a92be3be9d
Get default fetch remote from configuration (#2204)
fixes #1093
2024-05-16 12:03:55 +02:00
extrawurst
6e12c1e974 fix clippy and nightly build 2024-05-16 11:11:05 +02:00
dependabot[bot]
5ad54ee675 Bump unicode-truncate from 0.2.0 to 1.0.0
Bumps [unicode-truncate](https://github.com/Aetf/unicode-truncate) from 0.2.0 to 1.0.0.
- [Release notes](https://github.com/Aetf/unicode-truncate/releases)
- [Changelog](https://github.com/Aetf/unicode-truncate/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Aetf/unicode-truncate/compare/v0.2.0...v1.0.0)

---
updated-dependencies:
- dependency-name: unicode-truncate
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-04-29 13:32:22 +02:00
dependabot[bot]
c2d23da543 Bump serial_test from 3.0.0 to 3.1.1
Bumps [serial_test](https://github.com/palfrey/serial_test) from 3.0.0 to 3.1.1.
- [Release notes](https://github.com/palfrey/serial_test/releases)
- [Commits](https://github.com/palfrey/serial_test/compare/v3.0.0...v3.1.1)

---
updated-dependencies:
- dependency-name: serial_test
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-04-29 13:32:12 +02:00
dependabot[bot]
d6ab75399b Bump ssh-key from 0.6.5 to 0.6.6
Bumps [ssh-key](https://github.com/RustCrypto/SSH) from 0.6.5 to 0.6.6.
- [Commits](https://github.com/RustCrypto/SSH/compare/ssh-key/v0.6.5...ssh-key/v0.6.6)

---
updated-dependencies:
- dependency-name: ssh-key
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-04-15 08:10:11 +02:00
extrawurst
09a2f70c89
Release prep (#2183) 2024-04-14 20:31:05 +02:00
Christoph Rüßler
b08eddb45b
Get default push remote from configuration (#2156) 2024-04-14 12:12:09 +02:00
Antonio Yang
945ec45027
sign with ssh key in disc (#2175) 2024-04-10 11:53:23 +02:00
Concelare
92e0face1e
add tests for commitChar filtering (#2151)
adds missing tests for b15c8643c8 (see #2145)
2024-03-26 15:50:13 +00:00
dependabot[bot]
9d94b9f600 Bump rayon from 1.9.0 to 1.10.0
Bumps [rayon](https://github.com/rayon-rs/rayon) from 1.9.0 to 1.10.0.
- [Changelog](https://github.com/rayon-rs/rayon/blob/main/RELEASES.md)
- [Commits](https://github.com/rayon-rs/rayon/compare/rayon-core-v1.9.0...rayon-core-v1.10.0)

---
updated-dependencies:
- dependency-name: rayon
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-03-24 22:57:48 -07:00
ZingyAwesome
ef6abbba0f
Fix typo in commit.rs (#2150) 2024-03-24 15:14:07 -07:00