Fix ancestor check

Before, for the common case that the actual_merge_base was already set
as base, the check for is_ancestor(base, actual_merge_base) would have
caused the base to be re-set.
This is a writing operation, which causes trouble e.g. for the parallel
operation of 'git cl status'.

[email protected], [email protected]
BUG=

Review URL: https://codereview.chromium.org/1888213004

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@300003 0039d316-1c4b-4281-b951-d872f2087c98
1 file changed
tree: 377cd80893a90493955dc291411bbd66b1b5303d
  1. bootstrap/
  2. fetch_configs/
  3. git-templates/
  4. git_utils/
  5. infra/
  6. luci_hacks/
  7. man/
  8. recipe_modules/
  9. support/
  10. testing_support/
  11. tests/
  12. third_party/
  13. win_toolchain/
  14. zsh-goodies/
  15. .gitignore
  16. .style.yapf
  17. annotated_gclient.py
  18. apply_issue
  19. apply_issue.bat
  20. apply_issue.py
  21. auth.py
  22. breakpad.py
  23. buildbucket.py
  24. checkout.py
  25. chrome-update-create-task.bat
  26. chrome-update.bat
  27. chrome-update.py
  28. cit
  29. cit.bat
  30. cit.py
  31. clang-format
  32. clang-format.bat
  33. clang_format.py
  34. codereview.settings
  35. commit_queue
  36. commit_queue.bat
  37. commit_queue.py
  38. cpplint.bat
  39. cpplint.py
  40. cpplint_chromium.py
  41. create-chromium-git-src
  42. create-ntfs-junction.c
  43. create-ntfs-junction.exe
  44. dart_format.py
  45. depot-tools-auth
  46. depot-tools-auth.bat
  47. depot-tools-auth.py
  48. download_from_google_storage
  49. download_from_google_storage.bat
  50. download_from_google_storage.py
  51. drover
  52. drover.bat
  53. drover.py
  54. fetch
  55. fetch.bat
  56. fetch.py
  57. fix_encoding.py
  58. gcl
  59. gcl.bat
  60. gcl.py
  61. gclient
  62. gclient-new-workdir.py
  63. gclient.bat
  64. gclient.py
  65. gclient_completion.sh
  66. gclient_scm.py
  67. gclient_utils.py
  68. gerrit_util.py
  69. git-auto-svn
  70. git-cache
  71. git-cherry-pick-upload
  72. git-cl
  73. git-crrev-parse
  74. git-crsync
  75. git-drover
  76. git-find-releases
  77. git-footers
  78. git-freeze
  79. git-gs
  80. git-hyper-blame
  81. git-lkgr
  82. git-map
  83. git-map-branches
  84. git-mark-merge-base
  85. git-nav-downstream
  86. git-nav-upstream
  87. git-new-branch
  88. git-number
  89. git-rebase-update
  90. git-rename-branch
  91. git-reparent-branch
  92. git-retry
  93. git-runhooks
  94. git-squash-branch
  95. git-thaw
  96. git-try
  97. git-upstream-diff
  98. git_auto_svn.py
  99. git_cache.py
  100. git_cherry_pick_upload.py
  101. git_cl.py
  102. git_common.py
  103. git_dates.py
  104. git_drover.py
  105. git_find_releases.py
  106. git_footers.py
  107. git_freezer.py
  108. git_hyper_blame.py
  109. git_map.py
  110. git_map_branches.py
  111. git_mark_merge_base.py
  112. git_nav_downstream.py
  113. git_new_branch.py
  114. git_number.py
  115. git_rebase_update.py
  116. git_rename_branch.py
  117. git_reparent_branch.py
  118. git_retry.py
  119. git_squash_branch.py
  120. git_try.py
  121. git_upstream_diff.py
  122. gn
  123. gn.bat
  124. gn.py
  125. gsutil.py
  126. hammer
  127. hammer.bat
  128. LICENSE
  129. my_activity.py
  130. my_reviews.py
  131. ninja
  132. ninja-linux32
  133. ninja-linux64
  134. ninja-mac
  135. ninja.exe
  136. OWNERS
  137. owners.py
  138. owners_finder.py
  139. patch.py
  140. PRESUBMIT.py
  141. presubmit_canned_checks.py
  142. presubmit_support.py
  143. profile.xml
  144. pylint
  145. pylint.py
  146. pylintrc
  147. python_runner.sh
  148. README
  149. README.codereview
  150. README.gclient
  151. README.git-cl
  152. README.testing
  153. recipes.py
  154. repo
  155. rietveld.py
  156. roll-dep
  157. roll-dep-svn
  158. roll-dep-svn.bat
  159. roll-dep.bat
  160. roll_dep.py
  161. roll_dep_svn.py
  162. scm.py
  163. setup_color.py
  164. subcommand.py
  165. subprocess2.py
  166. trychange.py
  167. update_depot_tools
  168. update_depot_tools.bat
  169. upload_to_google_storage.py
  170. WATCHLISTS
  171. watchlists.py
  172. weekly
  173. wtf