Skip to content

Commit

Permalink
Support local git diff with bun.lockb
Browse files Browse the repository at this point in the history
This is following the Bun [guide][1]/[docs][2] for enabling git diffs
for `bun.lockb`

This won't work on GitHub, and this file isn't currently checked into
git. It is supported by Renovate, so we could check it in, but there are
various issues with this including [increased merge conflicts with
dependency management][3] and [potential security threats][4]. This
issue should be resolved and this change revertible when [Bun moves to a
by-default text-based lockfile][5] and Renovate adds support

[1]: https://bun.sh/guides/install/git-diff-bun-lockfile
[2]: https://bun.sh/docs/install/lockfile#how-do-i-git-diff-bun-s-lockfile
[3]: oven-sh/bun#5486
[4]: oven-sh/bun#5486 (comment)
[5]: oven-sh/bun#11863
  • Loading branch information
yndajas committed Jun 14, 2024
1 parent 1a7b4b6 commit 306abe1
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 0 deletions.
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*.lockb binary diff=lockb
3 changes: 3 additions & 0 deletions .gitconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[diff "lockb"]
textconv = bun
binary = true

0 comments on commit 306abe1

Please sign in to comment.