New issue
Advanced search Search tips

Issue 731247 link

Starred by 1 user

Issue metadata

Status: Fixed
Owner:
Closed: Jun 2017
Components:
EstimatedDays: ----
NextAction: ----
OS: Mac
Pri: 2
Type: Bug



Sign in to add a comment

git cl patch prints error: unknown option `ancestor'

Project Member Reported by skobes@chromium.org, Jun 8 2017

Issue description

Trying to patch in http://crrev.com/c/527421, I got the following:

$ git cl patch 527421
remote: Counting objects: 333503, done
remote: Finding sources: 100% (25/25)
remote: Total 25 (delta 0), reused 18 (delta 0)
Unpacking objects: 100% (25/25), done.
From https://chromium.googlesource.com/chromium/src
 * branch                      refs/changes/21/527421/3 -> FETCH_HEAD
error: unknown option `ancestor'
usage: git merge-base [-a | --all] <commit> <commit>...
   or: git merge-base [-a | --all] --octopus <commit>...
   or: git merge-base --independent <commit>...
   or: git merge-base --is-ancestor <commit> <commit>
   or: git merge-base --fork-point <ref> [<commit>]

    -a, --all             output all common ancestors
    --octopus             find ancestors for a single n-way merge
    --independent         list revs not reachable from others
    --is-ancestor         is the first one ancestor of the other?
    --fork-point          find where <commit> forked from reflog of <ref>

error: unknown option `ancestor'
usage: git merge-base [-a | --all] <commit> <commit>...
   or: git merge-base [-a | --all] --octopus <commit>...
   or: git merge-base --independent <commit>...
   or: git merge-base --is-ancestor <commit> <commit>
   or: git merge-base --fork-point <ref> [<commit>]

    -a, --all             output all common ancestors
    --octopus             find ancestors for a single n-way merge
    --independent         list revs not reachable from others
    --is-ancestor         is the first one ancestor of the other?
    --fork-point          find where <commit> forked from reflog of <ref>

It looks like you're on a branch with some local commits.
 not be able to easily upload further changes based on it.will 
Would you like to proceed with applying this patch anyway?
ess Enter to confirm, or Ctrl+C to abort
 
FYI this was on a Mac checkout that I don't use often.  I had just sync'ed, and I ran "git config gerrit.host true" first so I would expect it to pull from Gerrit correctly.  I've used git cl patch successfully with Gerrit changes on my Linux checkout before.

Comment 2 by tapted@chromium.org, Jun 16 2017

Owner: aga...@chromium.org
Status: Assigned (was: Unconfirmed)
--ancestor was added in https://chromium-review.googlesource.com/c/527345/

maybe it's a new git feature that no everyone has

Comment 3 by aga...@chromium.org, Jun 16 2017

Status: Fixed (was: Assigned)
This was fixed in https://chromium.googlesource.com/chromium/tools/depot_tools/+/bacbdb9a559c58d0fe462422c913710fd2f38677 last week, please update your depot_tools.

Sign in to add a comment