extern/PowerShell
1
0
Fork 0
mirror of https://github.com/fleschutz/PowerShell.git synced 2025-07-11 01:45:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update cherry-picker.ps1

Browse Source
This commit is contained in:
Markus Fleschutz
2021-03-16 15:27:00 +01:00
parent 83aa3ab77f
commit 480dc16e64
3 changed files with 51 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Data/scripts.csv
View File

@ -8,6 +8,7 @@ check-swap-space.ps1, checks the swap space for free space left
check-symlinks.ps1, checks every symlink in the given directory tree
check-windows-system-files.ps1, checks the validity of the Windows system files
check-xml-file.ps1, checks the given XML file for validity
cherry-picker.ps1, cherry-picks a Git commit into multiple branches
clean-branch.ps1, cleans the current Git branch (including submodules) from generated files
clone-repos.ps1, clones well-known Git repositories
close-calculator.ps1, closes the calculator program gracefully

1 Script Description
8 check-symlinks.ps1 checks every symlink in the given directory tree
9 check-windows-system-files.ps1 checks the validity of the Windows system files
10 check-xml-file.ps1 checks the given XML file for validity
11 cherry-picker.ps1 cherry-picks a Git commit into multiple branches
12 clean-branch.ps1 cleans the current Git branch (including submodules) from generated files
13 clone-repos.ps1 clones well-known Git repositories
14 close-calculator.ps1 closes the calculator program gracefully

1
README.md
View File

@ -101,6 +101,7 @@ Collection of PowerShell Scripts
📝 Scripts for Git
-----------------
* [cherry-picker.ps1](Scripts/cherry-picker.ps1) - cherry-picks a Git commit into multiple branches
* [clean-branch.ps1](Scripts/clean-branch.ps1) - cleans the current Git branch (including submodules) from generated files
* [clone-repos.ps1](Scripts/clone-repos.ps1) - clones well-known Git repositories
* [configure-git.ps1](Scripts/configure-git.ps1) - sets up the Git user configuration

26
Scripts/cherry-picker.ps1
View File

@ -1,10 +1,25 @@
# Cherry-picks a commit ID from main branch to all the other branches
$CommitID = "1234"
$CommitMessage = "Update rules for .gitignore file (cherry-picked from main branch)"
$RepoDir = "D:\Repos\ufa"
$Branches = "attower_bugfix_14.43.x", "attower_bugfix_14.42.x", "attower_bugfix_14.41.x", "attower_bugfix_14.40.x", "attower_bugfix_14.39.x", "attower_bugfix_14.38.x", "attower_bugfix_14.37.x", "attower_bugfix_14.36.x", "attower_bugfix_14.35.x", "attower_bugfix_14.34.x", "attower_bugfix_14.33.x", "attower_bugfix_14.32.x", "attower_bugfix_14.31.x", "attower_bugfix_14.30.x", "attower_bugfix_14.29.x", "attower_bugfix_14.27.x", "attower_bugfix_14.26.x", "attower_bugfix_14.25.x", "attower_bugfix_14.24.x", "attower_bugfix_14.23.x", "attower_bugfix_14.22.x", "attower_bugfix_14.21.x", "attower_bugfix_14.20.x", "attower_bugfix_14.19.x", "attower_bugfix_14.18.x", "attower_bugfix_14.17.x", "attower_bugfix_14.16.x", "attower_bugfix_14.15.x", "attower_bugfix_14.13.x", "attower_bugfix_14.11.x", "attower_bugfix_14.10.x", "attower_bugfix_14.9.x", "attower_bugfix_14.8.x", "attower_bugfix_14.6.x", "attower_bugfix_14.5.x", "attower_bugfix_14.4.x"
#!/bin/powershell
<#
.SYNTAX ./cherry-picker.ps1 [<commit-id>] [<commit-message>] [<branches>] [<repo-dir>]
.DESCRIPTION cherry-picks a Git commit into multiple branches
.LINK https://github.com/fleschutz/PowerShell
.NOTES Author: Markus Fleschutz / License: CC0
#>
param($CommitID = "", $CommitMessage = "", $Branches = "", $RepoDir = "$PWD")
if ($CommitID -eq "" ) {
$CommitID = read-host "Enter the 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 target branches"
}
try {
if (-not(test-path "$RepoDir" -pathType container)) { throw "Can't access directory: $RepoDir" }
set-location "$RepoDir"
foreach($Branch in $Branches) {
@ -42,7 +57,6 @@ try {
& git push
if ($lastExitCode -ne "0") { throw "'git push' failed" }
}
"DONE."
exit 0
} catch {