commit 354e1d23e0bd8309540a6d9db7742f1bd9109ecf
author Andrii Shyshkalov <tandrii@chromium.org> Fri Jun 09 19:31:33 2017 +0200
committer Commit Bot <commit-bot@chromium.org> Fri Jun 09 17:53:49 2017 +0000
tree f4bd4bf1c54d58781a1d70453ca5dee55ef29bb1
parent bacbdb9a559c58d0fe462422c913710fd2f38677

git cl: improve warning.

R=agable@chromium.org

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

git_cl.py

diff --git a/git_cl.py b/git_cl.py
index 1c61897..8e8775b 100755
--- a/git_cl.py
+++ b/git_cl.py
@@ -2414,14 +2414,17 @@
     if gerrit_auth and git_auth:
       if gerrit_auth == git_auth:
         return
+      all_gsrc = cookie_auth.get_auth_header('d0esN0tEx1st.googlesource.com')
       print((
           'WARNING: You have different credentials for Gerrit and git hosts:\n'
           '           %s\n'
           '           %s\n'
           '        Consider running the following command:\n'
           '          git cl creds-check\n'
+          '        %s\n'
           '        %s') %
           (git_host, self._gerrit_host,
+           ('Hint: delete creds for .googlesource.com' if all_gsrc else ''),
            cookie_auth.get_new_password_message(git_host)))
       if not force:
         confirm_or_exit('If you know what you are doing', action='continue')