Microsoft/vscode

Git - quick diff indicator does not work with global textconv

Open

#113,609 opened on Dec 31, 2020

View on GitHub
 (0 comments) (0 reactions) (1 assignee)TypeScript (74,848 stars) (10,221 forks)batch import
buggithelp wanted

Description

  • VSCode Version: 1.53.0-insider
  • OS Version: Ubuntu 20.10

Steps to Reproduce:

  1. Clone the repository at https://github.com/septatrix/vscode-git-attributes-filter
  2. Copy the commented section from .gitconfig to ~/.gitconfig.
  3. Open the directory in vscode and then open the file sample.txt
  4. Even though everything is up to date vscode will show the first line as new.

Does this issue occur when all extensions are disabled?: Yes

Other info:

The corresponding output from git itself:

$ cat sample.txt
# global diff textconv
# local diff textconv
$ tail -n 2 ~/.gitconfig
[diff "globaltxt"]
        textconv = "grep -v '^# global'"
$ git status
On branch master
Your branch is up to date with 'origin/master'.

nothing to commit, working tree clean
$ git show :sample.txt
# global diff textconv
# local diff textconv
$ git show --textconv :sample.txt
# local diff textconv

When changing the diff attribute in .gitattributes to localtxt everything works as expected. This may be some special case of #83232 when the text conversion (like diff or filter) is globally defined.

Contributor guide

Tech stack
typescript
Domain
backenddeveloper experience
Issue type
bug
DifficultyEstimated implementation difficulty for a new contributor, from 1 for very small changes to 5 for expert-level work.
3
Estimated timeA rough time range for an experienced contributor to investigate, implement, test, and prepare a pull request.
1-3 hours
Activity statusHow available the issue appears right now: fresh, active, stale, blocked, or waiting on maintainer input.
blocked
ClarityHow clearly the issue explains the expected change, acceptance criteria, and next step.
clear
Prerequisites
GitVSCode API
Newbie friendlinessA 1-100 score estimating how approachable this issue is for first-time contributors.
20
Research direction
Investigate how VSCode computes quick diff indicators when a global textconv is configured. Start by examining the git extension code in `extensions/git/src/` for diff handling. Refer to the linked issue #83232 for similar context. Reproduce the bug and trace the logic that determines file modifications to identify where global textconv is not applied.