Article argues that git is intrinsically confusing--if you could redesign git from scratch, what would you change?
What's wrong with git? | Proceedings of the 2013 ACM international symposium on New ideas, new paradigms, and reflections on programming & software
Definitely something about merge and rebase.
@abbadon420 @testeronious Yes! There has to be something better than here and there and over there for merge conflicts.
Well, I can't read it... But I would say it's nonsense that Git is intrinsically confusing. The core data model is extremely simple and intuitive. The problems are:
index is probably the worse; why not draft commit?)It's like trying to explain CAD using OpenSCAD instead of SOLIDWORKS. Of course it's going to seem like CAD is confusing.
That's not to say Git's data model is perfect. What's there is decent but there are big gaps. Support for large files is bad (LFS is a hack). Support for very large projects is bad (monorepos tend to get slow and sparse checkouts are difficult; submodules have lots of issues). Conflict resolution tends to be very dumb, though I think there are some projects to improve that.
It’s a fundamentally visual problem
In what way do you mean git versioning is fundamentally visual?
Or do you mean understanding it or visualising it? The data and its relationships?
Git is a graph of commits and you can't really display a graph in any way except visually. Even the CLI has a way of showing it visually (git log --graph).
Think about other graphs you might interact with, e.g. node graphs in 3D graphics of music production. How many of them do you manipulate with a CLI?
I must say I like the idea of having changes to files be bound to just the current branch, not the entire worktree (section 6.4.2), but other than that the points that are brought up don't really seem too compelling. It certainly didn't convince me that git has an inherently flawed design. For example, eliminating the staging area is a tempting point for simplifying git, but the authors already admit that it has some legitimate use cases.
But of course it is always nice to see some experimentation done in this space. I think the main reason why git sometimes is confusing, is because distributed version control really is a complex task, and git already does a very good job at making it tractable.
A PDF is available here, and analysis from Colyer 2016 is good.
This paper is fascinating in terms of ethnography. Consider: the paper mentions "branch" or "branches" dozens of times, but only says "tree" four times, and every instance is in the phrase "working tree". The paper never mentions "blob" or "blobs", "DAG" or "graph" or "poset". The authors either chose to omit git's data model, or they don't know about it. The implication is that the UX and UI don't reflect the data model, I suppose, but it is a very curious omission.
Now, contrast this with Git's documentation. When sysadmins teach git, we focus on the data first. git is a kind of database which stores four different flavors of object, and the git UI is merely a collection of commands for programmatically manipulating the database. All of the various UX is purpose-built, on a per-command basis, for development workflows. New commands can be implemented as plain UINX-style executable scripts in any language.
In summary, this paper looks at git as a version-control product, while its developers and users look at git as a version-control framework.
There was a followup paper from a few years later, also with Colyer 2016 analysis; this paper has too many glaring defects to discuss here.
On a personal note, I saw this and am happy to note that science has marched along:
We plan to extend our notation to make it more expressive in the future, but are cognizant of the fact that diagrammatic syntaxes for first order logic have a long and troubled history.
Not long after this paper, ontology logs were figured out, which can be made as expressive as needed for the case of relations; see Patterson 2017.
Reference syntax. Like what the fuck is the difference between .. (2 dots) and ... (3 dots)? And is there .... (4 dots)?
And I can never keep apart how to compare references. If I want to compare my feature branch with master, is it git diff HEAD..master or git diff master..HEAD? It seems like in git the syntax is reversed to mine, but I'm never sure. Maybe something like git diff HEAD->master would be more intuitive?
And git rebase --onto. Fuck me did it take me a long time to understand that (if I understood it).
Honestly, that's just git CLI interface stuff. Every time I've tried to read about the internal workings of git, the naming has thrown me off and stopped me from continuing. Like what the fuck is "git porcelain"? IIRC there's also git plumbing? But that doesn't even seem to be the internals which have another bizarre name?
git is a large series of Chesterton's fences that should be each examined. I'm hopeful that somebody or some org will come around to design a version control system from the ground up with documented architecture from the start (and not written in gosh-darn C).
I agree that the UX of existing git commands is not great. They evolved in a particular insular environment -- Linux kernel development with heavy mailing-list usage and large multi-headed merges, with occasional pull requests and manual integration testing.
Check out my top-level comment for a link to git's data model. A data-first approach with blob, tree, commit, and tag can be enlightening. The on-disk format tries to balance integrity, easy manipulation, disk space, and incremental updates; it's also weakly monoidal, enabling distributed development. Look up the history of Bitkeeper and git; this is "a version control system [designed] from the ground up with documented architecture from the start"! And there are many non-C implementations as a result, like pure-Python dulwich.
I just need a GUI or some sort of visual reference. I have trouble picturing what exactly is going on with each variant of the command. I've been able to fuddle through it every time I do some programming, and when I used Android Studio there were some GUI tools to use but otherwise I always get so confused. I think using IDEs would help in other projects but that's a thing that keeps me from doing programming projects on the regular.
I've been using TortoiseGit since the beginning. Nothing ever came close for me.
I in the log view I have overview, filters, and all actions at hand.
I had to switch to linux sometimes and the horror of not having Tortoise there almost killed me
Yea my take with git for a while is that it is a naturally GUI oriented app/program much like text editors (who uses
edany more?), however much you’re a CLI only person.I don't get that at all, to me using a GUI just gets in the way while on the CLI I can do whatever I want in a usually straightforward way.
Get Sourcetree
Nah, sourcetree has annoying bugs that never get fixed.
Use Fork, it's a better sourcetree.
It's free the same way that Sublime Text is: They'll ask for a payment once a month, but you can say you're "evaluating it" and use it for free. If you like it enough, you can pay for it. I have.