Commit 0b19a004 authored by Jon Sorrells's avatar Jon Sorrells

Prevent passing empty string to git when running pod repo update --silent

parent 4e212684
...@@ -12,6 +12,10 @@ To install release candidates run `[sudo] gem install cocoapods --pre` ...@@ -12,6 +12,10 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
##### Bug Fixes ##### Bug Fixes
* Prevent passing empty string to git when running `pod repo update --silent`
[Jon Sorrells](https://github.com/jonsorrells)
[#7176](https://github.com/CocoaPods/CocoaPods/issues/7176)
* Do not propagate test spec frameworks and libraries into pod target xcconfig * Do not propagate test spec frameworks and libraries into pod target xcconfig
[Dimitris Koutsogiorgas](https://github.com/dnkoutso) [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
[#7172](https://github.com/CocoaPods/CocoaPods/issues/7172) [#7172](https://github.com/CocoaPods/CocoaPods/issues/7172)
......
...@@ -104,7 +104,9 @@ module Pod ...@@ -104,7 +104,9 @@ module Pod
def update_git_repo(show_output = false) def update_git_repo(show_output = false)
Config.instance.with_changes(:verbose => show_output) do Config.instance.with_changes(:verbose => show_output) do
git!(%W(-C #{repo} fetch origin #{show_output ? '--progress' : ''})) args = %W(-C #{repo} fetch origin)
args.push('--progress') if show_output
git!(args)
current_branch = git!(%W(-C #{repo} rev-parse --abbrev-ref HEAD)).strip current_branch = git!(%W(-C #{repo} rev-parse --abbrev-ref HEAD)).strip
git!(%W(-C #{repo} reset --hard origin/#{current_branch})) git!(%W(-C #{repo} reset --hard origin/#{current_branch}))
end end
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment