Skip to content

Commit

Permalink
Merge pull request majkinetor#132 from dimqua/master
Browse files Browse the repository at this point in the history
Add branch name parameter
  • Loading branch information
majkinetor authored Mar 11, 2018
2 parents dde3fad + a78ba9e commit 9e6cfa5
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 3 deletions.
9 changes: 6 additions & 3 deletions AU/Plugins/Git.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,10 @@ param(
# atomic - 1 commit per package
# atomictag - 1 commit and tag per package
[ValidateSet('single', 'atomic', 'atomictag')]
[string]$commitStrategy = 'single'
[string]$commitStrategy = 'single',

# Branch name
[string]$Branch = 'master'
)

[array]$packages = if ($Force) { $Info.result.updated } else { $Info.result.pushed }
Expand All @@ -46,8 +49,8 @@ if ($User -and $Password) {
}

Write-Host "Executing git pull"
git checkout -q master
git pull -q origin master
git checkout -q $Branch
git pull -q origin $Branch


if ($commitStrategy -like 'atomic*') {
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# AU Project Changelog

## Next
- Git plugin: add `Branch` parameter to specify a branch name

## 2018.1.11
- `Update-AuPackage`
- New feature [streams](https://github.com/majkinetor/au#streams) that extends `au_GetLatest` with option to return multiple HashTables (one for each stream).
Expand Down

0 comments on commit 9e6cfa5

Please sign in to comment.