git : part 1 overview & object model

42
Git: Part 1 Overview & Object Model These slides were largely cut-and-pasted from http://excess.org/article/2008/07/ogre-git-tuto rial/ , with some additions from other sources. I have deleted a lot from the cited tutorial, and recommend that you listen to the entire tutorial on line, if you can.

Upload: talmai

Post on 23-Feb-2016

42 views

Category:

Documents


0 download

DESCRIPTION

Git : Part 1 Overview & Object Model. - PowerPoint PPT Presentation

TRANSCRIPT

Page 1: Git : Part 1 Overview & Object Model

Git: Part 1Overview & Object Model

These slides were largely cut-and-pasted from http://excess.org/article/2008/07/ogre-git-tutorial/ ,

with some additions from other sources. I have deleted a lot from the cited tutorial, and recommend

that you listen to the entire tutorial on line, if you can.

Page 2: Git : Part 1 Overview & Object Model

Who needs Git?

http://www.geekherocomic.com/2009/01/26/who-needs-git/

Page 3: Git : Part 1 Overview & Object Model

Topics• What is Git?• SCM concepts used in Git• Git object model• Representation of Git objects as files• References

Page 4: Git : Part 1 Overview & Object Model

Git• A collection of tools developed by Linux

kernel group for SCM– Now used by several other groups, and

apparently growing in popularity• Actually implements a replicated

versioned file system• Can be used to implement a variety of

software configuration management models and workflows

Page 5: Git : Part 1 Overview & Object Model

Git Flavor• A collection of many tools• Evolved from scripts• Suited to a C programmer’s mentality• Everything is exposed and accessible• Very flexible– You can do anything the model permits– Including shooting yourself in the foot

• Need to understand the underlying model

Page 6: Git : Part 1 Overview & Object Model

Git has a lot of commands• Learn a core subset of them• And one of the GUI tools (e.g., gitk)• Then learn the rest as you need them

Page 7: Git : Part 1 Overview & Object Model

Groups of Git commands• Setup and branch management– init, checkout, branch

• Modify– add, delete, rename, commit

• Get information– status, diff, log

• Create reference points– tag, branch

Page 8: Git : Part 1 Overview & Object Model

Source codecontains– Directories– Files

is the substance of a software configurationhttp://edgyu.excess.org/git-tutorial/2008-07-09/intro-to-git.pdf

Page 9: Git : Part 1 Overview & Object Model

RepositoryContains– files– commits

records history of changes to configurationhttp://edgyu.excess.org/git-tutorial/2008-07-09/intro-to-git.pdf

Page 10: Git : Part 1 Overview & Object Model

RepositoryContains– files– commits– ancestry relationships

http://edgyu.excess.org/git-tutorial/2008-07-09/intro-to-git.pdf

Page 11: Git : Part 1 Overview & Object Model

Ancestry relationshipsform a directed acyclic graph

(DAG)

http://edgyu.excess.org/git-tutorial/2008-07-09/intro-to-git.pdf

Page 12: Git : Part 1 Overview & Object Model

Ancestry graph featuresTags– identify versions of interest– including “releases”

http://edgyu.excess.org/git-tutorial/2008-07-09/intro-to-git.pdf

Page 13: Git : Part 1 Overview & Object Model

Ancestry graph features

HEAD– is current checkout– usually points to a branch

http://edgyu.excess.org/git-tutorial/2008-07-09/intro-to-git.pdf

Page 14: Git : Part 1 Overview & Object Model

Head may point to any commit In this case it is

said to be detached.

http://edgyu.excess.org/git-tutorial/2008-07-09/intro-to-git.pdf

Page 15: Git : Part 1 Overview & Object Model

Git componentsIndex– “staging area”– what is to be

committed

http://edgyu.excess.org/git-tutorial/2008-07-09/intro-to-git.pdf

Page 16: Git : Part 1 Overview & Object Model

History

A database, stored in directory “.git”.http://edgyu.excess.org/git-tutorial/2008-07-09/intro-to-git.pdf

Page 17: Git : Part 1 Overview & Object Model

Staging area

Also stored in directory “.git”.http://edgyu.excess.org/git-tutorial/2008-07-09/intro-to-git.pdf

Page 18: Git : Part 1 Overview & Object Model

Files you edit

Stored in the directory containing directory “.git”.

http://edgyu.excess.org/git-tutorial/2008-07-09/intro-to-git.pdf

Page 19: Git : Part 1 Overview & Object Model

Staging

add

http://edgyu.excess.org/git-tutorial/2008-07-09/intro-to-git.pdf

Page 20: Git : Part 1 Overview & Object Model

Committing

commit

http://edgyu.excess.org/git-tutorial/2008-07-09/intro-to-git.pdf

Page 21: Git : Part 1 Overview & Object Model

Checking out

checkout checkout

http://edgyu.excess.org/git-tutorial/2008-07-09/intro-to-git.pdf

Page 22: Git : Part 1 Overview & Object Model

Local Operations

add (stage) files

Working directory

Repository(.git directory)

Index (staging

area)

checkout the project

commit

Page 23: Git : Part 1 Overview & Object Model

Object types• Blobs• Trees• Commits• Tags

Page 24: Git : Part 1 Overview & Object Model

Git Object Model

http://book.git-scm.com/assets/images/figure/objects-example.png

Page 25: Git : Part 1 Overview & Object Model

As UML class diagram

http://utsl.gen.nz/talks/git-svn/git-model.png

Page 26: Git : Part 1 Overview & Object Model

Repository

Page 27: Git : Part 1 Overview & Object Model

.git/objects|-- 23| ‘-- d4bd826aba9e29aaace9411cc175b784edc399|-- 76| ‘-- 49f82d40a98b1ba59057798e47aab2a99a11d3|-- c4| ‘-- aaefaa8a48ad4ad379dc1002b78f1a3e4ceabc|-- e7| ‘-- 4be61128eef713459ca4e32398d689fe80864e|-- info| ‘-- packs‘-- pack |-- pack-b7b026b1a0b0f193db9dea0b0d7367d25d3a68cc.idx ‘-- pack-b7b026b1a0b0f193db9dea0b0d7367d25d3a68cc.pack

loose

Page 28: Git : Part 1 Overview & Object Model

Some other repository files• .git/config• .git/description – used by gitweb• .git/info/exclude – files to ignore• ...

Page 29: Git : Part 1 Overview & Object Model

Repository object naming convention

“content addressable” (hashed)

http://edgyu.excess.org/git-tutorial/2008-07-09/intro-to-git.pdf

Page 30: Git : Part 1 Overview & Object Model

Data values determine hash

http://edgyu.excess.org/git-tutorial/2008-07-09/intro-to-git.pdf

Page 31: Git : Part 1 Overview & Object Model

Hash value is filename

http://edgyu.excess.org/git-tutorial/2008-07-09/intro-to-git.pdf

Page 32: Git : Part 1 Overview & Object Model

File contains data

http://edgyu.excess.org/git-tutorial/2008-07-09/intro-to-git.pdf

Page 33: Git : Part 1 Overview & Object Model

Blobs

http://edgyu.excess.org/git-tutorial/2008-07-09/intro-to-git.pdf

Page 34: Git : Part 1 Overview & Object Model

Trees

http://edgyu.excess.org/git-tutorial/2008-07-09/intro-to-git.pdf

Page 35: Git : Part 1 Overview & Object Model

Trees

http://edgyu.excess.org/git-tutorial/2008-07-09/intro-to-git.pdf

Page 36: Git : Part 1 Overview & Object Model

Trees

http://edgyu.excess.org/git-tutorial/2008-07-09/intro-to-git.pdf

Page 37: Git : Part 1 Overview & Object Model

Commits

http://edgyu.excess.org/git-tutorial/2008-07-09/intro-to-git.pdf

Page 38: Git : Part 1 Overview & Object Model

Commits

http://edgyu.excess.org/git-tutorial/2008-07-09/intro-to-git.pdf

Page 39: Git : Part 1 Overview & Object Model

Commits

http://edgyu.excess.org/git-tutorial/2008-07-09/intro-to-git.pdf

Page 40: Git : Part 1 Overview & Object Model

Commits

http://edgyu.excess.org/git-tutorial/2008-07-09/intro-to-git.pdf

Page 41: Git : Part 1 Overview & Object Model

Objects are immutable

http://edgyu.excess.org/git-tutorial/2008-07-09/intro-to-git.pdf