Merge pull request #731 from ldennington/ignore-homebrew-git

Ignore Homebrew Git shim

Author: ldennington

src/osx/Installer.Mac/uninstall.sh

@@ -12,7 +12,7 @@ fi
 
 # Unconfigure (as the current user)
 echo "Unconfiguring credential helper..."
-sudo -u `/usr/bin/logname` "$GCMBIN" unconfigure
+sudo -u `/usr/bin/logname` -E "$GCMBIN" unconfigure
 
 # Remove symlink
 if [ -L /usr/local/bin/git-credential-manager-core ]

src/shared/Core.Tests/EnvironmentTests.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using GitCredentialManager.Interop.Posix;
 using GitCredentialManager.Interop.Windows;
 using GitCredentialManager.Tests.Objects;
@@ -123,5 +124,31 @@ public void PosixEnvironment_TryLocateExecutable_ExistsMultiple_ReturnTrueAndFir
             Assert.True(actualResult);
             Assert.Equal(expectedPath, actualPath);
         }
+
+        [PlatformFact(Platforms.MacOS)]
+        public void MacOSEnvironment_TryLocateExecutable_Paths_Are_Ignored()
+        {
+            List<string> pathsToIgnore = new List<string>()
+            {
+                "/home/john.doe/bin/foo"
+            };
+            string expectedPath = "/usr/local/bin/foo";
+
+            var fs = new TestFileSystem
+            {
+                Files = new Dictionary<string, byte[]>
+                {
+                    [pathsToIgnore.FirstOrDefault()] = Array.Empty<byte>(),
+                    [expectedPath] = Array.Empty<byte>(),
+                }
+            };
+            var envars = new Dictionary<string, string> {["PATH"] = PosixPathVar};
+            var env = new PosixEnvironment(fs, envars);
+
+            bool actualResult = env.TryLocateExecutable(PosixExecName, pathsToIgnore, out string actualPath);
+
+            Assert.True(actualResult);
+            Assert.Equal(expectedPath, actualPath);
+        }
     }
 }

src/shared/Core/CommandContext.cs

@@ -107,7 +107,7 @@ public CommandContext(string appPath)
                 FileSystem        = new MacOSFileSystem();
                 SessionManager    = new MacOSSessionManager();
                 SystemPrompts     = new MacOSSystemPrompts();
-                Environment       = new PosixEnvironment(FileSystem);
+                Environment       = new MacOSEnvironment(FileSystem);
                 Terminal          = new MacOSTerminal(Trace);
                 string gitPath    = GetGitPath(Environment, FileSystem, Trace);
                 Git               = new GitProcess(

src/shared/Core/EnvironmentBase.cs

@@ -104,7 +104,12 @@ public virtual Process CreateProcess(string path, string args, bool useShellExec
             return new Process { StartInfo = psi };
         }
 
-        public bool TryLocateExecutable(string program, out string path)
+        public virtual bool TryLocateExecutable(string program, out string path)
+        {
+            return TryLocateExecutable(program, null, out path);
+        }
+
+        internal virtual bool TryLocateExecutable(string program, ICollection<string> pathsToIgnore, out string path)
         {
             // On UNIX-like systems we would normally use the "which" utility to locate a program,
             // but since distributions don't always place "which" in a consistent location we cannot
@@ -124,7 +129,8 @@ public bool TryLocateExecutable(string program, out string path)
                 foreach (var basePath in paths)
                 {
                     string candidatePath = Path.Combine(basePath, program);
-                    if (FileSystem.FileExists(candidatePath))
+                    if (FileSystem.FileExists(candidatePath) && (pathsToIgnore is null ||
+                        !pathsToIgnore.Contains(candidatePath, StringComparer.OrdinalIgnoreCase)))
                     {
                         path = candidatePath;
                         return true;

src/shared/Core/Interop/MacOS/MacOSEnvironment.cs

@@ -0,0 +1,38 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Threading;
+using GitCredentialManager.Interop.Posix;
+
+namespace GitCredentialManager.Interop.MacOS
+{
+    public class MacOSEnvironment : PosixEnvironment
+    {
+        private ICollection<string> _pathsToIgnore;
+
+        public MacOSEnvironment(IFileSystem fileSystem)
+            : base(fileSystem) { }
+
+        internal MacOSEnvironment(IFileSystem fileSystem, IReadOnlyDictionary<string, string> variables)
+            : base(fileSystem)
+        {
+            EnsureArgument.NotNull(variables, nameof(variables));
+            Variables = variables;
+        }
+
+        public override bool TryLocateExecutable(string program, out string path)
+        {
+            if (_pathsToIgnore is null)
+            {
+                _pathsToIgnore = new List<string>();
+                if (Variables.TryGetValue("HOMEBREW_PREFIX", out string homebrewPrefix))
+                {
+                    string homebrewGit = Path.Combine(homebrewPrefix, "Homebrew/Library/Homebrew/shims/shared/git");
+                    _pathsToIgnore.Add(homebrewGit);
+                }
+            }
+            return TryLocateExecutable(program, _pathsToIgnore, out path);
+        }
+    }
+}