diff --git a/Cargo.lock b/Cargo.lock index 77b7b42..177fe1c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -165,7 +165,7 @@ dependencies = [ [[package]] name = "repotools" -version = "0.10.0-rc2" +version = "0.10.0-rc3" dependencies = [ "clap", "exec", diff --git a/Cargo.toml b/Cargo.toml index a898178..4144e3e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,7 +4,7 @@ description = "Short names, big time savings. Repotools is a collection of comma license = "ISC" readme = "README.md" repository = "https://github.com/ctsrc/repotools" -version = "0.10.0-rc2" +version = "0.10.0-rc3" authors = ["Erik Nordstrøm "] categories = ["command-line-utilities", "development-tools", "science"] keywords = ["git"] diff --git a/src/bin/sq.rs b/src/bin/sq.rs index 4f0ec44..ff2b708 100644 --- a/src/bin/sq.rs +++ b/src/bin/sq.rs @@ -89,12 +89,12 @@ fn main() { let temp_branch = format!("temp-{ulid}"); eprintln!("Temporary branch: {temp_branch}"); - // Squash op step 1: Create temporary branch + // Squash op step 1: Create temporary branch from local version of default branch let status = Command::new("git") .arg("checkout") .arg("-b") .arg(&temp_branch) - .arg(default_branch_w_remote_prefix) + .arg(default_branch) .status() .expect("Create temporary branch"); if !status.success() { @@ -104,7 +104,7 @@ fn main() { // TODO: If any subsequent command fails after this point, // go back to branch we were on and then delete the temporary branch. - // Squash op step 2: Squash the branch + // Squash op step 2: Squash the original branch into the temp branch let status = Command::new("git") .arg("merge") .arg("--squash")