Git (FS and DVCS)
•
2 gostaram•515 visualizações
Git (FS and DVCS) is 2 hours training for software engineers.
Recomendados
Mais conteúdo relacionado
Mais procurados
Mais procurados (20)
Semelhante a Git (FS and DVCS)
Semelhante a Git (FS and DVCS) (20)
Último
Último (20)
Git (FS and DVCS)
- 1. GIT (FS AND DVCS) by generated: Michal Jurosz (mj41) 8.6.2015
- 2. GIT FS "I really really designed it coming at the problem from the viewpoint of a filesystem person (hey, kernels is what I do), and I actually have absolutely zero interest in creating a traditional SCM system." -- Linus Torvals
- 3. GIT a content-addressable filesystem manages tree snapshots (joined by commits) over time distributed version control system
- 4. WHY GIT? LINUX 2002 - 2005 proprietary BitKeeper Apr 7, Linus Torvals - based on BitKeeper concepts May 26 - Linux 2.6.12 - the first release with Git December 21 - Git 1.0 Msg: Initial revision of "git", the information manager from hell Author: Linus Torvalds <torvalds@ppc970.osdl.org> Date: Thu Apr 7 15:13:13 2005 0700 Files: catfile.c, committree.c, showdiff.c, ...
- 5. LINUX NEEDS distributed, fast, many files, robust effective storage - full history non-linear development, trial branches, complex merges toolkit-based design, pluggable merge strategies cryptographic authentication of history
- 6. ANNUAL LINUX DEVELOPMENT REPORT by Linux Foundation - April 3, 2012 Linux 3.2 release - Apr 1, 2012 15,004,006 lines of code 72 days since 3.1. 11,881 patches, 6.88 per hour 1,316 developers from 226 organizations 2005-2015 12,000 developers from 1200 organizations
- 7. NO SILVER BULLET permissions, ownership, empty directories, ... individual files (not project's files) large binary files ( )GitHub: Git LFS complexity - commit/push, checkout/clone no subtree of repository checkout no sequentially revision numbers CVS 10%, Git 38%, Subversion 46% - ohloh.net
- 8. PIT STOP 1 short intro Questions?
- 10. PORCELAIN/PLUMBING porcelain high level user plumbing low level scripts (e.g. null string separators) upward compatible
- 14. THE THREE TREES 1/2 "HEAD tree" (in local repository) HEAD - the snapshot of your last commit index - cache, staging area proposed next commit snapshot working directory (working tree) sandbox, files you see
- 15. Upstream Origin Local repository Index (cache) Working directory
- 17. GIT STATUS > git status On branch master Initial commit Untracked files: (use "git add <file>..." to include in what will be committed fileA.txt fileB.txt nothing added to commit but untracked files present (use "git a > git status short ?? fileA.txt ?? fileB.txt
- 19. GIT STATUS (AGAIN) > git status On branch master Initial commit Changes to be committed: (use "git rm cached <file>..." to unstage) new file: fileA.txt Untracked files: (use "git add <file>..." to include in what will be committed fileB.txt > git status short A fileA.txt ?? fileB.txt
- 20. ADD TO INDEX (STAGE, CACHE) objects - blob, tree, commit, tag type, size, content SHA-1 hash/checksum - 160-bit, 20 bytes 40 hexadecimal number - e.g. 8e4b68ee140cfbeaee5d38671cb03c83d1b6f2 default 7 shown- e.g. 8e4b68e minimum 4 required - e.g. 8e4b > git hashobject fileA.txt 8e4b68ee140cfbeaee5d38671cb03c83d1b6f2a4
- 21. .GIT AFTER INDEX CHANGE 1/4 > find .git/objects type f .git/objects/8e/4b68ee140cfbeaee5d38671cb03c83d1b6f2a4 > git add fileA.txt > find .git/objects type f .git/objects/8e/4b68ee140cfbeaee5d38671cb03c83d1b6f2a4 > tree aF .git
- 22. .GIT AFTER INDEX CHANGE 2/4 .git .git | HEAD | HEAD | branches/ | branches/ | config* | config* | description | description | hooks/ | hooks/ > | index | info/ | info/ | ` exclude | ` exclude | objects/ | objects/ > | | 8e/ > | | ` 4b68ee140cfbea | | info/ | | info/ | ` pack/ | ` pack/ ` refs/ ` refs/ | heads/ | heads/ ` tags/ ` tags/
- 23. .GIT AFTER INDEX CHANGE 3/4 > hexdump .git/objects/8e/4b68ee140cfbeaee5d38671cb03c83d1b6f2a 0000000 0178 ca4b 4fc9 3052 6634 4928 28ad 5471 gitcatfile Provide content or type and size information > git catfile p 8e4b68ee140cfbeaee5d38671cb03c83d1b6f2a4 textA line 1 > git catfile t 8e4b68ee140cfbeaee5d38671cb03c83d1b6f2a4 blob > git catfile s 8e4b68ee140cfbeaee5d38671cb03c83d1b6f2a4 13
- 24. .GIT AFTER INDEX CHANGE 4/4 > git hashobject fileA.txt 8e4b68ee140cfbeaee5d38671cb03c83d1b6f2a4 > git catfile t 8e4b68ee140cfbeaee5d38671cb03c83d1b6f2a4 blob > file .git/index .git/index: Git index, version 2, 1 entries > git lsfiles cached fileA.txt > find .git/objects type f | head n 5 .git/objects/8e/4b68ee140cfbeaee5d38671cb03c83d1b6f2a4
- 26. GIT OBJECTS: BLOB, TREE a blob object - content of a file no file name, time stamps, or other metadata a tree object - the equivalent of a directory describes a snapshot of the source tree names of blob and tree objects (type bits)
- 27. GIT OBJECTS: COMMIT a commit object links tree objects together into a history the name of a tree object (of the top-level source directory) a time stamp, a log message the names of zero or more parent commit objects
- 28. GIT OBJECTS: TAG a tag object a container that contains reference to another object and can hold additional meta-data
- 31. CONFIG --GLOBAL (USER) > cat ~/.gitconfig [user] email = mj@mj41.cz name = Michal Jurosz [alias] st = status ci = commit co = checkout br = branch > git config global user.email "mj@mj41.cz" > git config global user.name "Michal Jurosz" > cat ~/.gitconfig [user] email = mj@mj41.cz name = Michal Jurosz [alias] st = status
- 32. ci = commit co = checkout br = branch
- 33. CONFIG --LOCAL (DIRECTORY) > git config local gitcourseconf.localvar1 mj41 > git config gitcourseconf.localvar1 mj41 > grep gitcourseconf A 2 .git/config [gitcourseconf] localvar1 = mj41 > git config removesection gitcourseconf > grep gitcourseconf A 2 .git/config
- 36. FIRST COMMIT (FINALLY) > git commit m"commit 01 message" On branch master Untracked files: fileB.txt nothing added to commit but untracked files present > git log commit 7d6e09068aa3db89e331ab902a86438b4b929941 Author: Michal Jurosz <mj@mj41.cz> Date: Mon Jun 8 10:59:24 2015 0400 commit 01 message > git log oneline decorate 7d6e090 (HEAD, master) commit 01 message
- 38. .GIT AFTER FIRST COMMIT 1/5 > tree aF .git .git .git > | COMMIT_EDITMSG | HEAD | HEAD | branches/ | branches/ | config* | config* | description | description | hooks/ | hooks/ | index | index | info/ | info/ | ` exclude | ` exclude > | logs/ > | | HEAD > | ` refs/ > | ` heads/ > | ` master | objects/ | objects/
- 39. .GIT AFTER FIRST COMMIT 2/5 | objects/ | objects/ > | | 4a/ > | | ` f19c541178897f > | | 7d/ > | | ` 6e09068aa3db89 | | 8e/ | | 8e/ | | ` 4b68ee140cfbea | | ` 4b68ee140cfbea | | info/ | | info/ | ` pack/ | ` pack/ ` refs/ ` refs/ | heads/ | heads/ > | ` master ` tags/ ` tags/
- 40. .GIT AFTER FIRST COMMIT 3/5 > cat .git/COMMIT_EDITMSG commit 01 message > find .git/objects type f .git/objects/7d/6e09068aa3db89e331ab902a86438b4b929941 .git/objects/4a/f19c541178897fb76436c785b2b86d8e9fb9f7 .git/objects/8e/4b68ee140cfbeaee5d38671cb03c83d1b6f2a4
- 47. THIRD COMMIT 2/3 > git status On branch master Changes not staged for commit: (use "git add <file>..." to update what will be committed) (use "git checkout <file>..." to discard changes in workin modified: fileB.txt Untracked files: (use "git add <file>..." to include in what will be committed dirH/ no changes added to commit (use "git add" and/or "git commit a
- 48. THIRD COMMIT 3/3 > git add fileB.txt > git add dirH > git status On branch master Changes to be committed: (use "git reset HEAD <file>..." to unstage) new file: dirH/fileHC.txt modified: fileB.txt > git commit m"commit 03 message" [master fcb9538] commit 03 message 2 files changed, 2 insertions(+) create mode 100644 dirH/fileHC.txt
- 49. FOURTH COMMIT (-A) > echo "textHC line 2" >> dirH/fileHC.txt > git status On branch master Changes not staged for commit: (use "git add <file>..." to update what will be committed) (use "git checkout <file>..." to discard changes in workin modified: dirH/fileHC.txt no changes added to commit (use "git add" and/or "git commit a > git commit a m"commit 04 message" [master e4d63af] commit 04 message 1 file changed, 1 insertion(+)
- 50. CAT TREE (THE REAL ONE) 1/2 > git catfile t 2afe2cf674f123661ecbf68b698f1ffd4a1f5f23 tree > git catfile p 2afe2cf674f123661ecbf68b698f1ffd4a1f5f23 100644 blob 60d6882bff469b815a3ba2334520ee7987f0bc92 .gitign 040000 tree f584e5928a3315c4dc8dcf09b46d3e4d8d711f83 dirH 100644 blob 8e4b68ee140cfbeaee5d38671cb03c83d1b6f2a4 fileA.t 100644 blob 3d67da922cae213e0ba10593c31c763543c97fee fileB.t > git catfile t f584e5928a3315c4dc8dcf09b46d3e4d8d711f83 tree > git catfile p f584e5928a3315c4dc8dcf09b46d3e4d8d711f83 100644 blob 7dd188dd69574eee96bc02f5783a01eceb30f8c3 fileHC.
- 51. CAT TREE (THE REAL ONE) 2/2 > git catfile t 7dd188dd69574eee96bc02f5783a01eceb30f8c3 blob > git catfile p 7dd188dd69574eee96bc02f5783a01eceb30f8c3 textHC line 1 textHC line 2
- 52. CRYPTOGRAPHIC the last commit - sha1 cryptographic authentication of history commit -> working tree -> trees + blobs -> parent commit(s) -> working tree(s) ... ... the first commit (without any parent)
- 53. CLEAN INDEX > git status short > git lsfiles s 100644 60d6882bff469b815a3ba2334520ee7987f0bc92 0 .gitign 100644 7dd188dd69574eee96bc02f5783a01eceb30f8c3 0 dirH/fi 100644 8e4b68ee140cfbeaee5d38671cb03c83d1b6f2a4 0 fileA.t 100644 3d67da922cae213e0ba10593c31c763543c97fee 0 fileB.t > echo "textHC line 3" >> dirH/fileHC.txt > git add A ; git status short M dirH/fileHC.txt > git lsfiles s 100644 60d6882bff469b815a3ba2334520ee7987f0bc92 0 .gitign 100644 69694edab7d1f25fc6565ce60c6818dd615833e1 0 dirH/fi 100644 8e4b68ee140cfbeaee5d38671cb03c83d1b6f2a4 0 fileA.t 100644 3d67da922cae213e0ba10593c31c763543c97fee 0 fileB.t
- 55. PIT STOP 2 working dir, index, object database (repository) blob, tree, commit, tag master, HEAD Questions?
- 56. GARBAGE Garbage accumulates unless collected Periodic explicit object packing
- 57. OBJECTS (AFTER COMMITS) > find .git/objects type f | wc l 17 > du hs .git/objects 140K .git/objects > find .git/objects type f | head n 10 .git/objects/fc/b953879a566ea607d58948a0f520b1f75ad277 .git/objects/44/dba16a657baed8a09f68312c985dff84e3134c .git/objects/ec/23b35681d22f0c6d6f14572cab119bbebbac85 .git/objects/f5/84e5928a3315c4dc8dcf09b46d3e4d8d711f83 .git/objects/7d/d188dd69574eee96bc02f5783a01eceb30f8c3 .git/objects/7d/6e09068aa3db89e331ab902a86438b4b929941 .git/objects/e4/d63afacf3d1d5782aacc97158092b5e4a1b096 .git/objects/69/694edab7d1f25fc6565ce60c6818dd615833e1 .git/objects/8c/87fa6ad6c88318d1a528e99b810a6a49c65ffe .git/objects/4a/f19c541178897fb76436c785b2b86d8e9fb9f7
- 60. ADD AFTER GIT GC > echo "textA line 2" >> fileA.txt ; git add A > tree noreport aF .git | grep A 100 'objects/' | objects/ | | 69/ | | ` 694edab7d1f25fc6565ce60c6818dd615833e1 | | e3/ | | ` 1d478f6c73239c2452b571b9b07c33d568d330 | | info/ | | ` packs | ` pack/ | | packdf426cfa7c95a7dbaeca9659a3f9e11f4453a6f7.idx | ` packdf426cfa7c95a7dbaeca9659a3f9e11f4453a6f7.pack | packedrefs ` refs/ | heads/ ` tags/
- 62. GIT DIFF (INTRO)
- 66. GIT DIFF <REF1> <REF2> > git diff HEAD~3 HEAD~2 diff git a/.gitignore b/.gitignore new file mode 100644 index 0000000..60d6882 /dev/null +++ b/.gitignore @@ 0,0 +1,2 @@ +tmp/ +*.tmp diff git a/fileB.txt b/fileB.txt new file mode 100644 index 0000000..44dba16 /dev/null +++ b/fileB.txt @@ 0,0 +1 @@ +textB line 1
- 67. REVISIONS - <REV> 1/3 <sha1> - e.g. 8e4b68e <refname> - e.g. HEAD, master, origin/master .git/<refname> .git/refs<refname> .git/tags/<refname> .git/heads/<refname> .git/remotes/<refname> ... ...
- 68. REVISIONS - <REV> 2/3 <rev>~<n> - e.g. master~3 > git log n3 oneline decorate e4d63af (HEAD, master) commit 04 message fcb9538 commit 03 message ec23b35 (BRc2) commit 02 message > git revparse short HEAD ; git revparse short HEAD e4d63af e4d63af > git revparse short HEAD~2 ec23b35 > git catfile t ec23b35 commit
- 69. REVISIONS - <REV> 3/3 <rev>:<path>, e.g. HEAD:dirH/fileHC.txt > git revparse short HEAD~1:dirH/fileHC.txt 5df063b > git catfile t 5df063b blob
- 70. REVISIONS RANGES 1/3 <rev> - reachable from <rev> > git log oneline e4d63af commit 04 message fcb9538 commit 03 message ec23b35 commit 02 message 7d6e090 commit 01 message > git log HEAD~2 oneline ec23b35 commit 02 message 7d6e090 commit 01 message > git log 'master^{/commit 03}' oneline fcb9538 commit 03 message ec23b35 commit 02 message 7d6e090 commit 01 message
- 71. REVISIONS RANGES 2/3 <rev1>..<rev2> include commits reachable from <rev2> exclude commits reachable from <rev1> <rev1>...<rev2> include commits reachable from either <rev1> or <rev2> exclude reachable from both
- 73. GIT GREP look for specified patterns in the tracked files in the work tree blobs in given tree objects > git grep n 'line 3' fileA.txt:3:textA line 3 > git grep n e 'line 2' HEAD~1 HEAD~2 HEAD~1:fileB.txt:2:textB line 2
- 74. GIT GREP --CACHED look for specified patterns in the tracked files blobs registered in the index file > git grep n cached 'line 3' > git grep n cached 'line 2' dirH/fileHC.txt:2:textHC line 2 fileA.txt:2:textA line 2 fileB.txt:2:textB line 2
- 75. GIT LOG -- <PATHS> commits modifying the given are selected gitk -- <string> > git log oneline dirH e4d63af commit 04 message fcb9538 commit 03 message
- 76. GIT LOG -S <STRING> 1/2 ... introduce or remove an instance of <string> gitk -S <string>
- 77. GIT LOG -S <STRING> 2/2 > git log S 'line 2' oneline e4d63af commit 04 message fcb9538 commit 03 message > git show e4d63af commit e4d63afacf3d1d5782aacc97158092b5e4a1b096 Author: Michal Jurosz <mj@mj41.cz> Date: Mon Jun 8 10:59:25 2015 0400 commit 04 message diff git a/dirH/fileHC.txt b/dirH/fileHC.txt index 5df063b..7dd188d 100644 a/dirH/fileHC.txt +++ b/dirH/fileHC.txt @@ 1 +1,2 @@ textHC line 1 +textHC line 2
- 78. GIT BLAME last change of each line git gui blame > git blame dirH/fileHC.txt fcb95387 (Michal Jurosz 20150608 10:59:24 0400 1) textHC lin e4d63afa (Michal Jurosz 20150608 10:59:25 0400 2) textHC lin
- 79. RESET AND CHECKOUT the three trees working directory index HEAD
- 80. GIT RESET --HARD <REV> move HEAD (and the branch) reset index reset working tree
- 81. GIT RESET [--MIXED] <REV> move HEAD (and the branch) reset index reset working tree
- 82. GIT RESET --SOFT <REV> move HEAD (and the branch) reset index reset working tree
- 83. GIT CHECKOUT/RESET -- FILES
- 84. PIT STOP 3 git diff <rev> - sha1, HEAD, master, moje-branchA gitk, git gui blame git grep, git log -S 'use utf8', git blame git reset --hard Questions?
- 86. GIT CHECKOUT <BRANCH> move only HEAD (switch branch) reset index reset not modified files merge modified reset working tree reset not modified files merge modified
- 87. GIT CHECKOUT BRC2 1/2 > git branch v BRc2 ec23b35 commit 02 message * master e4d63af commit 04 message mjtest e4d63af commit 04 message > git reset hard master HEAD is now at e4d63af commit 04 message > cat fileA.txt textA line 1 > echo "textA line 2" >> fileA.txt > git add A > echo "textA line 3" >> fileA.txt
- 88. GIT CHECKOUT BRC2 2/2 > git checkout BRc2 Switched to branch 'BRc2' M fileA.txt > git status short MM fileA.txt > git diff cached | grep '+textA' +textA line 2 > git diff | grep '+textA' +textA line 3
- 90. CHECKOUT -B (NEW BRANCH) > git checkout b BRc2mod Switched to a new branch 'BRc2mod' M fileA.txt > git branch d BRc2pokus Deleted branch BRc2pokus (was ec23b35). > git branch v BRc2 ec23b35 commit 02 message * BRc2mod ec23b35 commit 02 message master e4d63af commit 04 message mjtest e4d63af commit 04 message
- 91. NEW BRANCH COMMITS 1/2 > git ci m"branch c2mod commit A" [BRc2mod 4956cc7] branch c2mod commit A 1 file changed, 1 insertion(+) > git ci a m"branch c2mod commit B" [BRc2mod b3c71e7] branch c2mod commit B 1 file changed, 1 insertion(+) > echo "textX line 1" >> fileX.txt > git add fileX.txt > git ci a m"branch c2mod commit C add fileX" [BRc2mod 791c5fe] branch c2mod commit C add fileX 1 file changed, 1 insertion(+) create mode 100644 fileX.txt
- 92. NEW BRANCH COMMITS 2/2 > git log all graph dateorder decorate oneline * 791c5fe (HEAD, BRc2mod) branch c2mod commit C add fileX * b3c71e7 branch c2mod commit B * 4956cc7 branch c2mod commit A | * e4d63af (mjtest, master) commit 04 message | * fcb9538 commit 03 message |/ * ec23b35 (BRc2) commit 02 message * 7d6e090 commit 01 message > git branch D mjtest Deleted branch mjtest (was e4d63af).
- 95. Upstream Origin Local repository Index (cache) Working directory
- 96. GITHUB a web-based hosting service 3.7M people, 7.1M repositories investment - July 2012, $100 million USD a pastebin-style site called Gist private US$7/month for five repositories up to US$200/month for 125 repositories Bitbucket, Gitorious, SourceForge, CodePlex, Google Code, Launchpad June 2013 A16Z
- 98. GIT REMOTE - ORIGIN > cd ~/gittt/repoMJ > git remote add origin file:///home/linus/gittt143377556443 > git push origin HEAD To file:///home/linus/gittt1433775564435/gittutorigin * [new branch] HEAD > master > git log decorate oneline b89ef4a (HEAD, origin/master, master) Merge branch 'BRc2mod' 791c5fe (BRc2mod) branch c2mod commit C add fileX b3c71e7 branch c2mod commit B 4956cc7 branch c2mod commit A e4d63af commit 04 message ec23b35 (BRc2) commit 02 message fcb9538 commit 03 message 7d6e090 commit 01 message
- 99. GIT FETCH > cd ~/gittt/repoMJ > git remote v origin file:///home/linus/gittt1433775564435/gittutorigin origin file:///home/linus/gittt1433775564435/gittutorigin gitfetch Download objects and refs from another repository > git fetch
- 100. [PEPA] GIT CLONE 1/2 > cd ~/gittt > git clone file:///home/linus/gittt1433775564435/gittutor Cloning into 'repoPepy'... > cd repoPepy > git remote v origin file:///home/linus/gittt1433775564435/gittutorigin origin file:///home/linus/gittt1433775564435/gittutorigin > ls dirH fileA.txt fileB.txt fileX.txt
- 101. [PEPA] GIT CLONE 2/2 > ls dirH fileA.txt fileB.txt fileX.txt > git branch a * master remotes/origin/HEAD > origin/master remotes/origin/master
- 103. GIT REMOTE - UPSTREAM > cd ../repoMJ > git remote add upstream git@github.com:mj41/gitfsdvcsup.git > git fetch upstream
- 104. GIT REMOTE - CONFIGURATION > git remote v origin file:///home/linus/gittt1433775564435/gittutorigin origin file:///home/linus/gittt1433775564435/gittutorigin upstream git@github.com:mj41/gitfsdvcsup.git (fetch) upstream git@github.com:mj41/gitfsdvcsup.git (push) > git config local list | grep remote remote.origin.url=file:///home/linus/gittt1433775564435/git remote.origin.fetch=+refs/heads/*:refs/remotes/origin/* remote.upstream.url=git@github.com:mj41/gitfsdvcsup.git remote.upstream.fetch=+refs/heads/*:refs/remotes/upstream/*
- 106. GIT PUSH --FORCE please no to master your topic branche use fixups do it once before merging
- 108. GIT RESET --HARD ORIGIN/... 1/2 > cd ../repoMJ > git checkout master Switched to branch 'master' > git log decorate oneline all graph | head n5 * 957ee02 (origin/BRnp, BRnp) branch np commit k * b89ef4a (HEAD, origin/master, master) Merge branch 'BRc2mo | | * 791c5fe (BRc2mod) branch c2mod commit C add fileX | * b3c71e7 branch c2mod commit B
- 109. GIT RESET --HARD ORIGIN/... 2/2 > git reset hard origin/BRnp HEAD is now at 957ee02 branch np commit k > git log decorate oneline all graph | head n5 * 957ee02 (HEAD, origin/BRnp, master, BRnp) branch np commit k * b89ef4a (origin/master) Merge branch 'BRc2mod' | | * 791c5fe (BRc2mod) branch c2mod commit C add fileX | * b3c71e7 branch c2mod commit B > git push origin HEAD To file:///home/linus/gittt1433775564435/gittutorigin b89ef4a..957ee02 HEAD > master
- 110. PIT STOP 4 git checkout remote repositories git push git fetch Questions?
- 111. GUI gitk --all --date-order git gui git gui blame Windows: TortoiseGit MAC: GitX, GitNub
- 112. GIT MORE 1/2 git clean git commit --amend git ci --fixup git rebase -i git cherry-pick git revert git tag
- 113. GIT MORE 2/2 git bisec git reflog git filter-branch git gc git fsck ...
- 114. LINKS Pro Git, Scott Chacon license - Czech translation git-scm.com CC BY 3.0 knihy.nic.cz git-cheatsheet
- 115. THANK YOU Michal Jurosz (mj41) www.GoodData.com Generated from source by inside . Powered by . github.com/mj41/git-course-mj41 Presentation::Builder prbuilder Docker container reveal.js
- 116. QUESTIONS?