Fixes #313 - disambiguates ref vs file

Author: eamodio

CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [Unreleased]
+### Fixed
+- Fixes [#313](https://github.com/eamodio/vscode-gitlens/issues/313) - Unable to show branch history for branch that matches file or folder name
+
 ## [8.2.2] - 2018-04-19
 ### Added
 - Adds an indicator to the *GitLens* explorer's branch history to mark the the tips of all branches

src/git/git.ts

@@ -413,7 +413,7 @@ export class Git {
                 params.push(options.ref);
             }
         }
-        return gitCommand({ cwd: repoPath }, ...params);
+        return gitCommand({ cwd: repoPath }, ...params, '--');
     }
 
     static log_file(repoPath: string, fileName: string, options: { maxCount?: number, ref?: string, renames?: boolean, reverse?: boolean, startLine?: number, endLine?: number } = { renames: true, reverse: false }) {
@@ -441,9 +441,7 @@ export class Git {
             params.push(`-L ${options.startLine},${options.endLine}:${file}`);
         }
 
-        params.push('--', file);
-
-        return gitCommand({ cwd: root }, ...params);
+        return gitCommand({ cwd: root }, ...params, '--', file);
     }
 
     static async log_recent(repoPath: string, fileName: string) {
@@ -480,7 +478,7 @@ export class Git {
         if (options.ref && !Git.isStagedUncommitted(options.ref)) {
             params.push(options.ref);
         }
-        return gitCommand({ cwd: repoPath }, ...params);
+        return gitCommand({ cwd: repoPath }, ...params, '--');
     }
 
     static async ls_files(repoPath: string, fileName: string, options: { ref?: string } = {}): Promise<string> {