Skip to content

Conversation

edenhochbaum
Copy link
Contributor

"A single tree object contains one or more tree entries"

The language suggests that each tree object contains (at least one) reference to another tree object, which is wrong.

> "A single tree object contains one or more tree entries"

The language suggests that each tree object contains (at least one) reference to another tree object, which is wrong.
Git stores content in a manner similar to a UNIX filesystem, but a bit simplified.
All the content is stored as tree and blob objects, with trees corresponding to UNIX directory entries and blobs corresponding more or less to inodes or file contents.
A single tree object contains one or more tree entries, each of which contains a SHA-1 pointer to a blob or subtree with its associated mode, type, and filename.
A single tree object contains one or more entries, each containing a SHA-1 pointer to a blob or subtree with its associated mode, type, and filename.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How about "…each of which is the SHA-1 hash of a blob or subtree…"

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some options (bolding wouldn't go in):

  1. A single tree object contains one or more tree entries, each of which is the SHA-1 hash of a blob or subtree with its associated mode, type, and filename.

  2. A single tree object contains one or more entries, each of which is the SHA-1 hash of a blob or subtree with its associated mode, type, and filename.

  3. [no change to original copy]

  4. [pull request]

I'd be happy with any. I think you're suggesting 2?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, 2 seems like the most correct.

@ben
Copy link
Member

ben commented Jul 13, 2018

@ben ben merged commit 8d8780b into progit:master Jul 13, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants