Skip to content

git config option color.diff can break diff and commit graph #3220

Closed
@haytona

Description

@haytona
  • Gitea version (or commit ref): Master and 1.3.1
  • Git version: 2.14.0.windows.2
  • Operating system: Windows Server 2012 R2
  • Database (use [x]):
    • PostgreSQL
    • MySQL
    • MSSQL
    • SQLite
  • Can you reproduce the bug at https://try.gitea.io:
    • Yes (provide example URL)
    • No
    • Not relevant
  • Log gist:
    n/a

Description

I've just discovered why my gitea wasn't working correctly. I raised a panic issue here yesterday which @bkcsoft submitted a patch for (pull/3156). After pulling down the latest master build that then revealed that I was unable to view any diffs. After scratching my head and walking through the git_diff.go source, I discovered my issue was shared config where I had been trying to improve my command line diffs in ~/.gitconfig but this clashed with gitea's use of git diff. Specifically I'd set color.diff=always in my ~/.gitconfig. Removing this has brought back my diff output and also the commit graph. Potentially gitea could specify --no-color however I think this is a case of user error (Lafriks asked I submit this as an issue from discord chat).

This issue would only affect people running gitea and git with the same user id. I have this in an environment where we are using the windows executable in a portable mode.

Symptoms: Panic, until pull/3156 was merged then a Diff content unavailable message. The commit graph was also missing the visual representation or "train tracks".

Edit: fixed @ mention.

Metadata

Metadata

Assignees

No one assigned

    Labels

    issue/confirmedIssue has been reviewed and confirmed to be present or accepted to be implementedtype/bug

    Type

    No type

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions