Skip to content

improvements #2203

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 6, 2025
Merged

improvements #2203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5761441
fix: run merge-filters in the worktree dir or the git dir.
Byron Oct 6, 2025
0b2ffed
thanks clippy
Byron Oct 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion gitoxide-core/src/repository/merge_base.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ pub fn merge_base(
let first_id = repo.rev_parse_single(first.as_str())?;
let other_ids: Vec<_> = others
.iter()
.cloned()
.map(|other| repo.rev_parse_single(other.as_str()).map(gix::Id::detach))
.collect::<Result<_, _>>()?;

Expand Down
14 changes: 10 additions & 4 deletions gix-merge/src/blob/platform/merge.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,9 @@ pub(super) mod inner {
) -> Result<merge::Command, Error> {
fn write_data(
data: &[u8],
directory: &Path,
) -> std::io::Result<(gix_tempfile::Handle<gix_tempfile::handle::Closed>, PathBuf)> {
let mut file = gix_tempfile::new(Path::new(""), ContainingDirectory::Exists, AutoRemove::Tempfile)?;
let mut file = gix_tempfile::new(directory, ContainingDirectory::Exists, AutoRemove::Tempfile)?;
file.write_all(data)?;
let mut path = Default::default();
file.with_mut(|f| {
Expand All @@ -146,17 +147,22 @@ pub(super) mod inner {
kind: ResourceKind::OtherOrTheirs,
})?;

let (base_tmp, base_path) = write_data(base).map_err(|err| Error::CreateTempfile {
let tmp_dir = context
.worktree_dir
.as_deref()
.or(context.git_dir.as_deref())
.unwrap_or(Path::new(""));
let (base_tmp, base_path) = write_data(base, tmp_dir).map_err(|err| Error::CreateTempfile {
rela_path: self.ancestor.rela_path.into(),
kind: ResourceKind::CommonAncestorOrBase,
source: err,
})?;
let (ours_tmp, ours_path) = write_data(ours).map_err(|err| Error::CreateTempfile {
let (ours_tmp, ours_path) = write_data(ours, tmp_dir).map_err(|err| Error::CreateTempfile {
rela_path: self.current.rela_path.into(),
kind: ResourceKind::CurrentOrOurs,
source: err,
})?;
let (theirs_tmp, theirs_path) = write_data(theirs).map_err(|err| Error::CreateTempfile {
let (theirs_tmp, theirs_path) = write_data(theirs, tmp_dir).map_err(|err| Error::CreateTempfile {
rela_path: self.other.rela_path.into(),
kind: ResourceKind::OtherOrTheirs,
source: err,
Expand Down
Loading