update gpf

codyduong · codyduong · commit e4e903f03b84 · 2024-12-07T03:20:33.000-06:00
- https://github.com/ohmyzsh/ohmyzsh/blob/69a6359f7cf8978d464573fb7b023ee3cd00181a/plugins/git/git.plugin.zsh#L305-L307 - Resolves #7
diff --git a/src/aliases.ps1 b/src/aliases.ps1
@@ -377,8 +377,11 @@ function gpd {
 	git push --dry-run $args
 }
 function gpf {
-	# todo --force-if-includes
-	git push --force-with-lease $args
+	if ([semver](Get-GitSemVer) -ge [semver]"2.30") {
+		git push --force-with-lease --force-if-includes $args
+	} else {
+		git push --force-with-lease $args
+	}
 }
 function gpf! {
 	git push --force $args

Original file line number	Diff line number	Diff line change
`@@ -377,8 +377,11 @@ function gpd {`
`377`	`377`	`git push --dry-run $args`
`378`	`378`	`}`
`379`	`379`	`function gpf {`
`380`		`- # todo --force-if-includes`
`381`		`- git push --force-with-lease $args`
	`380`	`+ if ([semver](Get-GitSemVer) -ge [semver]"2.30") {`
	`381`	`+ git push --force-with-lease --force-if-includes $args`
	`382`	`+ } else {`
	`383`	`+ git push --force-with-lease $args`
	`384`	`+ }`
`382`	`385`	`}`
`383`	`386`	`function gpf! {`
`384`	`387`	`git push --force $args`