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`

2 files changed, 2 insertions, 2 deletions

diff --git a/Library/Homebrew/extend/ARGV.rb b/Library/Homebrew/extend/ARGV.rb
index 2da6141c7..4a497957b 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 20f115f13..f7a4be817 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