Dump CI & lint checks & precommit hook & resolve #4, #3, #2

Author: PhysShell

.gitattributes

@@ -1,6 +1,11 @@
 # Default: keep text normalized in repo
 * text=auto
 
+# Repo metadata/config files should stay LF
+.gitattributes text eol=lf
+.gitignore text eol=lf
+.editorconfig text eol=lf
+
 # PowerShell scripts: use CRLF in working tree on Windows
 *.ps1  text eol=crlf
 *.psm1 text eol=crlf
@@ -20,3 +25,6 @@
 *.zip  binary
 *.exe  binary
 *.dll  binary
+
+# Git hooks should stay LF for sh compatibility
+tools/hooks/* text eol=lf

.github/workflows/ci.yml

@@ -0,0 +1,48 @@
+name: CI
+
+on:
+  pull_request:
+  push:
+
+jobs:
+  windows:
+    name: ${{ matrix.label }}
+    runs-on: windows-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - label: Windows PowerShell 5.1
+            shell: powershell
+          - label: PowerShell 7
+            shell: pwsh
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Show PowerShell Version
+        shell: ${{ matrix.shell }}
+        run: |
+          $PSVersionTable.PSVersion.ToString()
+
+      - name: Install Dependencies
+        shell: ${{ matrix.shell }}
+        run: |
+          if ($PSVersionTable.PSEdition -eq 'Desktop') {
+            [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+            $userModules = Join-Path $HOME 'Documents\WindowsPowerShell\Modules'
+          } else {
+            $userModules = Join-Path $HOME 'Documents/PowerShell/Modules'
+          }
+          if ($env:PSModulePath -notlike "*$userModules*") {
+            $env:PSModulePath = "$userModules;$env:PSModulePath"
+          }
+          Set-PSRepository PSGallery -InstallationPolicy Trusted
+          Install-Module PSScriptAnalyzer -Scope CurrentUser -Force -AllowClobber
+          Install-Module Pester -Scope CurrentUser -Force -SkipPublisherCheck
+
+      - name: Run Lint and Tests
+        shell: ${{ matrix.shell }}
+        run: |
+          ./tools/ci.ps1

.gitignore

@@ -1,2 +1,8 @@
 private.ps1
 
+TestResults.xml
+
+# generated patches
+*.patch
+*.mbox
+patches/

PSScriptAnalyzerSettings.psd1

@@ -0,0 +1,24 @@
+@{
+    Severity = @('Error', 'Warning')
+    ExcludeRules = @(
+        'PSAvoidUsingWriteHost',
+        'PSUseApprovedVerbs',
+        'PSUseSingularNouns',
+        'PSUseConsistentWhitespace',
+        'PSUseConsistentIndentation'
+    )
+    Rules = @{
+        PSUseConsistentWhitespace = @{
+            Enable = $true
+        }
+        PSUseConsistentIndentation = @{
+            Enable = $true
+            IndentationSize = 4
+            PipelineIndentation = 'IncreaseIndentationForFirstPipeline'
+        }
+        PSAvoidUsingCmdletAliases = @{
+            Enable = $true
+            Whitelist = @()
+        }
+    }
+}

README.md

@@ -1,9 +1,49 @@
 # dotfiles
 
-To install put following content in $PROFILE.CurrentUserAllHosts:
+## Profile installation
+
+Put this in `$PROFILE.CurrentUserAllHosts`:
 
 ```powershell
 # Microsoft.PowerShell_profile.ps1 (CurrentUserAllHosts)
 $dot = Join-Path $HOME 'dotfiles\profile.ps1'
 if (Test-Path $dot) { . $dot }
 ```
+
+## Quality checks
+
+Run both lint and tests:
+
+```powershell
+.\tools\ci.ps1
+```
+
+Run only lint:
+
+```powershell
+.\tools\ci.ps1 -LintOnly
+```
+
+Run only tests:
+
+```powershell
+.\tools\ci.ps1 -TestOnly
+```
+
+## Pre-commit hook
+
+Install local git hook:
+
+```powershell
+.\tools\install-hooks.ps1
+```
+
+The hook runs `tools/ci.ps1` before every commit.
+
+## What CI checks
+
+- `PSScriptAnalyzer` linting with `PSScriptAnalyzerSettings.psd1`
+- `Pester` tests in `tests\`
+- GitHub Actions matrix on:
+  - Windows PowerShell 5.1
+  - PowerShell 7

bootstrap.ps1

@@ -3,11 +3,25 @@ function Ensure-Module($name, [Version]$min = $null) {
   if (-not $ok) { Install-Module $name -Scope CurrentUser -Force -AllowClobber -SkipPublisherCheck }
 }
 
+function Ensure-GitGlobalConfig([string]$Key, [string]$Value) {
+  $current = git config --global --get $Key 2>$null
+  if ($current -ne $Value) {
+    git config --global $Key $Value
+  }
+}
+
 # PSReadLine is required for Windows PowerShell 5.1; it's already built into PowerShell Core (pwsh)
 if ($PSVersionTable.PSEdition -ne 'Core') { Ensure-Module PSReadLine ([Version]'2.2.6') }
 
 Ensure-Module posh-git
 Ensure-Module git-aliases
 
+# Git push defaults:
+# - first push of a new branch auto-creates upstream tracking
+# - default push target is the current branch to origin
+Ensure-GitGlobalConfig 'push.autoSetupRemote' 'true'
+Ensure-GitGlobalConfig 'push.default' 'current'
+Ensure-GitGlobalConfig 'remote.pushDefault' 'origin'
+
 Write-Host "Bootstrap done. Restart PowerShell."
 

modules/GitAliases.Extras/GitAliases.Extras.psd1

@@ -0,0 +1,47 @@
+@{
+    RootModule = 'GitAliases.Extras.psm1'
+    ModuleVersion = '0.1.0'
+    GUID = 'a5c2859e-7dce-4853-9db5-8cb7927dbdda'
+    Author = 'PhysShell'
+    CompanyName = ''
+    Copyright = ''
+    Description = 'Custom git aliases and tab completion helpers for PowerShell on top of posh-git'
+    PowerShellVersion = '5.1'
+    CompatiblePSEditions = @('Desktop', 'Core')
+    FunctionsToExport = @(
+        'Test-InGitRepo',
+        'Test-GitInProgress',
+        'Test-WorkingTreeClean',
+        'Get-CurrentBranch',
+        'Test-GitRefExists',
+        'UpMerge',
+        'UpRebase',
+        'gapt',
+        'gcor',
+        'gdct',
+        'gdt',
+        'gdnolock',
+        'gdv',
+        'gfo',
+        'glp',
+        'gmtl',
+        'gmtlvim',
+        'gtv',
+        'gtl',
+        'gwip',
+        'gunwip',
+        'grsh',
+        'gccd',
+        'grl',
+        'ghash',
+        'gfp',
+        'gsw',
+        'gswc',
+        'Register-GitAliasCompletion'
+    )
+    AliasesToExport = @(
+        'gum',
+        'gur',
+        'gh'
+    )
+}

modules/GitAliases.Extras/GitAliases.Extras.psm1

@@ -56,6 +56,20 @@ function Test-GitRefExists {
     return ($LASTEXITCODE -eq 0)
 }
 
+function Convert-ToPowerShellBranchCompletionText {
+    param(
+        [Parameter(Mandatory = $true)]
+        [string]$BranchName
+    )
+
+    if ($BranchName.StartsWith('#')) {
+        $escaped = $BranchName -replace "'", "''"
+        return "'$escaped'"
+    }
+
+    return $BranchName
+}
+
 
 # --- Custom Git Command Functions ---
 function UpMerge {
@@ -156,6 +170,81 @@ function ghash {
     }
 }
 
+function gfp {
+    [CmdletBinding()]
+    param(
+        [Parameter(Position = 0)]
+        [string]$TargetBranch,
+        [Parameter(Position = 1)]
+        [string]$OutputFile = 'series.mbox'
+    )
+
+    if (-not (Test-InGitRepo)) {
+        throw "Not a git repository."
+    }
+
+    $defaultRemote = git config --get checkout.defaultRemote 2>$null
+    if (-not $defaultRemote) { $defaultRemote = 'origin' }
+
+    if (-not $TargetBranch) {
+        if (Test-GitRefExists "refs/remotes/$defaultRemote/main") {
+            $TargetBranch = 'main'
+        } elseif (Test-GitRefExists "refs/remotes/$defaultRemote/master") {
+            $TargetBranch = 'master'
+        } else {
+            $remoteHead = git symbolic-ref --quiet "refs/remotes/$defaultRemote/HEAD" 2>$null
+            if ($LASTEXITCODE -eq 0 -and $remoteHead) {
+                $prefix = "refs/remotes/$defaultRemote/"
+                if ($remoteHead.StartsWith($prefix)) {
+                    $TargetBranch = $remoteHead.Substring($prefix.Length).Trim()
+                }
+            }
+        }
+
+        if (-not $TargetBranch) { $TargetBranch = 'main' }
+    }
+
+    $range = "$defaultRemote/$TargetBranch..HEAD"
+    $resolvedOutput = if ([IO.Path]::IsPathRooted($OutputFile)) {
+        $OutputFile
+    } else {
+        Join-Path (Get-Location) $OutputFile
+    }
+
+    $outputDir = Split-Path -Parent $resolvedOutput
+    if ($outputDir -and -not (Test-Path $outputDir)) {
+        New-Item -ItemType Directory -Path $outputDir -Force | Out-Null
+    }
+
+    $stderrFile = [IO.Path]::GetTempFileName()
+    try {
+        $process = Start-Process -FilePath 'git' `
+            -ArgumentList @('format-patch', '--cover-letter', '--stat', '--stdout', $range) `
+            -NoNewWindow `
+            -PassThru `
+            -Wait `
+            -RedirectStandardOutput $resolvedOutput `
+            -RedirectStandardError $stderrFile
+
+        $stderrText = Get-Content -LiteralPath $stderrFile -Raw -ErrorAction SilentlyContinue
+        if ($stderrText) {
+            $stderrText = $stderrText.Trim()
+            if ($stderrText) {
+                Write-Host $stderrText
+            }
+        }
+
+        if ($process.ExitCode -ne 0) {
+            Remove-Item -LiteralPath $resolvedOutput -Force -ErrorAction SilentlyContinue
+            throw "git format-patch failed for '$range' (exit code: $($process.ExitCode))."
+        }
+
+        return $resolvedOutput
+    } finally {
+        Remove-Item -LiteralPath $stderrFile -Force -ErrorAction SilentlyContinue
+    }
+}
+
 function gsw {
     [CmdletBinding()]
     param(
@@ -224,8 +313,12 @@ function Register-GitAliasCompletion {
         }
     }
 
-    # Add your custom aliases from this module
-    Get-Command -Module GitAliases.Extras -CommandType Function | ForEach-Object {
+    # Add custom aliases from this module without module-name lookups
+    # to avoid self-import recursion during module initialization.
+    $moduleName = $ExecutionContext.SessionState.Module.Name
+    Get-Command -CommandType Function |
+    Where-Object { $_.ModuleName -eq $moduleName } |
+    ForEach-Object {
         $func = $_
         $definition = $func.ScriptBlock.ToString()
         if ($definition -match $aliasRegex) {
@@ -257,11 +350,32 @@ function Register-GitAliasCompletion {
         $gitLine = $line -replace "^$commandName", "git $subCommand"
         $offset = ("git $subCommand").Length - $commandName.Length
         $gitCursorPosition = $cursorPosition + $offset
+        if ($gitCursorPosition -lt 0) { $gitCursorPosition = 0 }
+        if ($gitCursorPosition -gt $gitLine.Length) { $gitCursorPosition = $gitLine.Length }
 
         # Use posh-git's official completion function
         if (Get-Command GitTabExpansion -ErrorAction SilentlyContinue) {
             try {
-                return GitTabExpansion $gitLine $gitCursorPosition
+                $results = GitTabExpansion $gitLine $gitCursorPosition
+                if ($subCommand -in @('checkout', 'switch', 'merge', 'rebase', 'branch', 'reset', 'revert')) {
+                    return $results | ForEach-Object {
+                        if ($null -eq $_) { return }
+                        $completionText = $_.CompletionText
+                        if ($completionText -is [string] -and $completionText.StartsWith('#')) {
+                            $safeText = Convert-ToPowerShellBranchCompletionText -BranchName $completionText
+                            return [System.Management.Automation.CompletionResult]::new(
+                                $safeText,
+                                $_.ListItemText,
+                                $_.ResultType,
+                                $_.ToolTip
+                            )
+                        }
+
+                        return $_
+                    }
+                }
+
+                return $results
             } catch {
                 Write-Warning "posh-git's GitTabExpansion failed for alias '$commandName'."
             }
@@ -276,10 +390,14 @@ function Register-GitAliasCompletion {
                             Where-Object { $_ -like "$wordToComplete*" }
                 if ($branches) {
                     return $branches | ForEach-Object {
-                        [System.Management.Automation.CompletionResult]::new($_, $_, 'ParameterValue', $_)
+                        $branchName = $_
+                        $safeText = Convert-ToPowerShellBranchCompletionText -BranchName $branchName
+                        [System.Management.Automation.CompletionResult]::new($safeText, $branchName, 'ParameterValue', $branchName)
                     }
                 }
-            } catch {}
+            } catch {
+                return @()
+            }
         }
 
         # Return nothing if no completions are found