Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix bump-formula-pr when working with a shallow git clone #2829

Merged
merged 3 commits into from Jul 1, 2017
Merged

Fix bump-formula-pr when working with a shallow git clone #2829

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b3ef9cc
Fix `bump-formula-pr` when working with a shallow git clone
mislav Jun 27, 2017
3701b11
Fix unshallowing taps in `bump-formula-pr`
mislav Jun 27, 2017
f8ec233
Strip trailing newline
mislav Jun 29, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions Library/Homebrew/dev-cmd/bump-formula-pr.rb
View file
Open in desktop
Expand Up @@ -286,7 +286,11 @@ def bump_formula_pr

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"
Expand All @@ -296,6 +300,7 @@ def bump_formula_pr
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}",
Expand Down