diff options
| author | ilovezfs | 2017-07-01 09:15:07 -0700 |
|---|---|---|
| committer | GitHub | 2017-07-01 09:15:07 -0700 |
| commit | a94a9382858d05b697599b9ec948c0b016bf4b6f (patch) | |
| tree | 580feae375879c1a4f4f6a0819bc8df869dd6f67 /Library/Homebrew/dev-cmd | |
| parent | fd5e673d2d367eff03f1411d909ca0bbb2003a2c (diff) | |
| parent | f8ec2332a214ac9a59a91a49f6b0ef72eac5ff6f (diff) | |
| download | brew-a94a9382858d05b697599b9ec948c0b016bf4b6f.tar.bz2 | |
Merge pull request #2829 from mislav/bump-formula-pr-unshallow
Fix `bump-formula-pr` when working with a shallow git clone
Diffstat (limited to 'Library/Homebrew/dev-cmd')
| -rw-r--r-- | Library/Homebrew/dev-cmd/bump-formula-pr.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Library/Homebrew/dev-cmd/bump-formula-pr.rb b/Library/Homebrew/dev-cmd/bump-formula-pr.rb index 586eec47c..1c56749a3 100644 --- a/Library/Homebrew/dev-cmd/bump-formula-pr.rb +++ b/Library/Homebrew/dev-cmd/bump-formula-pr.rb @@ -286,7 +286,11 @@ module Homebrew formula.path.parent.cd do branch = "#{formula.name}-#{new_formula_version}" + git_dir = Utils.popen_read("git rev-parse --git-dir").chomp + shallow = !git_dir.empty? && File.exist?("#{git_dir}/shallow") + if ARGV.dry_run? + ohai "git fetch --unshallow origin" if shallow ohai "git checkout --no-track -b #{branch} origin/master" ohai "git commit --no-edit --verbose --message='#{formula.name} #{new_formula_version}#{devel_message}' -- #{formula.path}" ohai "hub fork --no-remote" @@ -296,6 +300,7 @@ module Homebrew ohai "hub pull-request --browse -m '#{formula.name} #{new_formula_version}#{devel_message}'" ohai "git checkout -" else + safe_system "git", "fetch", "--unshallow", "origin" if shallow safe_system "git", "checkout", "--no-track", "-b", branch, "origin/master" safe_system "git", "commit", "--no-edit", "--verbose", "--message=#{formula.name} #{new_formula_version}#{devel_message}", |