tree 53c9d87808a8686a8ba876ea413efec6bce35afe
parent 5d099fcb489d5e1199a0f726fbe1e370468a5cbd
author Sylvain Defresne <sdefresne@chromium.org> 1602779265 +0000
committer LUCI CQ <infra-scoped@luci-project-accounts.iam.gserviceaccount.com> 1602779265 +0000

Fix `git map-branches` when branch is named after a file/directory

If there is a branch named after a file in the repository root, the
command `git rev-list --count $branch ^$base` is ambiguous. This is
because `git` does not know whether $branch needs to be parsed as a
revision or a filename.

Adding a trailing `--` parameter to the command-line resolves this
ambiguity since when present, everything before the `--` cannot be
a filename and everything after `--` has to one.

From git documentation:

  Paths may need to be prefixed with -- to separate them from
  options or the revision range, when confusion arises.

Bug: none
Change-Id: Ieb10aa8701e12fc3c88d5f75ff624f61ee8d8aaa
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2475773
Reviewed-by: Josip Sokcevic <sokcevic@google.com>
Commit-Queue: Sylvain Defresne <sdefresne@chromium.org>