This commit is contained in:
Sampo Kivistö 2026-03-18 13:29:48 +02:00
parent 75eaf46e42
commit 0d9a887e0a
No known key found for this signature in database
GPG key ID: 3B426F446F481CFF
3 changed files with 17 additions and 16 deletions

14
Cargo.lock generated
View file

@ -2240,7 +2240,7 @@ dependencies = [
[[package]]
name = "gitcomet"
version = "0.1.4"
version = "0.1.5"
dependencies = [
"clap",
"embed-resource",
@ -2256,7 +2256,7 @@ dependencies = [
[[package]]
name = "gitcomet-core"
version = "0.1.4"
version = "0.1.5"
dependencies = [
"regex",
"rustc-hash 2.1.1",
@ -2267,14 +2267,14 @@ dependencies = [
[[package]]
name = "gitcomet-git"
version = "0.1.4"
version = "0.1.5"
dependencies = [
"gitcomet-core",
]
[[package]]
name = "gitcomet-git-gix"
version = "0.1.4"
version = "0.1.5"
dependencies = [
"gitcomet-core",
"gix",
@ -2285,7 +2285,7 @@ dependencies = [
[[package]]
name = "gitcomet-state"
version = "0.1.4"
version = "0.1.5"
dependencies = [
"gitcomet-core",
"gix",
@ -2299,14 +2299,14 @@ dependencies = [
[[package]]
name = "gitcomet-ui"
version = "0.1.4"
version = "0.1.5"
dependencies = [
"gitcomet-core",
]
[[package]]
name = "gitcomet-ui-gpui"
version = "0.1.4"
version = "0.1.5"
dependencies = [
"criterion",
"gitcomet-core",

View file

@ -21,7 +21,7 @@ default-members = [
]
[workspace.package]
version = "0.1.4"
version = "0.1.5"
edition = "2024"
license = "AGPL-3.0-only"
authors = ["AutoExplore Oy <info@autoexplore.ai>"]

View file

@ -428,14 +428,15 @@ impl GixRepo {
fn push_force_with_optional_output_impl(&self, capture_output: bool) -> Result<CommandOutput> {
if let Some(branch) = self.current_branch_name()?
&& let Some(upstream) = self.branch_upstream(&branch)? {
return self.push_head_to_branch_with_optional_output_impl(
&upstream.remote,
&upstream.branch,
true,
capture_output,
);
}
&& let Some(upstream) = self.branch_upstream(&branch)?
{
return self.push_head_to_branch_with_optional_output_impl(
&upstream.remote,
&upstream.branch,
true,
capture_output,
);
}
let mut cmd = self.git_workdir_cmd();
cmd.arg("push").arg("--force-with-lease");