From d91036e8912b31e3eb145b1cb3964a321a587c4f Mon Sep 17 00:00:00 2001
From: mansimarkaur
Date: Fri, 28 Jul 2017 00:37:32 +0530
Subject: Added tests for last_revision_commit_of_file

---
 Library/Homebrew/utils/git.rb | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'Library/Homebrew/utils')

diff --git a/Library/Homebrew/utils/git.rb b/Library/Homebrew/utils/git.rb
index 43d93b64e..3668b9d11 100644
--- a/Library/Homebrew/utils/git.rb
+++ b/Library/Homebrew/utils/git.rb
@@ -4,7 +4,7 @@ module Git
   module_function
 
   def last_revision_commit_of_file(repo, file, before_commit: nil)
-    args = [before_commit.nil? ? "--skip=1" : before_commit.split("..").first]
+    args = ["--skip=#{before_commit.nil? ? 1 : before_commit.split("..").first}"]
 
     out, = Open3.capture3(
       HOMEBREW_SHIMS_PATH/"scm/git", "-C", repo,
@@ -16,11 +16,10 @@ module Git
   def last_revision_of_file(repo, file, before_commit: nil)
     relative_file = Pathname(file).relative_path_from(repo)
 
-    commit_hash = last_revision_commit_of_file(repo, file, before_commit: before_commit)
-
+    commit_hash = last_revision_commit_of_file(repo, relative_file, before_commit: before_commit)
     out, = Open3.capture3(
       HOMEBREW_SHIMS_PATH/"scm/git", "-C", repo,
-      "show", "#{commit_hash}:#{relative_file}"
+      "show", "#{commit_hash}:#{file}"
     )
     out
   end
@@ -28,8 +27,7 @@ end
 
 module Utils
   def self.git_available?
-    return @git if instance_variable_defined?(:@git)
-    @git = quiet_system HOMEBREW_SHIMS_PATH/"scm/git", "--version"
+    @git ||= quiet_system HOMEBREW_SHIMS_PATH/"scm/git", "--version"
   end
 
   def self.git_path
-- 
cgit v1.2.3


From 657b6ef7fb67231540bac9bcf4126ec27e8e1841 Mon Sep 17 00:00:00 2001
From: mansimarkaur
Date: Fri, 28 Jul 2017 02:02:40 +0530
Subject: Added tests for git_available?

---
 Library/Homebrew/utils/git.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'Library/Homebrew/utils')

diff --git a/Library/Homebrew/utils/git.rb b/Library/Homebrew/utils/git.rb
index 3668b9d11..1e2e360e6 100644
--- a/Library/Homebrew/utils/git.rb
+++ b/Library/Homebrew/utils/git.rb
@@ -27,7 +27,8 @@ end
 
 module Utils
   def self.git_available?
-    @git ||= quiet_system HOMEBREW_SHIMS_PATH/"scm/git", "--version"
+    return @git if instance_variable_defined?(:@git)
+    @git = quiet_system HOMEBREW_SHIMS_PATH/"scm/git", "--version"
   end
 
   def self.git_path
-- 
cgit v1.2.3


From 372a42230510d24e539f2763ed148f7ba3ae7991 Mon Sep 17 00:00:00 2001
From: mansimarkaur
Date: Sat, 12 Aug 2017 02:33:48 +0530
Subject: Added tests for ensure_git_installed when git is available or
 homebrew/core is unavailable

---
 Library/Homebrew/utils/git.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Library/Homebrew/utils')

diff --git a/Library/Homebrew/utils/git.rb b/Library/Homebrew/utils/git.rb
index 1e2e360e6..852192945 100644
--- a/Library/Homebrew/utils/git.rb
+++ b/Library/Homebrew/utils/git.rb
@@ -4,7 +4,7 @@ module Git
   module_function
 
   def last_revision_commit_of_file(repo, file, before_commit: nil)
-    args = ["--skip=#{before_commit.nil? ? 1 : before_commit.split("..").first}"]
+    args = [before_commit.nil? ? "--skip=1" : before_commit.split("..").first]
 
     out, = Open3.capture3(
       HOMEBREW_SHIMS_PATH/"scm/git", "-C", repo,
-- 
cgit v1.2.3


From c695dffd373aefaaa84f1cf1098d23bd9f1d998d Mon Sep 17 00:00:00 2001
From: mansimarkaur
Date: Fri, 25 Aug 2017 17:19:34 +0530
Subject: Added clear git version cache method

---
 Library/Homebrew/utils/git.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'Library/Homebrew/utils')

diff --git a/Library/Homebrew/utils/git.rb b/Library/Homebrew/utils/git.rb
index 852192945..4fdcf1a2e 100644
--- a/Library/Homebrew/utils/git.rb
+++ b/Library/Homebrew/utils/git.rb
@@ -19,13 +19,17 @@ module Git
     commit_hash = last_revision_commit_of_file(repo, relative_file, before_commit: before_commit)
     out, = Open3.capture3(
       HOMEBREW_SHIMS_PATH/"scm/git", "-C", repo,
-      "show", "#{commit_hash}:#{file}"
+      "show", "#{commit_hash}:#{relative_file}"
     )
     out
   end
 end
 
 module Utils
+  def self.clear_git_version_cache
+    remove_instance_variable(:@git) if instance_variable_defined?(:@git)
+  end
+
   def self.git_available?
     return @git if instance_variable_defined?(:@git)
     @git = quiet_system HOMEBREW_SHIMS_PATH/"scm/git", "--version"
-- 
cgit v1.2.3


From 784250d55099f16d8b9c3553a219d603c200cb6b Mon Sep 17 00:00:00 2001
From: mansimarkaur
Date: Fri, 25 Aug 2017 17:55:54 +0530
Subject: Used already existing clear_git_available_cache to remove @git

---
 Library/Homebrew/utils/git.rb | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'Library/Homebrew/utils')

diff --git a/Library/Homebrew/utils/git.rb b/Library/Homebrew/utils/git.rb
index 4fdcf1a2e..1fc01188c 100644
--- a/Library/Homebrew/utils/git.rb
+++ b/Library/Homebrew/utils/git.rb
@@ -26,10 +26,6 @@ module Git
 end
 
 module Utils
-  def self.clear_git_version_cache
-    remove_instance_variable(:@git) if instance_variable_defined?(:@git)
-  end
-
   def self.git_available?
     return @git if instance_variable_defined?(:@git)
     @git = quiet_system HOMEBREW_SHIMS_PATH/"scm/git", "--version"
-- 
cgit v1.2.3