What's the difference between HEAD, working tr

问题:

Can someone tell me the difference between HEAD, working tree and index, in Git?

From what I understand, they are all names for different branches. Is my assumption correct?

---

Edit

I found this

A single git repository can track an arbitrary number of branches, but your working tree is associated with just one of them (the \"current\" or \"checked out\" branch), and HEAD points to that branch.

Does this mean that HEAD and working tree are always the same?

回答1:

A few other good references on those topics:

• My Git Workflow

I use the index as a checkpoint.

When I\'m about to make a change that might go awry — when I want to explore some direction that I\'m not sure if I can follow through on or even whether it\'s a good idea, such as a conceptually demanding refactoring or changing a representation type — I checkpoint my work into the index. If this is the first change I\'ve made since my last commit, then I can use the local repository as a checkpoint, but often I\'ve got one conceptual change that I\'m implementing as a set of little steps. I want to checkpoint after each step, but save the commit until I\'ve gotten back to working, tested code.

Notes:

1. the workspace is the directory tree of (source) files that you see and edit.

2. The index is a single, large, binary file in <baseOfRepo>/.git/index, which lists all files in the current branch, their sha1 checksums, time stamps and the file name -- it is not another directory with a copy of files in it.

3. The local repository is a hidden directory (.git) including an objects directory containing all versions of every file in the repo (local branches and copies of remote branches) as a compressed \"blob\" file.

Don\'t think of the four \'disks\' represented in the image above as separate copies of the repo files.

• Why Git is better than X

• Git Is Your Friend not a Foe Vol. 3: Refs and Index

They are basically named references for Git commits. There are two major types of refs: tags and heads.

• Tags are fixed references that mark a specific point in history, for example v2.6.29.
• On the contrary, heads are always moved to reflect the current position of project development.

(note: as commented by Timo Huovinen, those arrows are not what the commits point to, it\'s the workflow order, basically showing arrows as 1 -> 2 -> 3 -> 4 where 1 is the first commit and 4 is the last)

Now we know what is happening in the project.
But to know what is happening right here, right now there is a special reference called HEAD. It serves two major purposes:

• it tells Git which commit to take files from when you checkout, and
• it tells Git where to put new commits when you commit.

When you run git checkout ref it points HEAD to the ref you’ve designated and extracts files from it. When you run git commit it creates a new commit object, which becomes a child of current HEAD. Normally HEAD points to one of the heads, so everything works out just fine.

回答2:

The difference between HEAD (current branch or last committed state on current branch), index (aka. staging area) and working tree (the state of files in checkout) is described in \"The Three States\" section of the \"1.3 Git Basics\" chapter of Pro Git book by Scott Chacon (Creative Commons licensed).

Here is the image illustrating it from this chapter:

In the above image \"working directory\" is the same as \"working tree\", the \"staging area\" is an alternate name for git \"index\", and HEAD points to currently checked out branch, which tip points to last commit in the \"git directory (repository)\"

Note that git commit -a would stage changes and commit in one step.

回答3:

Your working tree is what is actually in the files that you are currently working on. HEAD is a pointer to the branch or commit that you last checked out, and which will be the parent of a new commit if you make it. For instance, if you\'re on the master branch, then HEAD will point to master, and when you commit, that new commit will be a descendent of the revision that master pointed to, and master will be updated to point to the new commit.

The index is a staging area where the new commit is prepared. Essentially, the contents of the index are what will go into the new commit (though if you do git commit -a, this will automatically add all changes to files that Git knows about to the index before committing, so it will commit the current contents of your working tree). git add will add or update files from the working tree into your index.

回答4:

Working tree

Your working tree are the files that you are currently working on.

Git index

• The git \"index\" is where you place files you want committed to the git repository.

• The index is also known as cache, directory cache, current directory cache, staging area, staged files.

• Before you \"commit\" (checkin) files to the git repository, you need to first place the files in the git \"index\".

• The index is not the working directory: you can type a command such as git status, and git will tell you what files in your working directory have been added to the git index (for example, by using the git add filename command).

• The index is not the git repository: files in the git index are files that git would commit to the git repository if you used the git commit command.