mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-01-15 16:53:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

git_backend: when running "git gc", chdir instead of specifying it by GIT_DIR

Browse source 
Hopefully this will be more reliable on Windows where path/environment stuff
is messy.
This commit is contained in:
Yuya Nishihara 2024-01-18 00:19:38 +09:00
parent 4e54021930
commit 845eb4ce01
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lib/src/git_backend.rs
View file

@ -19,7 +19,7 @@ use std::collections::HashSet;
use std::fmt::{Debug, Error, Formatter};
use std::io::{Cursor, Read};
use std::path::{Path, PathBuf};
use std::process::ExitStatus;
use std::process::{Command, ExitStatus};
use std::sync::{Arc, Mutex, MutexGuard};
use std::{fs, io, str};
@ -606,9 +606,12 @@ fn to_no_gc_ref_update(id: &CommitId) -> gix::refs::transaction::RefEdit {
}
fn run_git_gc(git_dir: &Path) -> Result<(), GitGcError> {
let mut git = std::process::Command::new("git");
git.env("GIT_DIR", git_dir);
git.args(["gc"]);
let mut git = Command::new("git");
git.arg("--git-dir=."); // turn off discovery
git.arg("gc");
// Don't specify it by GIT_DIR/--git-dir. On Windows, the "\\?\" path might
// not be supported by git.
git.current_dir(git_dir);
// TODO: pass output to UI layer instead of printing directly here
let status = git.status().map_err(GitGcError::GcCommand)?;
if !status.success() {