Fix git alias

mroth · Jul 11, 2024 · 01664ca · 01664ca
1 parent 030a3f5
commit 01664ca
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/commands/inits/data/git_wrapper.ps1 b/commands/inits/data/git_wrapper.ps1
@@ -1,18 +1,15 @@
-Remove-Item alias:\git
-Remove-Item function:\git
-
 $SCMPUFF_GIT_CMD = Get-Command git | Select-Object -ExpandProperty Definition
 
 function git {
  switch -regex -casesensitive($args[0]) {
  "^(commit|blame|log|rebase|merge)$" {
- & scmpuff expand -- $SCMPUFF_GIT_CMD $args
+ & scmpuff exec -- $SCMPUFF_GIT_CMD $args
  }
  "^(checkout|diff|rm|reset)$" {
- & scmpuff expand --relative -- $SCMPUFF_GIT_CMD $args
+ & scmpuff exec --relative -- $SCMPUFF_GIT_CMD $args
  }
  "^add$" {
- & scmpuff expand -- $SCMPUFF_GIT_CMD $args
+ & scmpuff exec -- $SCMPUFF_GIT_CMD $args
  scmpuff_status
  }
  default {

diff --git a/commands/inits/scripts.go b/commands/inits/scripts.go
@@ -17,6 +17,9 @@ var scriptStatusShortcutsPwsh string
 //go:embed data/aliases.sh
 var scriptAliases string
 
+//go:embed data/aliases.ps1
+var scriptAliasesPwsh string
+
 //go:embed data/git_wrapper.sh
 var scriptGitWrapper string
 
@@ -47,7 +50,7 @@ var fishCollection = scriptCollection{
 var pwshCollection = scriptCollection{
  statusShortcuts: scriptStatusShortcutsPwsh,
  gitWrapper: scriptGitWrapperPwsh,
- aliases: scriptAliases,
+ aliases: scriptAliasesPwsh,
 }
 
 func (sc scriptCollection) Output(wrapGit, aliases bool) string {