Mattias Granlund
c2f79818c8
Show PR checks progress as error if any check has failed
2024-05-30 12:07:42 +02:00
Kiril Videlov
06ea63ee7c
fixes reflog timestamps
...
Time stapms are super imporatant for this (thanks @schacon) - without a correct time stamp, the trees will be GC'd
2024-05-30 12:02:30 +02:00
Kiril Videlov
0d2024e7fa
Merge pull request #3896 from gitbutlerapp/remove-git-signature-shell-type
...
remove git signature shell type
2024-05-30 00:03:21 +02:00
Kiril Videlov
c623748b3b
Merge pull request #3894 from PritamSangani/fix-error-message-typo
...
Fix small typo in error message
2024-05-29 23:53:37 +02:00
Kiril Videlov
62a3d02303
remove git::signature shell type
2024-05-29 23:51:26 +02:00
Kiril Videlov
ff9e36fb21
simplify git signature use
2024-05-29 23:37:32 +02:00
Kiril Videlov
8882e8efc0
Merge pull request #3895 from gitbutlerapp/write-tree-onto-tree-using-new-tree-builder
...
remove git::treebuilder in favor of plain git2 builder
2024-05-29 23:15:42 +02:00
Kiril Videlov
8496dbf044
remove git::treebuilder in favor of plain git2 builder
2024-05-29 23:03:25 +02:00
Kiril Videlov
9142e73cb7
Merge pull request #3893 from gitbutlerapp/update-file-mode-for-symlink
...
remove git::FileMode shell type
2024-05-29 22:55:44 +02:00
Pritam Sangani
efc7c4bd64
Add full stop to end of error message to match style of other error messages
2024-05-29 21:46:37 +01:00
Pritam Sangani
e650e041f8
Fix small typo in error message
2024-05-29 21:42:37 +01:00
Kiril Videlov
c3f374af72
remove git::FileMode shell type
2024-05-29 22:42:27 +02:00
Kiril Videlov
4c9fc4d213
Merge pull request #3892 from Byron/oplog-fix
...
assure reflog is recreated if not present even if ref is present
2024-05-29 22:17:14 +02:00
Sebastian Thiel
7f9462a857
refactor CommitExt
...
- remove conflicting `*_gb()` methods as the native ones are easy enough to use
- some minor refactor
2024-05-29 21:47:03 +02:00
Sebastian Thiel
d5708b38bb
assure reflog is recreated if not present even if ref is present
2024-05-29 21:16:52 +02:00
AliReza Taleghani
0072a5c928
Update publish.yaml
2024-05-29 20:10:31 +02:00
Kiril Videlov
51f22273ce
Merge pull request #3890 from gitbutlerapp/remove-obsolete-blob-references
...
feat(git): remove unused Blob type
2024-05-29 18:48:34 +02:00
Kiril Videlov
fb069e5d39
feat(git): remove unused Blob type
2024-05-29 18:14:50 +02:00
Kiril Videlov
1a127dd96e
Merge pull request #3882 from Byron/ops-review
...
oplog review (part 2)
2024-05-29 18:11:07 +02:00
Sebastian Thiel
96dc9d2887
fix oplog-worktree merging
2024-05-29 17:58:54 +02:00
Sebastian Thiel
407ec1427b
Get performance metrics for get_wd_tree()
...
It's a tiny little function, but I think it can be slow
as it could incur a lot of work, scaling up with the size
of the repository, and the amount of untracked data in it.
Let's gather some data.
2024-05-29 17:56:12 +02:00
Kiril Videlov
ea219eedf9
Merge pull request #3889 from gitbutlerapp/remove-commit-reference
...
remove-commit-reference
2024-05-29 17:48:54 +02:00
Kiril Videlov
d3aa5c4908
remove git::Commit wrapper type
2024-05-29 17:35:30 +02:00
Kiril Videlov
45979b4c85
remove usage of git::Commit
2024-05-29 17:33:57 +02:00
Sebastian Thiel
1abb464845
Merge pull request #3885 from gitbutlerapp/rust-remote-tweaks-for-byron
...
Tweaks to remotes code
2024-05-29 15:13:02 +02:00
Kiril Videlov
66379af066
Merge pull request #3887 from gitbutlerapp/remove-git-tree
...
remove git::tree
2024-05-29 14:44:22 +02:00
Kiril Videlov
be149a5569
remove git::Tree in favor of just git2::Tree
2024-05-29 14:30:59 +02:00
Kiril Videlov
9e4bbdedec
remove unused reader functions
2024-05-29 14:04:51 +02:00
Kiril Videlov
d97bba0001
remove git::Tree from branch
2024-05-29 13:24:47 +02:00
Kiril Videlov
3c151a52cb
create a tree extension trait
...
this is useful for preserving functionality that we have added on top of git2::Tree
2024-05-29 11:15:46 +02:00
Caleb Owens
4ba15c3663
Make clippy a happy clippy
2024-05-29 11:14:29 +02:00
Caleb Owens
faa476875d
Replace &BranchId to BranchId
2024-05-29 11:07:36 +02:00
Caleb Owens
0db12b5115
Don't pass references to project_id
2024-05-29 10:47:11 +02:00
Caleb Owens
c5d841a417
Tweaks to remotes code
2024-05-29 09:52:03 +02:00
Kiril Videlov
aed23f3e69
Merge pull request #3884 from gitbutlerapp/remove-core-git-shell-types
...
move get_wd_tree to git2::Repository extension trait
2024-05-28 23:46:43 +02:00
Kiril Videlov
4db276354b
remove unused import
2024-05-28 23:32:33 +02:00
Kiril Videlov
cc5e0bd8bd
remove unused repository method
2024-05-28 23:20:26 +02:00
Kiril Videlov
ce5e57d5ac
move get_wd_tree to git2::Repository extension trait
...
This way we reduce drilling and allow ourselves to eventually remove core::git types
2024-05-28 23:17:54 +02:00
Sebastian Thiel
203e43b9d1
Merge pull request #3883 from Byron/fix-3876
...
don't choke on .gitignore directories
2024-05-28 22:29:34 +02:00
Sebastian Thiel
5cad4dabc8
upgrade to latest gix-glob to prevent choking on directories called .gitignore ( #3876 )
...
This is also effective for `.gitattributes` directories, making `gitoxide`
act just like Git.
Note that `gix-fs` is updated just for a potential Windows fix which probably
doesn't matter.
2024-05-28 22:04:10 +02:00
Caleb Owens
b71a30258c
Merge pull request #3880 from gitbutlerapp/remote-branch-display
...
Add a "apply from remote" flow
2024-05-28 19:16:04 +02:00
Caleb Owens
aab5684be2
Redirect to branch page if there is a conflict
2024-05-28 17:54:35 +02:00
Caleb Owens
ed75059ee7
Update message to indicate that we're adding a remote
2024-05-28 17:53:20 +02:00
Kiril Videlov
f9ca7374e8
Merge pull request #3867 from Byron/ops-review
...
oplog-review
2024-05-28 17:35:43 +02:00
Sebastian Thiel
b0e73e5c89
oplog review
2024-05-28 17:22:02 +02:00
Kiril Videlov
e5fa064be5
Merge pull request #3873 from gitbutlerapp/update-gitbutler-integration
...
skip signing of the integration commit
2024-05-28 17:06:49 +02:00
Mattias Granlund
785bd3fb39
Fix slightly confusing code related to merging in trunk
...
- easier to understand if we only set branch.tree in one place
- enable ? return for git errors
2024-05-28 16:58:48 +02:00
Kiril Videlov
3494585679
plain commits for integration stuff
...
more
asdf
2024-05-28 16:48:07 +02:00
Caleb Owens
a6446b5aa9
Use sha to find PRs (also use upstream sha for vbranch when available)
...
Its preferable to use the upstream sha because that will always be in agreeance with the PR, whereas the local "head" may be different if you've rebased or moved forwards in time
2024-05-28 16:44:14 +02:00
Josh Junon
a6bad0ee13
Merge pull request #3878 from gitbutlerapp/null-stdin
...
disable stdin for invocations of ssh-keygen when signing commits
2024-05-28 14:00:23 +02:00
