gitkraken / vscode-gitlens

Supercharge Git inside VS Code and unlock untapped knowledge within each repository — Visualize code authorship at a glance via Git blame annotations and CodeLens, seamlessly navigate and explore Git repositories, gain valuable insights via rich visualizations and powerful comparison commands, and so much more
http://gitkraken.com/gitlens
Other
8.91k stars 1.25k forks source link

GitLens will not do comparison of remote and local branches. #941

Open brentarias opened 4 years ago

brentarias commented 4 years ago

I've done a careful write-up of this bug on Stack Overflow, including screen-shots of GitLens. I originally thought this was a Git issue, but now I believe it is a GitLens issue.

I know for a fact that there are genuine differences between the remote tracking branch and local, because if I do a git merge --no-commit then I see this:

$ git merge Master
Removing redshift/outputs.tf
Removing iam_edp/variables.tf
Removing iam_edp/policies/LambdaExecutionPolicyDefault.json
Removing iam_edp/policies/LambdaDevelopmentPolicy.json
Removing iam_edp/policies/GlueServiceRolePolicy.json
Removing iam_edp/policies/GlueServiceNotebookPolicyDefault.json
Removing iam_edp/policies/CloudWatchEventsConsoleAccess.json
Removing iam_edp/outputs.tf
Merge made by the 'recursive' strategy.
 ami/datasources.tf                                 |   8 +
 ami/main.tf                                        | 178 +++-
 ami/outputs.tf                                     |   3 +
 detective/README.md                                |   3 +
 detective/datasources.tf                           |   3 +
 detective/main.tf                                  |  57 ++
 edp_idq/sandbox/datasources.tf                     |  75 ++
 edp_idq/sandbox/main.tf                            | 757 +++++++++++++++++
 edp_idq/sandbox/userdata.sh                        |  89 ++
 edp_idq/sandbox/variables.tf                       |  23 +
 edp_idq/staging/datasources.tf                     |  63 ++
 edp_idq/staging/main.tf                            | 315 +++++++
 edp_idq/staging/userdata.sh                        |  32 +
 glue/datasources.tf                                |  19 +
 glue/main.tf                                       |  76 ++
 gluedevendpoint/.gitignore                         |   9 +
 .../CloudFormation/NoteBookServerTemplate.json     | 548 ++++++++++++
 gluedevendpoint/LICENSE                            | 373 ++++++++
 gluedevendpoint/README.md                          |  25 +
 gluedevendpoint/datasources.tf                     |  27 +
 gluedevendpoint/main.tf                            | 221 +++++
 gluedevendpoint/output.tf                          |   9 +
 .../policies/glue_endpoint_role.json               |  65 +-
 gluedevendpoint/requirements.txt                   |   1 +
 gluedevendpoint/scripts/apply.py                   | 102 +++
 gluedevendpoint/scripts/destroy.py                 |  57 ++
 gluedevendpoint/variables.tf                       |  37 +
 guard_duty_admin/main.tf                           |  77 ++
 iam/data.tf                                        |  16 +
 iam/keys/mongoatlas.asc                            |  26 +
 iam/main.tf                                        | 394 ++++++---
 iam/outputs.tf                                     |   8 +-
 iam/policies/csirt-user-policy.json.tpl            |  27 +
 iam/policies/security-user-policy.json.tpl         |  46 +
 iam_admin/main.tf                                  | 212 +++++
 iam_edp/datasources.tf                             |  48 ++
 iam_edp/main.tf                                    | 859 ++++++++++---------
 iam_edp/outputs.tf                                 |   1 -
 .../policies/CloudWatchEventsConsoleAccess.json    |  48 --
 .../policies/GlueServiceNotebookPolicyDefault.json | 105 ---
 iam_edp/policies/GlueServiceRolePolicy.json        | 106 ---
 iam_edp/policies/LambdaDevelopmentPolicy.json      |  78 --
 iam_edp/policies/LambdaExecutionPolicy.json        | 165 ++++
 iam_edp/policies/LambdaExecutionPolicyDefault.json |  51 --
 iam_edp/policies/LambdaInteractionPolicy.json      |  93 ++
 iam_edp/policies/SFTP_Read.json                    |  15 +
 iam_edp/policies/TrustPolicy.json.tpl              |  24 +
 .../sandbox_developer_lambda_user_policy.json.tpl  | 107 +++
 .../sandbox_developer_s3_user_policy.json.tpl      | 108 +++
 .../sandbox_developer_user_policy.json.tpl         | 146 ++++
 iam_edp/policies/sandbox_devops_policy.json.tpl    | 167 ++++
 iam_edp/policies/sandbox_devops_s3_policy.json.tpl |  89 ++
 .../sandbox_devops_service_policy.json.tpl         | 252 ++++++
 .../sandbox_glue_aws_service_policy.json.tpl       | 174 ++++
 .../sandbox_glue_s3_aws_service_policy.json.tpl    |  74 ++
 ...dbox_glue_service_notebook_role_policy.json.tpl |  60 ++
 .../sandbox_idq_ec2_profile_policy.json.tpl        | 142 ++++
 iam_edp/policies/sandbox_iics_user_policy.json.tpl |  82 ++
 .../sandbox_qa_lambda_user_policy.json.tpl         | 107 +++
 .../policies/sandbox_qa_s3_user_policy.json.tpl    | 108 +++
 iam_edp/policies/sandbox_qa_user_policy.json.tpl   | 146 ++++
 .../sandbox_redshift_aws_service_policy.json.tpl   | 125 +++
 iam_edp/policies/sandbox_uat_user_policy.json.tpl  | 349 ++++++++
 .../staging_developer_user_policy.json.tpl         |  47 +
 iam_edp/policies/staging_devops_policy.json.tpl    | 166 ++++
 iam_edp/policies/staging_devops_s3_policy.json.tpl |  65 ++
 .../staging_devops_service_policy.json.tpl         | 248 ++++++
 .../staging_glue_aws_service_policy.json.tpl       | 174 ++++
 .../staging_glue_s3_aws_service_policy.json.tpl    |  74 ++
 .../staging_idq_ec2_profile_policy.json.tpl        | 114 +++
 iam_edp/policies/staging_iics_user_policy.json.tpl |  82 ++
 iam_edp/policies/staging_qa_user_policy.json.tpl   |  47 +
 .../staging_redshift_aws_service_policy.json.tpl   | 125 +++
 .../staging_uat_lambda_user_policy.json.tpl        |  68 ++
 .../policies/staging_uat_s3_user_policy.json.tpl   |  81 ++
 iam_edp/policies/staging_uat_user_policy.json.tpl  | 105 +++
 iam_edp/service_users.tf                           | 944 +++++++++++++++++++++
 iam_edp/variables.tf                               |   1 -
 iam_init/README.md                                 |  10 +
 iam_init/main.tf                                   |  16 +
 iam_init/terra_load.sh                             |  11 +-
 kms/main.tf                                        |  79 ++
 macie_admin/datasources.tf                         |  11 +
 macie_admin/main.tf                                |  48 +-
 macie_admin/members/datasources.tf                 |  14 +
 macie_admin/members/main.tf                        |  66 ++
 r53_admin/main.tf                                  |   8 +
 rds/main.tf                                        | 210 ++++-
 rds/mssql-module/main.tf                           | 139 +--
 rds/mssql-module/variables.tf                      |  32 +-
 rds/variables.tf                                   |  43 +
 redshift/cluster-module/datasources.tf             |   5 +
 redshift/cluster-module/main.tf                    |  29 +-
 redshift/cluster-module/variables.tf               |   8 +
 redshift/datasources.tf                            |  34 +
 redshift/main.tf                                   | 116 ++-
 redshift/outputs.tf                                |   0
 redshift/variables.tf                              |  10 +
 s3/datasources.tf                                  |  22 +
 s3/main.tf                                         |  53 ++
 s3_edp/bucket_module_multi/main.tf                 |  67 ++
 s3_edp/bucket_module_multi/outputs.tf              |   3 +
 s3_edp/bucket_module_multi/variables.tf            |  51 ++
 s3_edp/main.tf                                     | 241 +++++-
 s3_edp/outputs.tf                                  |  25 +-

Steps to Reproduce:

  1. Git repository has differences between remote tracking branch and local branch (at HEAD).
  2. Attempt to compare local branch to remote tracking branch.
  3. All file changes (add, remove, modify) show up as a single blank "line changed" annotation instead of showing the real diff/comparison.
fsackur commented 3 years ago

There have been many releases since this was filed. Is it still an issue, should it be closed? (I'm not a maintainer, I just like tidying)