commit bacbdb9a559c58d0fe462422c913710fd2f38677
author Aaron Gable <agable@chromium.org> Fri Jun 09 10:31:41 2017 -0700
committer Commit Bot <commit-bot@chromium.org> Fri Jun 09 17:39:08 2017 +0000
tree 6d8abbcf395714af7eeddc5e2b069c83ca4ca86a
parent 2c376aa21bef061e6529c1459eb161ce31140d7c

git-cl-patch: fix --is-ancestor flag

TBR=tandrii@chromium.org

Bug: 723787
Change-Id: Ie5017747f2070116774cd12ba0dd2ea531b2d0aa
Reviewed-on: https://chromium-review.googlesource.com/529547
Reviewed-by: Aaron Gable <agable@chromium.org>
Reviewed-by: Andrii Shyshkalov <tandrii@chromium.org>
Commit-Queue: Aaron Gable <agable@chromium.org>

git_cl.py

diff --git a/git_cl.py b/git_cl.py
index 7ccf8e0..1c61897 100755
--- a/git_cl.py
+++ b/git_cl.py
@@ -2796,10 +2796,10 @@
     RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
 
     clean, _ = RunGitWithCode(
-        ['merge-base', '--ancestor', 'HEAD', 'origin/master'])
+        ['merge-base', '--is-ancestor', 'HEAD', 'origin/master'])
     if clean != 0:
       clean, _ = RunGitWithCode(
-          ['merge-base', '--ancestor', 'HEAD', 'FETCH_HEAD'])
+          ['merge-base', '--is-ancestor', 'HEAD', 'FETCH_HEAD'])
     if clean != 0:
       confirm_or_exit(
           'It looks like you\'re on a branch with some local commits.\n'