Update commit when resolving the formula (Homebrew#536)

jcap · Jul 17, 2016 · 092d471 · 092d471
1 parent 2633f88
commit 092d471
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 2 deletions.
diff --git a/Library/Homebrew/extend/ARGV.rb b/Library/Homebrew/extend/ARGV.rb
@@ -32,6 +32,10 @@ def resolved_formulae
           resolved_spec = spec(nil) || tab.spec
           f.set_active_spec(resolved_spec) if f.send(resolved_spec)
           f.build = tab
+          if f.head? && tab.tabfile
+            k = Keg.new(tab.tabfile.parent)
+            f.version.update_commit(k.version.version.commit)
+          end
         end
         f
       else

diff --git a/Library/Homebrew/formulary.rb b/Library/Homebrew/formulary.rb
@@ -246,6 +246,7 @@ def self.from_keg(keg, spec = nil)
       end
     end
     f.build = tab
+    f.version.update_commit(keg.version.version.commit) if f.head?
     f
   end
 

diff --git a/Library/Homebrew/postinstall.rb b/Library/Homebrew/postinstall.rb
@@ -11,7 +11,7 @@
 
   trap("INT", old_trap)
 
-  formula = ARGV.formulae.first
+  formula = ARGV.resolved_formulae.first
   formula.extend(Debrew::Formula) if ARGV.debug?
   formula.run_post_install
 rescue Exception => e

diff --git a/Library/Homebrew/test.rb b/Library/Homebrew/test.rb
@@ -19,7 +19,7 @@
 
   trap("INT", old_trap)
 
-  formula = ARGV.formulae.first
+  formula = ARGV.resolved_formulae.first
   formula.extend(Homebrew::Assertions)
   formula.extend(Debrew::Formula) if ARGV.debug?
-Original file line number
+Diff line change
@@ Expand Up / @@ -246,6 +246,7 @@ def self.from_keg(keg, spec = nil) @@
           end
         end
         f.build = tab
+        f.version.update_commit(keg.version.version.commit) if f.head?
         f
       end
@@ Expand Down @@