Skip to content

GitLab

  • Menu
Projects Groups Snippets
    • Loading...
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in
  • G gitlabhq1
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 21
    • Issues 21
    • List
    • Boards
    • Service Desk
    • Milestones
  • Merge requests 12
    • Merge requests 12
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
  • Deployments
    • Deployments
    • Environments
    • Releases
  • Monitor
    • Monitor
    • Incidents
  • Packages & Registries
    • Packages & Registries
    • Package Registry
    • Infrastructure Registry
  • Analytics
    • Analytics
    • CI/CD
    • Repository
    • Value stream
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • gpt
  • large_projects
  • gitlabhq1
  • Merge requests
  • !5626

Closed
Created Nov 20, 2013 by Administrator@rootOwner
  • Report abuse
Report abuse

satellite: use double-dash to disambiguate refspec and pathspec

  • Overview 6
  • Commits 1
  • Changes 1

Created by: davvid

When a file or directory is named the same as either the source or target branch then git will fail to diff because of the ambiguity. e.g. if you touch a file called "master" you will see this output:

$ git diff HEAD master
fatal: ambiguous argument 'master': both revision and filename
Use '--' to separate paths from revisions, like this:
'git <command> [<revision>...] -- [<file>...]'

The solution is to use the double-dash to separate paths from revisions, as git suggests in its error message.

Related-to: #4944 (closed)

Signed-off-by: David Aguilar [email protected]

Assignee
Assign to
Reviewer
Request review from
Time tracking
Source branch: github/fork/davvid/disambiguate-refs-and-paths