Who we?
I think of them as snapshots organized in a directed acyclic graph (DAG).
Diff is only a viewing option, or an optional compression implementation detail in packed history files.
this post was submitted on 05 Jan 2024
8 points (100.0% liked)
Git
2541 readers
10 users here now
Git is a free and open source distributed version control system designed to handle everything from small to very large projects with speed and efficiency.
Resources
Rules
- Follow programming.dev rules
- Be excellent to each other, no hostility towards users for any reason
- No spam of tools/companies/advertisements. It’s OK to post your own stuff part of the time, but the primary use of the community should not be self-promotion.
Git Logo by Jason Long is licensed under the Creative Commons Attribution 3.0 Unported License.
founded 1 year ago
MODERATORS
Diff is only a viewing option
It isn't. Git uses 3-way diff/merge algorithm quite liberally behind the scenes.
Trust me, it's a diff. I've seen a repo get into a very stupid state where there were changes in the main branch that weren't in the develop branch, but a PR didn't pick up those charges because they were somehow not in any of the commits
Commits are snapshots with tracking that enables diffing and histories. git very specifically focuses on commits containing complete information (snapshots) instead of older diffing models that would need to sometimes replay diffs to arrive at a commit state.
Mercurial took an interesting approach here. It stores commits as diffs with occasional snapshots in between. This is similar to how video codecs store frames as deltas with occasional full 'keyframes' in between. This is the way Mercurial blunts the diff-replay problem you mentioned.
Git AFAIK, stores each file modification as full snapshot, until it is packed at some stage. Mercurial doesn't need this work around. Mercurial diffs are also format-neutral. It works fine with binary data.
Depends on context.
Most of the interfacing is change based. But calling that diff is misleading.
But calling that doff is misleading.
Git actually uses diffs behind the scenes a lot - 3-way diffs/merges to be more accurate. Merging, rebasing, cherry picking and even reverting are all 3-way diff-merges.