Git Internals

A short version of Git Fundamentals course, I found this information very supporting to people using Git - that is why I put this version together.

Transcript

1. Git Internals Haggai Philip Zagury, Q1 2013 @:
2. whoami Haggai Philip Zagury CM / DevOps Engineer Over 5 years of CM/ALM/DevOps expertise “I am a member of Tikal's ALM group. With over 12 members, we meet, share, contribute and code together on a bi-weekly basis. “
3. Inspired by Scott Chacon Author of "Pro Git" Whilst lecturing about git / Introducing git. I got the impression that without git internals some concepts of git were unclear - thus I created this set of slides
4. Git's internals
5. ~/Projects/git/git_intro/(master) $> git commit -m "Adding README file" [master (root-commit) 38a5307] Adding README file 1 file changed, 2 insertions(+) create mode 100644 README The ${GIT_DIR} .git directory Before the commit: ~/Projects/git/git_intro/(master) $> find .git .git .git/refs .git/refs/heads .git/refs/tags .git/description .git/hooks/... .git/config .git/info .git/info/exclude .git/branches .git/objects .git/objects/pack .git/objects/info .git/HEAD ~/Projects/git/git_intro/(master) $> find .git .git .git/COMMIT_EDITMSG .git/refs .git/refs/heads .git/refs/heads/master .git/refs/tags .git/description .git/hooks/... .git/index .git/config .git/info .git/info/exclude .git/branches .git/objects .git/objects/bd .git/objects/bd/2510ea0000fa2294947172f6f450bd0272fdab .git/objects/38 .git/objects/38/a5307967fe2c9f92eb3c5a46ccdcc18410b4f3 .git/objects/pack .git/objects/info .git/objects/43 .git/objects/43/841a2f87570c9e458ab1da83396e0a5563ff36 .git/logs .git/logs/refs .git/logs/refs/heads .git/logs/refs/heads/master .git/logs/HEAD .git/HEAD After the commit:
6. What happened ? Git Objects Every commit consists of objects of three types: [ To be precise the tree & blob are created when you add/stage the commit is created when you -> commit ], more about that in a few ... commit -> a snapshot in time tree -> represent directory blob -> file content
7. DAG - Directed acyclic graph Git uses DAG and a hash mechanism to redirect / map the repository. A directed acyclic graph (DAG i/ˈdæɡ/), is a directed graph with no directed cycles. That is, it is formed by a collection of vertices and directed edges, each edge connecting one vertex to another, such that there is no way to start at some vertex v and follow a sequence of edges that eventually loops back to v again.
8. Our README as object(s) git log -> commit 38a5307967fe2c9f92eb3c5a46ccdcc18410b4f3 Author: Haggai Philip Zagury <hagzag@tikalk.com> Date: Sat Apr 20 18:27:02 2013 +0300 commit -> tree 43841a2f87570c9e458ab1da83396e0a5563ff36 author Haggai Philip Zagury <hagzag@tikalk.com> 1366471622 +0300 committer Haggai Philip Zagury <hagzag@tikalk.com> 1366471622 +0300 Tree -> 100644 blob bd2510ea0000fa2294947172f6f450bd0272fdab README Blob -> === README FILE for git_intro === Version 1.0 8a7534e5 43841a2f bd2510ea
9. refs [references] 8a7534e5 43841a2f bd2510ea point to subdir / file name & mode pointer to parent commit master HEAD* $> find .git/refs/ .git/refs/ .git/refs/heads .git/refs/heads/master .git/refs/tags $> cat .git/refs/heads/master 8a7534e5ac1eb36ef21b8c4a06b8af5d59abee50 The "master" branch is just like a "post-it" reference to the SHA1 of the latest commit
10. Probing Git Objects C1 README C2 hello.rb $> git cat-file -p 38a5307967fe2c9f92eb3c5a46ccdcc18410b4f3 tree 43841a2f87570c9e458ab1da83396e0a5563ff36 author Haggai Philip Zagury <hagzag@tikalk.com> 1366471622 +0300 committer Haggai Philip Zagury <hagzag@tikalk.com> 1366471622 +0300 Adding README file parent git log http://git-scm.com/docs/git-log In every repository there is at least one "parent-less" commit $> git cat-file -p 8a7534e5ac1eb36ef21b8c4a06b8af5d59abee50 tree ea94fb0f34ca7dbcfc6ecaf7077dfe4b12725068 parent 38a5307967fe2c9f92eb3c5a46ccdcc18410b4f3 author Haggai Philip Zagury <hagzag@tikalk.com> 1366488967 +0300 committer Haggai Philip Zagury <hagzag@tikalk.com> 1366488967 +0300 Adding hello.rb to repo The commands are presented for educational purposes and are rarely used by the common developer ...
11. It's a blob more probing... Git stores a single file per piece of content, named with the SHA-1 checksum of the content and its header. The subdirectory is named with the first 2 characters of the SHA, and the filename is the remaining 38 characters $> git log commit 8a7534e5ac1eb36ef21b8c4a06b8af5d59abee50 Author: Haggai Philip Zagury <hagzag@tikalk.com> Date: Sat Apr 20 23:16:07 2013 +0300 Adding hello.rb to repo $> git cat-file -t 8a7534e5ac1eb36ef21b8c4a06b8af5d59abee50 commit $> git cat-file -t bd2510ea0000fa2294947172f6f450bd0272fdab blob $> find .git/objects/ -type f . git/objects/bd/2510ea0000fa2294947172f6f450bd0272fda b .git/objects/5e/b56f99ad91c6e8933c3e06593a66a09e3a1b91 .git/objects/38/a5307967fe2c9f92eb3c5a46ccdcc18410b4f3 .git/objects/ea/94fb0f34ca7dbcfc6ecaf7077dfe4b12725068 .git/objects/43/841a2f87570c9e458ab1da83396e0a5563ff36 .git/objects/8a/7534e5ac1eb36ef21b8c4a06b8af5d59abee50 bd + 2510ea0000fa2294947172f6f450bd0272fdab = README $> git cat-file -p bd2510ea0000fa2294947172f6f450bd0272fdab === README FILE for git_into === Version 1.0
12. Branching & tagging
13. We already know branches :) master == branch
14. refs [references] 8a7534e5 43841a2f bd2510ea point to subdir / file name & mode pointer to parent commit master HEAD* $> find .git/refs/ .git/refs/ .git/refs/heads .git/refs/heads/master .git/refs/tags $> cat .git/refs/heads/master 8a7534e5ac1eb36ef21b8c4a06b8af5d59abee50 The "master" branch is just like a "post-it" reference to the SHA1 of the latest commit
15. refs [references] 8a7534e5 43841a2f bd2510ea point to subdir / file name & mode pointer to parent commit foo HEAD* $> find .git/refs/ .git/refs/ .git/refs/heads .git/refs/heads/master .git/refs/tags $> cat .git/refs/heads/master 8a7534e5ac1eb36ef21b8c4a06b8af5d59abee50 The "master" branch is just like a "post-it" reference to the SHA1 of the latest commit
16. Context based development git branch http://git-scm.com/docs/git-branch $> git checkout -b second-idea will switch and create a new branch in that name in one command [ like executing: "git branch the-idea && git checkcout the-idea" ] $> git branch * master $> git branch the-idea $> git branch * master the-idea $> git checkout the-idea Switched to branch 'the-idea' $> ls .git/refs/heads/ master the-idea
17. refs [references] - branches 8a7534e5 43841a2f bd2510ea point to subdir / file name & mode pointer to parent commit master HEAD* the-idea $> cat .git/refs/heads/master 8a7534e5ac1eb36ef21b8c4a06b8af5d59abee50 $> cat .git/refs/heads/the-idea 8a7534e5ac1eb36ef21b8c4a06b8af5d59abee50 $> as long as I haven't added anything to the new branch, the pointer's content is on the same commit as "master" branch - Remember DAG ?! $> git checkout the-idea Switched to branch 'the-idea'
18. refs change $> sed -i s/1\.0/2\.0/g README $> git commit -a -m "Bumping version to 2.0" [the-idea aedd0cd] Bumping version to 2.0 1 file changed, 1 insertion(+), 1 deletion(-) $> cat .git/refs/heads/master .git/refs/heads/the-idea 8a7534e5ac1eb36ef21b8c4a06b8af5d59abee50 aedd0cd8ba404f292bdf3f9542d67285c489a143 $>The reference to the new object has changed the parent object [DAG ...] is the same 8a7534e5 master HEAD* the-idea aedd0cd8
19. Deleting branches All that was removed is the reference to the node in the graph so basically we can recreate that bench to that point in time [SHA1 aedd0cd8] any time we want ! $> git branch -d the-idea error: Cannot delete the branch 'the-idea' which you are currently on. $> git checkout master Switched to branch 'master' $> git branch -d the-idea error: The branch 'the-idea' is not fully merged. If you are sure you want to delete it, run 'git branch -D the-idea'. 8a7534e5 master HEAD* the-idea aedd0cd8
20. Let's create a conflict (on master) 8a7534e5 aedd0cd8 master HEAD* the-idea 1706dbd $> sed -i s/1\.0/1\.1/g README $> git commit -a -m "This change will create a conflict whilst merging \"the-idea\" branch" [master 1706dbd] This change will create a conflict whilst merging "the-idea" branch 1 file changed, 1 insertion(+), 1 deletion(-) $> git log --oneline --graph --decorate --all * 1706dbd (master) This change will create a conflict whilst merging "the-idea" branch | * aedd0cd (HEAD, the-idea) Bumping version to 2.0 | / * 8a7534e (second-idea) Adding hello.rb to repo * 38a5307 Adding README file "Visualize it"
21. gitk - viewing changes ... Available with git extensions & others | equivalent $> gitk --all
22. Tagging Wait, I need to tag the version 1.0 ... And no, a TAG isn't a BRANCH ! Tag is an object in the DAG + commit message & optional gpg signature 8a7534e5 aedd0cd8 master HEAD* the-idea 1706dbd 1.0 2.0 1.1 $> git tag -a v1.0 -m 'version 1.0' 8a7534e5 $> git show v1.0 tag v1.0 Tagger: Haggai Philip Zagury <hagzag@tikalk.com> Date: Wed Apr 24 01:24:03 2013 +0300 verion 1.0 commit 38a5307967fe2c9f92eb3c5a46ccdcc18410b4f3 git tag http://git-scm.com/docs/git-tag git tag foo - will create a tag named foo to the current HEAD reference
23. Merging with Git
24. Merging Integrating two nodes in the DAG - that's all it is ... $> git log --pretty=oneline --graph --decorate --all * 3bd95903b3e2a3934b1d3bc1495f7c5c9ced5df2 (HEAD, master) Merge branch 'the-idea' |\ | * aedd0cd8ba404f292bdf3f9542d67285c489a143 (the-idea) Bumping version to 2.0 * | 1706dbd411de152c462172386eafa238fc50f50b This change ... conflict ... merging "the-idea" branch |/ * 8a7534e5ac1eb36ef21b8c4a06b8af5d59abee50 (second-idea) Adding hello.rb to repo * 38a5307967fe2c9f92eb3c5a46ccdcc18410b4f3 Adding README file $> git log commit 3bd95903b3e2a3934b1d3bc1495f7c5c9ced5df2 Merge: 1706dbd aedd0cd Author: Haggai Philip Zagury <hagzag@tikalk.com> Date: Tue Apr 23 22:34:54 2013 +0300 Merge branch 'the-idea' Conflicts: README
25. Non/Fast Forward 8a7534e5 master the-idea aedd0cd8 ae2c0cd8 9idb9cd8 8a7534e5 master the-idea aedd0cd8 ae2c0cd8 9idb9cd8 8a7534e5 master the-idea aedd0cd8 as34cd8 9idb9cd8 ae2c0cd8 Fast Forward Non Fast Forward Before merge
26. Remote Tracking
27. Remote tracking Reference(s) The remote/master is the same type of reference like the "local" master but from a different namespace. .git/refs/remotes/... This namespace is mapped to the remote server ! - represented by a url 8a7534e5 43841a2f bd2510ea master HEAD* remotes/server/master