From bacbdb9a559c58d0fe462422c913710fd2f38677 Mon Sep 17 00:00:00 2001 From: Aaron Gable Date: Fri, 9 Jun 2017 10:31:41 -0700 Subject: [PATCH] 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 Reviewed-by: Andrii Shyshkalov Commit-Queue: Aaron Gable --- git_cl.py | 4 ++-- tests/git_cl_test.py | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/git_cl.py b/git_cl.py index 7ccf8e096c..1c61897b30 100755 --- a/git_cl.py +++ b/git_cl.py @@ -2796,10 +2796,10 @@ class _GerritChangelistImpl(_ChangelistCodereviewBase): 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' diff --git a/tests/git_cl_test.py b/tests/git_cl_test.py index b7b4804fa8..edbdd520ac 100755 --- a/tests/git_cl_test.py +++ b/tests/git_cl_test.py @@ -2128,7 +2128,7 @@ class TestGitCl(TestCase): self.calls += [ ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo', 'refs/changes/56/123456/7'],), ''), - ((['git', 'merge-base', '--ancestor', 'HEAD', 'origin/master'],), ''), + ((['git', 'merge-base', '--is-ancestor', 'HEAD', 'origin/master'],), ''), ((['git', 'reset', '--hard', 'FETCH_HEAD'],), ''), ((['git', 'config', 'branch.master.gerritissue', '123456'],), ''), @@ -2147,7 +2147,7 @@ class TestGitCl(TestCase): self.calls += [ ((['git', 'fetch', 'https://host.googlesource.com/my/repo', 'refs/changes/56/123456/7'],), ''), - ((['git', 'merge-base', '--ancestor', 'HEAD', 'origin/master'],), ''), + ((['git', 'merge-base', '--is-ancestor', 'HEAD', 'origin/master'],), ''), ((['git', 'reset', '--hard', 'FETCH_HEAD'],), ''), ((['git', 'config', 'branch.master.gerritissue', '123456'],), ''), @@ -2168,7 +2168,7 @@ class TestGitCl(TestCase): self.calls += [ ((['git', 'fetch', 'https://else.googlesource.com/my/repo', 'refs/changes/56/123456/1'],), ''), - ((['git', 'merge-base', '--ancestor', 'HEAD', 'origin/master'],), ''), + ((['git', 'merge-base', '--is-ancestor', 'HEAD', 'origin/master'],), ''), ((['git', 'reset', '--hard', 'FETCH_HEAD'],), ''), ((['git', 'symbolic-ref', 'HEAD'],), 'master'), ((['git', 'config', 'branch.master.gerritissue', '123456'],), @@ -2191,7 +2191,7 @@ class TestGitCl(TestCase): self.calls += [ ((['git', 'fetch', 'https://else.googlesource.com/my/repo', 'refs/changes/56/123456/1'],), ''), - ((['git', 'merge-base', '--ancestor', 'HEAD', 'origin/master'],), ''), + ((['git', 'merge-base', '--is-ancestor', 'HEAD', 'origin/master'],), ''), ((['git', 'reset', '--hard', 'FETCH_HEAD'],), ''), ((['git', 'symbolic-ref', 'HEAD'],), 'master'), ((['git', 'config', 'branch.master.gerritissue', '123456'],), @@ -2212,9 +2212,9 @@ class TestGitCl(TestCase): self.calls += [ ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo', 'refs/changes/56/123456/7'],), ''), - ((['git', 'merge-base', '--ancestor', 'HEAD', 'origin/master'],), + ((['git', 'merge-base', '--is-ancestor', 'HEAD', 'origin/master'],), CERR1), - ((['git', 'merge-base', '--ancestor', 'HEAD', 'FETCH_HEAD'],), + ((['git', 'merge-base', '--is-ancestor', 'HEAD', 'FETCH_HEAD'],), CERR1), (('ask_for_data', 'It looks like you\'re on a branch with some local commits.\n' @@ -2232,9 +2232,9 @@ class TestGitCl(TestCase): self.calls += [ ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo', 'refs/changes/56/123456/7'],), ''), - ((['git', 'merge-base', '--ancestor', 'HEAD', 'origin/master'],), + ((['git', 'merge-base', '--is-ancestor', 'HEAD', 'origin/master'],), CERR1), - ((['git', 'merge-base', '--ancestor', 'HEAD', 'FETCH_HEAD'],), + ((['git', 'merge-base', '--is-ancestor', 'HEAD', 'FETCH_HEAD'],), CERR1), (('ask_for_data', 'It looks like you\'re on a branch with some local commits.\n'