forked from fleschutz/PowerShell
-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy pathpick-commit.ps1
More file actions
executable file
·81 lines (67 loc) · 2.89 KB
/
pick-commit.ps1
File metadata and controls
executable file
·81 lines (67 loc) · 2.89 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
<#
.SYNOPSIS
Cherry-picks a Git commit into one or more branches
.DESCRIPTION
Cherry-picks a Git commit into one or more branches (branch names need to be separated by spaces)
NOTE: in case of merge conflicts the script stops immediately!
.PARAMETER CommitID
Specifies the commit ID
.PARAMETER CommitMessage
Specifies the commit message to use
.PARAMETER Branches
Specifies the list of branches, separated by spaces
.PARAMETER RepoDir
Specifies the path to the Git repository
.EXAMPLE
PS> ./pick-commit 93849f889 "Fix typo" "v1 v2 v3"
.LINK
https://github.com/fleschutz/PowerShell
.NOTES
Author: Markus Fleschutz | License: CC0
#>
param([string]$CommitID = "", [string]$CommitMessage = "", [string]$Branches = "", [string]$RepoDir = "$PWD")
try {
if (-not(Test-Path "$RepoDir" -pathType container)) { throw "Can't access directory: $RepoDir" }
Set-Location "$RepoDir"
if ($CommitID -eq "") { $CommitID = read-host "Enter the Git commit id to cherry-pick" }
if ($CommitMessage -eq "") { $CommitMessage = read-host "Enter the commit message to use" }
if ($Branches -eq "") { $Branches = read-host "Enter the branches (separated by spaces)" }
$StopWatch = [system.diagnostics.stopwatch]::startNew()
$BranchArray = $Branches.Split(" ")
$NumBranches = $BranchArray.Count
foreach($Branch in $BranchArray) {
"🍒 Switching to branch $Branch ..."
& git checkout --recurse-submodules --force $Branch
if ($lastExitCode -ne 0) { throw "'git checkout $Branch' failed" }
"🍒 Updating submodules..."
& git submodule update --init --recursive
if ($lastExitCode -ne 0) { throw "'git submodule update' failed" }
"🍒 Cleaning the repository from untracked files..."
& git clean -fdx -f
if ($lastExitCode -ne 0) { throw "'git clean -fdx -f' failed" }
& git submodule foreach --recursive git clean -fdx -f
if ($lastExitCode -ne 0) { throw "'git clean -fdx -f' in submodules failed" }
"🍒 Pulling latest updates..."
& git pull --recurse-submodules
if ($lastExitCode -ne 0) { throw "'git pull' failed" }
"🍒 Checking the status..."
$Result = (git status)
if ($lastExitCode -ne 0) { throw "'git status' failed" }
if ("$Result" -notmatch "nothing to commit, working tree clean") { throw "Branch is NOT clean: $Result" }
"🍒 Cherry picking..."
& git cherry-pick --no-commit "$CommitID"
if ($lastExitCode -ne 0) { throw "'git cherry-pick $CommitID' failed" }
"🍒 Committing..."
& git commit -m "$CommitMessage"
if ($lastExitCode -ne 0) { throw "'git commit' failed" }
"🍒 Pushing..."
& git push
if ($lastExitCode -ne 0) { throw "'git push' failed" }
}
[int]$Elapsed = $StopWatch.Elapsed.TotalSeconds
"✅ cherry picked $CommitID into $NumBranches branches in $Elapsed sec"
exit 0 # success
} catch {
"⚠️ Error in line $($_.InvocationInfo.ScriptLineNumber): $($Error[0])"
exit 1
}