From 63c563f97074bdfb2ef8bf5388b216d137087c3c Mon Sep 17 00:00:00 2001 From: Uladzislau Shablinski Date: Sat, 6 Aug 2016 11:22:12 +0300 Subject: [PATCH] Fix update commit for non-HEAD kegs with head spec (#644) If we try to call `Formulary.from_keg(f, :head)` on the keg that is not HEAD-keg itself, we don't need to update commit of returned formula and should use just HEAD version with nil commit. Same is true for `ARGV.resolved_formulae` --- Library/Homebrew/extend/ARGV.rb | 2 +- Library/Homebrew/formulary.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/extend/ARGV.rb b/Library/Homebrew/extend/ARGV.rb index 2da6141c79..4a497957b3 100644 --- a/Library/Homebrew/extend/ARGV.rb +++ b/Library/Homebrew/extend/ARGV.rb @@ -34,7 +34,7 @@ module HomebrewArgvExtension f.build = tab if f.head? && tab.tabfile k = Keg.new(tab.tabfile.parent) - f.version.update_commit(k.version.version.commit) + f.version.update_commit(k.version.version.commit) if k.version.head? end end f diff --git a/Library/Homebrew/formulary.rb b/Library/Homebrew/formulary.rb index 20f115f139..f7a4be817f 100644 --- a/Library/Homebrew/formulary.rb +++ b/Library/Homebrew/formulary.rb @@ -246,7 +246,7 @@ class Formulary end end f.build = tab - f.version.update_commit(keg.version.version.commit) if f.head? + f.version.update_commit(keg.version.version.commit) if f.head? && keg.version.head? f end