From 25120f4278d7b400c3a017b9c0c55cb89cb9ba95 Mon Sep 17 00:00:00 2001 From: Yiwei Zhang Date: Wed, 15 May 2024 21:26:36 +0000 Subject: [PATCH] fail gracefully if git mark-merge-base is called in cog Bug: 339231299 Change-Id: I882365cd75e5945ecbf01bdca5a2b67735eb58da Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/5540670 Reviewed-by: Josip Sokcevic Auto-Submit: Yiwei Zhang Commit-Queue: Josip Sokcevic --- git_mark_merge_base.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/git_mark_merge_base.py b/git_mark_merge_base.py index 5ec6419198..680bccf6e4 100755 --- a/git_mark_merge_base.py +++ b/git_mark_merge_base.py @@ -18,8 +18,14 @@ from subprocess2 import CalledProcessError from git_common import remove_merge_base, manual_merge_base, current_branch from git_common import get_or_create_merge_base, hash_one, upstream +import gclient_utils + def main(argv): + if gclient_utils.IsEnvCog(): + print('mark-merge-base command is not supported in non-git ' + 'environment.', file=sys.stderr) + return 1 parser = argparse.ArgumentParser( description=__doc__.strip().splitlines()[0], epilog=' '.join(__doc__.strip().splitlines()[1:]))