![.gitattributes
slides.pdf
X.java
LFS configuration
.gitattributes
*.pdf filter=lfs diff=lfs merge=lfs -text
.gitconfig
[filter "lfs"]
clean = git-lfs clean %f
smudge = git-lfs smudge %f
which files to store in LFS ?
lfs clean filter intercepts add
lfs smudge filter intercepts checkout
.git
-- config
-- objects
-- lfs](https://image.slidesharecdn.com/newsfromgitineclipse-eclipseconeu-2016-10-26-161026204916/85/News-from-Git-in-Eclipse-EclipseCon-EU-2016-10-26-26-320.jpg)
News from Git in Eclipse - EclipseCon EU - 2016-10-26
- 1. News from Git in Eclipse Matthias Sohn (SAP)
- 2. merge strategy extension point JGit 4.0, EGit 4.1 ● enables external merge strategy ● used by EMF Compare to provide model merge (Neon)
- 3. EMF Compare provides model merge strategy Computes the logical model for each version Compares / merges complete logical model
- 4. e4 smart project import wizard EGit ● clone repository ● invoke e4 smart project import ● auto-detects projects and their types ● Since Neon it's the default wiki e4 smart import
- 5. e4 smart project import
- 6. Staging View EGit ● better support non-workspace files (4.2) ● enable sorting files by status (4.3) ● "Commit" opens staging view (4.3) ● auto-switch to vertical layout (4.3)
- 7. Better support non-workspace files
- 8. Sorting files by status
- 9. "Commit" opens Staging View
- 10. Auto-switch to vertical layout
- 11. History View EGit ● auto-select branch (4.2) ● new search widget (4.5)
- 14. Usability Improvements EGit ● dirty decorator in repositories view ● most git actions enabled on working sets ● configure date format ● view stash in commit viewer (4.4)
- 15. dirty decorator in repositories view
- 16. enable most git actions on working sets
- 18. View Stash in Commit Viewer
- 19. Gerrit integration EGit 4.3 ● auto-configure repository cloned from Gerrit ● auto-fill "Fetch from Gerrit" wizard from clipboard ● "Commit and push" opens "Push to Gerrit" wizard ● Set topic on push for review (4.4)
- 20. Misc Improvements EGit ● improved support for submodules / nested repositories (4.3) ● configurable pull options (4.3) ● rebase modes (4.6) ● check for running launches before modifying the workspace (4.5) ● auto-gc (4.6) ● Oomph setup for contributors (4.5)
- 21. hooks support JGit ● pre-push (4.2) ● post-commit (4.5)
- 22. .gitattributes JGit 4.3 fixed most wanted JGit bug (108 votes) ● filter attributes (4.2) ● text attributes ● eol attributes ● macros
- 23. LFS Large File Storage JGit, EGit client ● integrate git-lfs extension in client (4.2) ● built-in JGit LFS extension (4.6) server ● basic JGit LFS server (4.3) ○ file system or S3 storage ● Gerrit lfs plugin (Gerrit 2.13)
- 24. Versioning large binaries in Git large binary files can't be packed by Git efficiently ➔ Git repository growing quickly ➔ gc more expensive and less efficient ➔ slows down transport ➔ Git server load grows
- 25. .gitattributes slides.pdf X.java Large File Storage (LFS) extension .git -- objects -- lfs git server lfs server git git-lfs
- 26. .gitattributes slides.pdf X.java LFS configuration .gitattributes *.pdf filter=lfs diff=lfs merge=lfs -text .gitconfig [filter "lfs"] clean = git-lfs clean %f smudge = git-lfs smudge %f which files to store in LFS ? lfs clean filter intercepts add lfs smudge filter intercepts checkout .git -- config -- objects -- lfs
- 27. .gitattributes slides.pdf X.java git add slides.pdf version git-lfs/spec/v1 id sha256:5891b5b522... size 6 store meta data in objects store big file in lfs objects lfs clean filter slides.pdf .git -- objects -- lfs
- 28. .gitattributes slides.pdf X.java git push origin git server lfs server pre-push hook version git-lfs/spec/v1 id sha256:5891b5b522... size 6 push slides.pdf .git -- objects -- lfs
- 29. .gitattributes slides.pdf X.java git fetch/clone, git checkout git server lfs server version git-lfs/spec/v1 id sha256:5891b5b522... size 6 fetch checkout downloads large object lazily slides.pdf lfs smudge filter .git -- objects -- lfs
- 30. EGit Gerrit .gitattributes slides.pdf X.java LFS server with JGit filesystem/S3 storage JGit JGit LFS client Gerrit plugin LFS storage (filesystem / S3) .git -- objects JGit LFS server .git -- objects -- lfs
- 31. The quest for distributed JGit JGit RefTree (4.2) ● version refs as git objects ● repository state described by RefTree commit containing ref updates ● enables atomic push Ketch (4.3) ● distributed transaction log based on RefTree ● Raft distributed consensus for leader election ● basis for distributed JGit server
- 32. RefTree: Versioning branches in git store refs in git tree objects push can update many refs -> stored in one RefTree commit -> enable transactional ref updates when receiving a pack -> compare single SHA1 to compare repository states
- 33. jgit clone with worktree standard refs jgit.git bare repository refs stored in RefTree bootstrap branch symlinked objects linked via alternates commit, push bootstrap branch bootstrap branch RefTree Versions symlink objects alternates objects spy empty, used for introspection
- 34. Ketch: multi-master git repository ● leader election (Raft) leader
- 35. Ketch: multi-master git repository ● leader election (Raft) ● push arrives on any server push leader
- 36. Ketch: multi-master git repository ● leader election (Raft) ● push arrives on any server ● queue proposal to leader ● leader creates new RefTree describing target state push queue proposal RefTree leader
- 37. Ketch: multi-master git repository ● leader election (Raft) ● push arrives on any server ● queue proposal to leader ● leader creates new RefTree describing target state ● replicate objects and RefTree to majority of serverspush queue proposal RefTree RefTree leader
- 38. Ketch: multi-master git repository ● leader election (Raft) ● push arrives on any server ● queue proposal to leader ● leader creates new RefTree describing target state ● replicate objects and RefTree to majority of serverspush queue proposal RefTree RefTree RefTree leader
- 39. Ketch: multi-master git repository ● leader election (Raft) ● push arrives on any server ● queue proposal to leader ● leader creates new RefTree describing target state ● replicate objects and RefTree to majority of servers ● commit transaction ack ack RefTree RefTree RefTree leader
- 41. Evaluate the Sessions Sign in and vote at eclipsecon.org - 1 + 10