{"thread":{"id":"33516","subject":"[PATCH v3 0/4] Some small fixes to glossary-content.txt","startedAt":"2013-04-15T17:45:02Z","lastAt":"2013-04-16T07:10:32Z","messageCount":10,"participants":["Thomas Ackermann","Junio C Hamano","Michael Haggerty"],"isPatch":true,"patchVersion":3,"patchTotal":4},"messages":[{"id":"214340","messageId":"46832203.996447.1366047902197.JavaMail.ngmail@webmail19.arcor-online.net","threadId":"33516","inReplyTo":null,"subject":"[PATCH v3 0/4] Some small fixes to glossary-content.txt","fromName":"Thomas Ackermann","fromEmail":"th.acker@arcor.de","sentAt":"2013-04-15T17:45:02Z","receivedAt":"2013-04-15T17:45:02Z","isPatch":true,"sender":{"key":"th.acker@arcor.de","avatar":"https://avatars.githubusercontent.com/u/1358536?v=4"},"body":"This is another reroll of my patches for glossary-content.txt.\n\n- The first patch is the same as in v2.\n- The second patch only adds the log message which Junio suggested and a missing full stop.\n- The third patch is new and is a direct consequence of the second patch.\n- In the fourth patch there is an explanation in the log message why the exact definition of \n  \"refspec\" can be omitted in the glossary. The definition of \"pathspec\" is kept in the glossary; \n  there are only small improvements to wording and formatting.\n\n[PATCH v3 1/4] glossary: remove outdated/misleading/irrelevant entries\n[PATCH v3 2/4] glossary: improve description of SHA-1 related topics\n[PATCH v3 3/4] The name of the hash function is \"SHA-1\", not \"SHA1\"\n[PATCH v3 4/4] glossary: improve definitions of refspec and pathspec\n\n\n---\nThomas\n"},{"id":"214341","messageId":"1456791522.996464.1366048016249.JavaMail.ngmail@webmail19.arcor-online.net","threadId":"33516","inReplyTo":"46832203.996447.1366047902197.JavaMail.ngmail@webmail19.arcor-online.net","subject":"[PATCH v3 1/4] glossary: remove outdated/misleading/irrelevant entries","fromName":"Thomas Ackermann","fromEmail":"th.acker@arcor.de","sentAt":"2013-04-15T17:46:56Z","receivedAt":"2013-04-15T17:46:56Z","isPatch":true,"sender":{"key":"th.acker@arcor.de","avatar":"https://avatars.githubusercontent.com/u/1358536?v=4"},"body":"\nSigned-off-by: Thomas Ackermann <th.acker@arcor.de>\n---\n Documentation/glossary-content.txt | 11 +----------\n 1 file changed, 1 insertion(+), 10 deletions(-)\n\ndiff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt\nindex eb7ba84..5a7a486 100644\n--- a/Documentation/glossary-content.txt\n+++ b/Documentation/glossary-content.txt\n@@ -104,9 +104,6 @@ to point at the new commit.\n \tan arbitrary <<def_commit,commit>> that isn't necessarily the tip of any\n \tparticular branch.  In this case HEAD is said to be \"detached\".\n \n-[[def_dircache]]dircache::\n-\tYou are *waaaaay* behind. See <<def_index,index>>.\n-\n [[def_directory]]directory::\n \tThe list you get with \"ls\" :-)\n \n@@ -115,11 +112,6 @@ to point at the new commit.\n \tit contains modifications which have not been <<def_commit,committed>> to the current\n \t<<def_branch,branch>>.\n \n-[[def_ent]]ent::\n-\tFavorite synonym to \"<<def_tree-ish,tree-ish>>\" by some total geeks. See\n-\thttp://en.wikipedia.org/wiki/Ent_(Middle-earth) for an in-depth\n-\texplanation. Avoid this term, not to confuse people.\n-\n [[def_evil_merge]]evil merge::\n \tAn evil merge is a <<def_merge,merge>> that introduces changes that\n \tdo not appear in any <<def_parent,parent>>.\n@@ -257,8 +249,7 @@ This commit is referred to as a \"merge commit\", or sometimes just a\n \t<<def_object,object>>.\n \n [[def_octopus]]octopus::\n-\tTo <<def_merge,merge>> more than two <<def_branch,branches>>. Also denotes an\n-\tintelligent predator.\n+\tTo <<def_merge,merge>> more than two <<def_branch,branches>>.\n \n [[def_origin]]origin::\n \tThe default upstream <<def_repository,repository>>. Most projects have\n-- \n1.8.1.msysgit.1\n\n\n---\nThomas\n"},{"id":"214342","messageId":"1848754258.996495.1366048070468.JavaMail.ngmail@webmail19.arcor-online.net","threadId":"33516","inReplyTo":"46832203.996447.1366047902197.JavaMail.ngmail@webmail19.arcor-online.net","subject":"[PATCH v3 2/4] glossary: improve description of SHA-1 related topics","fromName":"Thomas Ackermann","fromEmail":"th.acker@arcor.de","sentAt":"2013-04-15T17:47:50Z","receivedAt":"2013-04-15T17:47:50Z","isPatch":true,"sender":{"key":"th.acker@arcor.de","avatar":"https://avatars.githubusercontent.com/u/1358536?v=4"},"body":"\nThe name of the hash function is \"SHA-1\", not \"SHA1\".\n\nAlso to people who look up \"object name\" in the glossary,\nthe details of which hash function is applied on what to\ncompute \"object name\" is not important but the fact that the\nname is meant to be an unique identifier for the contents\nstored in the object is.\n\nSigned-off-by: Thomas Ackermann <th.acker@arcor.de>\n---\n Documentation/glossary-content.txt | 20 ++++++++++----------\n 1 file changed, 10 insertions(+), 10 deletions(-)\n\ndiff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt\nindex 5a7a486..2734947 100644\n--- a/Documentation/glossary-content.txt\n+++ b/Documentation/glossary-content.txt\n@@ -153,7 +153,7 @@ to point at the new commit.\n \tcreated. Configured via the `.git/info/grafts` file.\n \n [[def_hash]]hash::\n-\tIn Git's context, synonym to <<def_object_name,object name>>.\n+\tIn Git's context, synonym for <<def_object_name,object name>>.\n \n [[def_head]]head::\n \tA <<def_ref,named reference>> to the <<def_commit,commit>> at the tip of a\n@@ -225,7 +225,7 @@ This commit is referred to as a \"merge commit\", or sometimes just a\n \n [[def_object]]object::\n \tThe unit of storage in Git. It is uniquely identified by the\n-\t<<def_SHA1,SHA1>> of its contents. Consequently, an\n+\t<<def_SHA1,SHA-1>> of its contents. Consequently, an\n \tobject can not be changed.\n \n [[def_object_database]]object database::\n@@ -237,10 +237,9 @@ This commit is referred to as a \"merge commit\", or sometimes just a\n \tSynonym for <<def_object_name,object name>>.\n \n [[def_object_name]]object name::\n-\tThe unique identifier of an <<def_object,object>>. The <<def_hash,hash>>\n-\tof the object's contents using the Secure Hash Algorithm\n-\t1 and usually represented by the 40 character hexadecimal encoding of\n-\tthe <<def_hash,hash>> of the object.\n+\tThe unique identifier of an <<def_object,object>>.  The\n+\tobject name is usually represented by a 40 character\n+\thexadecimal string.  Also colloquially called <<def_SHA1,SHA-1>>.\n \n [[def_object_type]]object type::\n \tOne of the identifiers \"<<def_commit_object,commit>>\",\n@@ -376,7 +375,7 @@ should not be combined with other pathspec.\n \tto the result.\n \n [[def_ref]]ref::\n-\tA 40-byte hex representation of a <<def_SHA1,SHA1>> or a name that\n+\tA 40-byte hex representation of a <<def_SHA1,SHA-1>> or a name that\n \tdenotes a particular <<def_object,object>>. They may be stored in\n \ta file under `$GIT_DIR/refs/` directory, or\n \tin the `$GIT_DIR/packed-refs` file.\n@@ -432,8 +431,9 @@ should not be combined with other pathspec.\n [[def_SCM]]SCM::\n \tSource code management (tool).\n \n-[[def_SHA1]]SHA1::\n-\tSynonym for <<def_object_name,object name>>.\n+[[def_SHA1]]SHA-1::\n+\t\"Secure Hash Algorithm 1\"; a cryptographic hash function. \n+\tIn the context of Git used as a synonym for <<def_object_name,object name>>.\n \n [[def_shallow_repository]]shallow repository::\n \tA shallow <<def_repository,repository>> has an incomplete\n@@ -447,7 +447,7 @@ should not be combined with other pathspec.\n \tits history can be later deepened with linkgit:git-fetch[1].\n \n [[def_symref]]symref::\n-\tSymbolic reference: instead of containing the <<def_SHA1,SHA1>>\n+\tSymbolic reference: instead of containing the <<def_SHA1,SHA-1>>\n \tid itself, it is of the format 'ref: refs/some/thing' and when\n \treferenced, it recursively dereferences to this reference.\n \t'<<def_HEAD,HEAD>>' is a prime example of a symref. Symbolic\n-- \n1.8.1.msysgit.1\n\n\n---\nThomas\n"},{"id":"214343","messageId":"1781595479.996520.1366048144788.JavaMail.ngmail@webmail19.arcor-online.net","threadId":"33516","inReplyTo":"46832203.996447.1366047902197.JavaMail.ngmail@webmail19.arcor-online.net","subject":"[PATCH v3 3/4] The name of the hash function is \"SHA-1\", not \"SHA1\"","fromName":"Thomas Ackermann","fromEmail":"th.acker@arcor.de","sentAt":"2013-04-15T17:49:04Z","receivedAt":"2013-04-15T17:49:04Z","isPatch":true,"sender":{"key":"th.acker@arcor.de","avatar":"https://avatars.githubusercontent.com/u/1358536?v=4"},"body":"\nUse \"SHA-1\" instead of \"SHA1\" whenever we talk about the hash function.\nWhen used as a programming symbol, we keep \"SHA1\".\n\nSigned-off-by: Thomas Ackermann <th.acker@arcor.de>\n---\n Documentation/config.txt                              |  2 +-\n Documentation/git-cat-file.txt                        |  6 +++---\n Documentation/git-describe.txt                        |  2 +-\n Documentation/git-fsck.txt                            |  4 ++--\n Documentation/git-index-pack.txt                      |  2 +-\n Documentation/git-ls-files.txt                        |  2 +-\n Documentation/git-merge-index.txt                     |  2 +-\n Documentation/git-pack-objects.txt                    |  2 +-\n Documentation/git-patch-id.txt                        |  2 +-\n Documentation/git-replace.txt                         |  4 ++--\n Documentation/git-rev-parse.txt                       |  4 ++--\n Documentation/git-show-branch.txt                     |  4 ++--\n Documentation/git-show-index.txt                      |  2 +-\n Documentation/git-show-ref.txt                        |  4 ++--\n Documentation/git-tag.txt                             |  2 +-\n Documentation/git-update-index.txt                    |  2 +-\n Documentation/git-verify-pack.txt                     |  4 ++--\n Documentation/git-verify-tag.txt                      |  2 +-\n Documentation/git.txt                                 | 10 +++++-----\n Documentation/gitcore-tutorial.txt                    |  8 ++++----\n Documentation/gitdiffcore.txt                         |  2 +-\n Documentation/githooks.txt                            | 10 +++++-----\n Documentation/gitrepository-layout.txt                |  2 +-\n Documentation/gittutorial-2.txt                       | 16 ++++++++--------\n Documentation/howto/recover-corrupted-blob-object.txt |  6 +++---\n Documentation/pretty-formats.txt                      |  2 +-\n Documentation/revisions.txt                           |  4 ++--\n Documentation/technical/api-sha1-array.txt            |  4 ++--\n Documentation/technical/pack-format.txt               | 14 +++++++-------\n Documentation/technical/pack-heuristics.txt           |  2 +-\n Documentation/technical/shallow.txt                   |  4 ++--\n 31 files changed, 68 insertions(+), 68 deletions(-)\n\ndiff --git a/Documentation/config.txt b/Documentation/config.txt\nindex 3d750e0..5123636 100644\n--- a/Documentation/config.txt\n+++ b/Documentation/config.txt\n@@ -412,7 +412,7 @@ repository's usual working tree).\n core.logAllRefUpdates::\n \tEnable the reflog. Updates to a ref <ref> is logged to the file\n \t\"$GIT_DIR/logs/<ref>\", by appending the new and old\n-\tSHA1, the date/time and the reason of the update, but\n+\tSHA-1, the date/time and the reason of the update, but\n \tonly when the file exists.  If this configuration\n \tvariable is set to true, missing \"$GIT_DIR/logs/<ref>\"\n \tfile is automatically created for branch heads (i.e. under\ndiff --git a/Documentation/git-cat-file.txt b/Documentation/git-cat-file.txt\nindex 2fb95bb..30d585a 100644\n--- a/Documentation/git-cat-file.txt\n+++ b/Documentation/git-cat-file.txt\n@@ -20,7 +20,7 @@ object type, or '-s' is used to find the object size, or '--textconv' is used\n (which implies type \"blob\").\n \n In the second form, a list of objects (separated by linefeeds) is provided on\n-stdin, and the SHA1, type, and size of each object is printed on stdout.\n+stdin, and the SHA-1, type, and size of each object is printed on stdout.\n \n OPTIONS\n -------\n@@ -58,11 +58,11 @@ OPTIONS\n \tto apply the filter to the content recorded in the index at <path>.\n \n --batch::\n-\tPrint the SHA1, type, size, and contents of each object provided on\n+\tPrint the SHA-1, type, size, and contents of each object provided on\n \tstdin. May not be combined with any other options or arguments.\n \n --batch-check::\n-\tPrint the SHA1, type, and size of each object provided on stdin. May not\n+\tPrint the SHA-1, type, and size of each object provided on stdin. May not\n \tbe combined with any other options or arguments.\n \n OUTPUT\ndiff --git a/Documentation/git-describe.txt b/Documentation/git-describe.txt\nindex 3c81e85..28e5ec0 100644\n--- a/Documentation/git-describe.txt\n+++ b/Documentation/git-describe.txt\n@@ -149,7 +149,7 @@ is found, its name will be output and searching will stop.\n If an exact match was not found, 'git describe' will walk back\n through the commit history to locate an ancestor commit which\n has been tagged.  The ancestor's tag will be output along with an\n-abbreviation of the input committish's SHA1.\n+abbreviation of the input committish's SHA-1.\n \n If multiple tags were found during the walk then the tag which\n has the fewest commits different from the input committish will be\ndiff --git a/Documentation/git-fsck.txt b/Documentation/git-fsck.txt\nindex eff9188..e5878bd 100644\n--- a/Documentation/git-fsck.txt\n+++ b/Documentation/git-fsck.txt\n@@ -23,7 +23,7 @@ OPTIONS\n \tAn object to treat as the head of an unreachability trace.\n +\n If no objects are given, 'git fsck' defaults to using the\n-index file, all SHA1 references in `refs` namespace, and all reflogs\n+index file, all SHA-1 references in `refs` namespace, and all reflogs\n (unless --no-reflogs is given) as heads.\n \n --unreachable::\n@@ -89,7 +89,7 @@ index file, all SHA1 references in `refs` namespace, and all reflogs\n DISCUSSION\n ----------\n \n-git-fsck tests SHA1 and general object sanity, and it does full tracking\n+git-fsck tests SHA-1 and general object sanity, and it does full tracking\n of the resulting reachability and everything else. It prints out any\n corruption it finds (missing or bad objects), and if you use the\n '--unreachable' flag it will also print out objects that exist but that\ndiff --git a/Documentation/git-index-pack.txt b/Documentation/git-index-pack.txt\nindex 36adc5f..bde8eec 100644\n--- a/Documentation/git-index-pack.txt\n+++ b/Documentation/git-index-pack.txt\n@@ -89,7 +89,7 @@ Note\n ----\n \n Once the index has been created, the list of object names is sorted\n-and the SHA1 hash of that list is printed to stdout. If --stdin was\n+and the SHA-1 hash of that list is printed to stdout. If --stdin was\n also used then this is prefixed by either \"pack\\t\", or \"keep\\t\" if a\n new .keep file was successfully created. This is useful to remove a\n .keep file used as a lock to prevent the race with 'git repack'\ndiff --git a/Documentation/git-ls-files.txt b/Documentation/git-ls-files.txt\nindex 0bdebff..c0856a6 100644\n--- a/Documentation/git-ls-files.txt\n+++ b/Documentation/git-ls-files.txt\n@@ -164,7 +164,7 @@ which case it outputs:\n 'git ls-files --unmerged' and 'git ls-files --stage' can be used to examine\n detailed information on unmerged paths.\n \n-For an unmerged path, instead of recording a single mode/SHA1 pair,\n+For an unmerged path, instead of recording a single mode/SHA-1 pair,\n the index records up to three such pairs; one from tree O in stage\n 1, A in stage 2, and B in stage 3.  This information can be used by\n the user (or the porcelain) to see what should eventually be recorded at the\ndiff --git a/Documentation/git-merge-index.txt b/Documentation/git-merge-index.txt\nindex 0c80cec..02676fb 100644\n--- a/Documentation/git-merge-index.txt\n+++ b/Documentation/git-merge-index.txt\n@@ -14,7 +14,7 @@ SYNOPSIS\n DESCRIPTION\n -----------\n This looks up the <file>(s) in the index and, if there are any merge\n-entries, passes the SHA1 hash for those files as arguments 1, 2, 3 (empty\n+entries, passes the SHA-1 hash for those files as arguments 1, 2, 3 (empty\n argument if no file), and <file> as argument 4.  File modes for the three\n files are passed as arguments 5, 6 and 7.\n \ndiff --git a/Documentation/git-pack-objects.txt b/Documentation/git-pack-objects.txt\nindex 69c9313..d94edcd 100644\n--- a/Documentation/git-pack-objects.txt\n+++ b/Documentation/git-pack-objects.txt\n@@ -50,7 +50,7 @@ base-name::\n \tWrite into a pair of files (.pack and .idx), using\n \t<base-name> to determine the name of the created file.\n \tWhen this option is used, the two files are written in\n-\t<base-name>-<SHA1>.{pack,idx} files.  <SHA1> is a hash\n+\t<base-name>-<SHA-1>.{pack,idx} files.  <SHA-1> is a hash\n \tof the sorted object names to make the resulting filename\n \tbased on the pack content, and written to the standard\n \toutput of the command.\ndiff --git a/Documentation/git-patch-id.txt b/Documentation/git-patch-id.txt\nindex 90268f0..312c3b1 100644\n--- a/Documentation/git-patch-id.txt\n+++ b/Documentation/git-patch-id.txt\n@@ -12,7 +12,7 @@ SYNOPSIS\n \n DESCRIPTION\n -----------\n-A \"patch ID\" is nothing but a SHA1 of the diff associated with a patch, with\n+A \"patch ID\" is nothing but a SHA-1 of the diff associated with a patch, with\n whitespace and line numbers ignored.  As such, it's \"reasonably stable\", but at\n the same time also reasonably unique, i.e., two patches that have the same \"patch\n ID\" are almost guaranteed to be the same thing.\ndiff --git a/Documentation/git-replace.txt b/Documentation/git-replace.txt\nindex 0142cd1..e0b4057 100644\n--- a/Documentation/git-replace.txt\n+++ b/Documentation/git-replace.txt\n@@ -16,8 +16,8 @@ DESCRIPTION\n -----------\n Adds a 'replace' reference in `refs/replace/` namespace.\n \n-The name of the 'replace' reference is the SHA1 of the object that is\n-replaced. The content of the 'replace' reference is the SHA1 of the\n+The name of the 'replace' reference is the SHA-1 of the object that is\n+replaced. The content of the 'replace' reference is the SHA-1 of the\n replacement object.\n \n Unless `-f` is given, the 'replace' reference must not yet exist.\ndiff --git a/Documentation/git-rev-parse.txt b/Documentation/git-rev-parse.txt\nindex 1f9ed6c..947d62f 100644\n--- a/Documentation/git-rev-parse.txt\n+++ b/Documentation/git-rev-parse.txt\n@@ -95,7 +95,7 @@ can be used.\n \tone.\n \n --symbolic::\n-\tUsually the object names are output in SHA1 form (with\n+\tUsually the object names are output in SHA-1 form (with\n \tpossible '{caret}' prefix); this option makes them output in a\n \tform as close to the original input as possible.\n \n@@ -180,7 +180,7 @@ print a message to stderr and exit with nonzero status.\n \n --short::\n --short=number::\n-\tInstead of outputting the full SHA1 values of object names try to\n+\tInstead of outputting the full SHA-1 values of object names try to\n \tabbreviate them to a shorter unique name. When no length is specified\n \t7 is used. The minimum length is 4.\n \ndiff --git a/Documentation/git-show-branch.txt b/Documentation/git-show-branch.txt\nindex a8e77b5..a515648 100644\n--- a/Documentation/git-show-branch.txt\n+++ b/Documentation/git-show-branch.txt\n@@ -31,7 +31,7 @@ no <rev> nor <glob> is given on the command line.\n OPTIONS\n -------\n <rev>::\n-\tArbitrary extended SHA1 expression (see linkgit:gitrevisions[7])\n+\tArbitrary extended SHA-1 expression (see linkgit:gitrevisions[7])\n \tthat typically names a branch head or a tag.\n \n <glob>::\n@@ -142,7 +142,7 @@ displayed, indented N places.  If a commit is on the I-th\n branch, the I-th indentation character shows a `+` sign;\n otherwise it shows a space.  Merge commits are denoted by\n a `-` sign.  Each commit shows a short name that\n-can be used as an extended SHA1 to name that commit.\n+can be used as an extended SHA-1 to name that commit.\n \n The following example shows three branches, \"master\", \"fixes\"\n and \"mhf\":\ndiff --git a/Documentation/git-show-index.txt b/Documentation/git-show-index.txt\nindex 9cbbed9..fbdc8ad 100644\n--- a/Documentation/git-show-index.txt\n+++ b/Documentation/git-show-index.txt\n@@ -19,7 +19,7 @@ Reads given idx file for packed Git archive created with\n \n The information it outputs is subset of what you can get from\n 'git verify-pack -v'; this command only shows the packfile\n-offset and SHA1 of each object.\n+offset and SHA-1 of each object.\n \n GIT\n ---\ndiff --git a/Documentation/git-show-ref.txt b/Documentation/git-show-ref.txt\nindex 5dbcd47..de4d352 100644\n--- a/Documentation/git-show-ref.txt\n+++ b/Documentation/git-show-ref.txt\n@@ -50,8 +50,8 @@ OPTIONS\n -s::\n --hash[=<n>]::\n \n-\tOnly show the SHA1 hash, not the reference name. When combined with\n-\t--dereference the dereferenced tag will still be shown after the SHA1.\n+\tOnly show the SHA-1 hash, not the reference name. When combined with\n+\t--dereference the dereferenced tag will still be shown after the SHA-1.\n \n --verify::\n \ndiff --git a/Documentation/git-tag.txt b/Documentation/git-tag.txt\nindex b21aa87..22894cb 100644\n--- a/Documentation/git-tag.txt\n+++ b/Documentation/git-tag.txt\n@@ -33,7 +33,7 @@ in the tag message.\n If `-m <msg>` or `-F <file>` is given and `-a`, `-s`, and `-u <key-id>`\n are absent, `-a` is implied.\n \n-Otherwise just a tag reference for the SHA1 object name of the commit object is\n+Otherwise just a tag reference for the SHA-1 object name of the commit object is\n created (i.e. a lightweight tag).\n \n A GnuPG signed tag object will be created when `-s` or `-u\ndiff --git a/Documentation/git-update-index.txt b/Documentation/git-update-index.txt\nindex c927758..670e9fb 100644\n--- a/Documentation/git-update-index.txt\n+++ b/Documentation/git-update-index.txt\n@@ -247,7 +247,7 @@ $ git update-index --index-info\n ------------\n \n The first line of the input feeds 0 as the mode to remove the\n-path; the SHA1 does not matter as long as it is well formatted.\n+path; the SHA-1 does not matter as long as it is well formatted.\n Then the second and third line feeds stage 1 and stage 2 entries\n for that path.  After the above, we would end up with this:\n \ndiff --git a/Documentation/git-verify-pack.txt b/Documentation/git-verify-pack.txt\nindex 0eb9ffb..526ba7b 100644\n--- a/Documentation/git-verify-pack.txt\n+++ b/Documentation/git-verify-pack.txt\n@@ -40,11 +40,11 @@ OUTPUT FORMAT\n -------------\n When specifying the -v option the format used is:\n \n-\tSHA1 type size size-in-pack-file offset-in-packfile\n+\tSHA-1 type size size-in-pack-file offset-in-packfile\n \n for objects that are not deltified in the pack, and\n \n-\tSHA1 type size size-in-packfile offset-in-packfile depth base-SHA1\n+\tSHA-1 type size size-in-packfile offset-in-packfile depth base-SHA-1\n \n for objects that are deltified.\n \ndiff --git a/Documentation/git-verify-tag.txt b/Documentation/git-verify-tag.txt\nindex e996135..f88ba96 100644\n--- a/Documentation/git-verify-tag.txt\n+++ b/Documentation/git-verify-tag.txt\n@@ -21,7 +21,7 @@ OPTIONS\n \tPrint the contents of the tag object before validating it.\n \n <tag>...::\n-\tSHA1 identifiers of Git tag objects.\n+\tSHA-1 identifiers of Git tag objects.\n \n GIT\n ---\ndiff --git a/Documentation/git.txt b/Documentation/git.txt\nindex 6a875f2..807a13c 100644\n--- a/Documentation/git.txt\n+++ b/Documentation/git.txt\n@@ -741,7 +741,7 @@ where:\n \n \t<old|new>-file:: are files GIT_EXTERNAL_DIFF can use to read the\n                          contents of <old|new>,\n-\t<old|new>-hex:: are the 40-hexdigit SHA1 hashes,\n+\t<old|new>-hex:: are the 40-hexdigit SHA-1 hashes,\n \t<old|new>-mode:: are the octal representation of the file modes.\n +\n The file parameters can point at the user's working file\n@@ -864,7 +864,7 @@ The commit, equivalent to what other systems call a \"changeset\" or\n represents an immediately preceding step.  Commits with more than one\n parent represent merges of independent lines of development.\n \n-All objects are named by the SHA1 hash of their contents, normally\n+All objects are named by the SHA-1 hash of their contents, normally\n written as a string of 40 hex digits.  Such names are globally unique.\n The entire history leading up to a commit can be vouched for by signing\n just that commit.  A fourth object type, the tag, is provided for this\n@@ -874,9 +874,9 @@ When first created, objects are stored in individual files, but for\n efficiency may later be compressed together into \"pack files\".\n \n Named pointers called refs mark interesting points in history.  A ref\n-may contain the SHA1 name of an object or the name of another ref.  Refs\n-with names beginning `ref/head/` contain the SHA1 name of the most\n-recent commit (or \"head\") of a branch under development.  SHA1 names of\n+may contain the SHA-1 name of an object or the name of another ref.  Refs\n+with names beginning `ref/head/` contain the SHA-1 name of the most\n+recent commit (or \"head\") of a branch under development.  SHA-1 names of\n tags of interest are stored under `ref/tags/`.  A special ref named\n `HEAD` contains the name of the currently checked-out branch.\n \ndiff --git a/Documentation/gitcore-tutorial.txt b/Documentation/gitcore-tutorial.txt\nindex 59c1c17..f538a87 100644\n--- a/Documentation/gitcore-tutorial.txt\n+++ b/Documentation/gitcore-tutorial.txt\n@@ -106,9 +106,9 @@ branch. A number of the Git tools will assume that `.git/HEAD` is\n valid, though.\n \n [NOTE]\n-An 'object' is identified by its 160-bit SHA1 hash, aka 'object name',\n+An 'object' is identified by its 160-bit SHA-1 hash, aka 'object name',\n and a reference to an object is always the 40-byte hex\n-representation of that SHA1 name. The files in the `refs`\n+representation of that SHA-1 name. The files in the `refs`\n subdirectory are expected to contain these hex references\n (usually with a final `\\n` at the end), and you should thus\n expect to see a number of 41-byte files containing these\n@@ -763,7 +763,7 @@ already discussed, the `HEAD` branch is nothing but a symlink to one of\n these object pointers.\n \n You can at any time create a new branch by just picking an arbitrary\n-point in the project history, and just writing the SHA1 name of that\n+point in the project history, and just writing the SHA-1 name of that\n object into a file under `.git/refs/heads/`. You can use any filename you\n want (and indeed, subdirectories), but the convention is that the\n \"normal\" branch is called `master`. That's just a convention, though,\n@@ -1233,7 +1233,7 @@ file (the first tree goes to stage 1, the second to stage 2,\n etc.).  After reading three trees into three stages, the paths\n that are the same in all three stages are 'collapsed' into stage\n 0.  Also paths that are the same in two of three stages are\n-collapsed into stage 0, taking the SHA1 from either stage 2 or\n+collapsed into stage 0, taking the SHA-1 from either stage 2 or\n stage 3, whichever is different from stage 1 (i.e. only one side\n changed from the common ancestor).\n \ndiff --git a/Documentation/gitdiffcore.txt b/Documentation/gitdiffcore.txt\nindex 4ed71c7..568d757 100644\n--- a/Documentation/gitdiffcore.txt\n+++ b/Documentation/gitdiffcore.txt\n@@ -108,7 +108,7 @@ it changes it to:\n For the purpose of breaking a filepair, diffcore-break examines\n the extent of changes between the contents of the files before\n and after modification (i.e. the contents that have \"bcd1234...\"\n-and \"0123456...\" as their SHA1 content ID, in the above\n+and \"0123456...\" as their SHA-1 content ID, in the above\n example).  The amount of deletion of original contents and\n insertion of new material are added together, and if it exceeds\n the \"break score\", the filepair is broken into two.  The break\ndiff --git a/Documentation/githooks.txt b/Documentation/githooks.txt\nindex dc6693f..d48bf4d 100644\n--- a/Documentation/githooks.txt\n+++ b/Documentation/githooks.txt\n@@ -99,7 +99,7 @@ given); `template` (if a `-t` option was given or the\n configuration option `commit.template` is set); `merge` (if the\n commit is a merge or a `.git/MERGE_MSG` file exists); `squash`\n (if a `.git/SQUASH_MSG` file exists); or `commit`, followed by\n-a commit SHA1 (if a `-c`, `-C` or `--amend` option was given).\n+a commit SHA-1 (if a `-c`, `-C` or `--amend` option was given).\n \n If the exit status is non-zero, 'git commit' will abort.\n \n@@ -196,11 +196,11 @@ hook would receive a line like the following:\n \n   refs/heads/master 67890 refs/heads/foreign 12345\n \n-although the full, 40-character SHA1s would be supplied.  If the foreign ref\n-does not yet exist the `<remote SHA1>` will be 40 `0`.  If a ref is to be\n+although the full, 40-character SHA-1s would be supplied.  If the foreign ref\n+does not yet exist the `<remote SHA-1>` will be 40 `0`.  If a ref is to be\n deleted, the `<local ref>` will be supplied as `(delete)` and the `<local\n-SHA1>` will be 40 `0`.  If the local commit was specified by something other\n-than a name which could be expanded (such as `HEAD~`, or a SHA1) it will be\n+SHA-1>` will be 40 `0`.  If the local commit was specified by something other\n+than a name which could be expanded (such as `HEAD~`, or a SHA-1) it will be\n supplied as it was originally given.\n \n If this hook exits with a non-zero status, 'git push' will abort without\ndiff --git a/Documentation/gitrepository-layout.txt b/Documentation/gitrepository-layout.txt\nindex f0eef76..2ad09f4 100644\n--- a/Documentation/gitrepository-layout.txt\n+++ b/Documentation/gitrepository-layout.txt\n@@ -106,7 +106,7 @@ refs/remotes/`name`::\n \tfrom a remote repository.\n \n refs/replace/`<obj-sha1>`::\n-\trecords the SHA1 of the object that replaces `<obj-sha1>`.\n+\trecords the SHA-1 of the object that replaces `<obj-sha1>`.\n \tThis is similar to info/grafts and is internally used and\n \tmaintained by linkgit:git-replace[1]. Such refs can be exchanged\n \tbetween repositories while grafts are not.\ndiff --git a/Documentation/gittutorial-2.txt b/Documentation/gittutorial-2.txt\nindex 94c906e..3109ea8 100644\n--- a/Documentation/gittutorial-2.txt\n+++ b/Documentation/gittutorial-2.txt\n@@ -46,9 +46,9 @@ What are the 7 digits of hex that Git responded to the commit with?\n \n We saw in part one of the tutorial that commits have names like this.\n It turns out that every object in the Git history is stored under\n-a 40-digit hex name.  That name is the SHA1 hash of the object's\n+a 40-digit hex name.  That name is the SHA-1 hash of the object's\n contents; among other things, this ensures that Git will never store\n-the same data twice (since identical data is given an identical SHA1\n+the same data twice (since identical data is given an identical SHA-1\n name), and that the contents of a Git object will never change (since\n that would change the object's name as well). The 7 char hex strings\n here are simply the abbreviation of such 40 character long strings.\n@@ -56,7 +56,7 @@ Abbreviations can be used everywhere where the 40 character strings\n can be used, so long as they are unambiguous.\n \n It is expected that the content of the commit object you created while\n-following the example above generates a different SHA1 hash than\n+following the example above generates a different SHA-1 hash than\n the one shown above because the commit object records the time when\n it was created and the name of the person performing the commit.\n \n@@ -80,14 +80,14 @@ A tree can refer to one or more \"blob\" objects, each corresponding to\n a file.  In addition, a tree can also refer to other tree objects,\n thus creating a directory hierarchy.  You can examine the contents of\n any tree using ls-tree (remember that a long enough initial portion\n-of the SHA1 will also work):\n+of the SHA-1 will also work):\n \n ------------------------------------------------\n $ git ls-tree 92b8b694\n 100644 blob 3b18e512dba79e4c8300dd08aeb37f8e728b8dad    file.txt\n ------------------------------------------------\n \n-Thus we see that this tree has one file in it.  The SHA1 hash is a\n+Thus we see that this tree has one file in it.  The SHA-1 hash is a\n reference to that file's data:\n \n ------------------------------------------------\n@@ -106,7 +106,7 @@ Note that this is the old file data; so the object that Git named in\n its response to the initial tree was a tree with a snapshot of the\n directory state that was recorded by the first commit.\n \n-All of these objects are stored under their SHA1 names inside the Git\n+All of these objects are stored under their SHA-1 names inside the Git\n directory:\n \n ------------------------------------------------\n@@ -142,7 +142,7 @@ ref: refs/heads/master\n \n As you can see, this tells us which branch we're currently on, and it\n tells us this by naming a file under the .git directory, which itself\n-contains a SHA1 name referring to a commit object, which we can\n+contains a SHA-1 name referring to a commit object, which we can\n examine with cat-file:\n \n ------------------------------------------------\n@@ -208,7 +208,7 @@ project's history:\n \n Note, by the way, that lots of commands take a tree as an argument.\n But as we can see above, a tree can be referred to in many different\n-ways--by the SHA1 name for that tree, by the name of a commit that\n+ways--by the SHA-1 name for that tree, by the name of a commit that\n refers to the tree, by the name of a branch whose head refers to that\n tree, etc.--and most such commands can accept any of these names.\n \ndiff --git a/Documentation/howto/recover-corrupted-blob-object.txt b/Documentation/howto/recover-corrupted-blob-object.txt\nindex 6d362ce..1b3b188 100644\n--- a/Documentation/howto/recover-corrupted-blob-object.txt\n+++ b/Documentation/howto/recover-corrupted-blob-object.txt\n@@ -15,7 +15,7 @@ On Fri, 9 Nov 2007, Yossi Leybovich wrote:\n > Any one know how can I track this object and understand which file is it\n -----------------------------------------------------------\n \n-So exactly *because* the SHA1 hash is cryptographically secure, the hash\n+So exactly *because* the SHA-1 hash is cryptographically secure, the hash\n itself doesn't actually tell you anything, in order to fix a corrupt\n object you basically have to find the \"original source\" for it.\n \n@@ -44,7 +44,7 @@ So:\n -----------------------------------------------------------\n \n This is the right thing to do, although it's usually best to save it under\n-it's full SHA1 name (you just dropped the \"4b\" from the result ;).\n+it's full SHA-1 name (you just dropped the \"4b\" from the result ;).\n \n Let's see what that tells us:\n \n@@ -89,7 +89,7 @@ working tree, in which case fixing this problem is really simple, just do\n \n \tgit hash-object -w my-magic-file\n \n-again, and if it outputs the missing SHA1 (4b945..) you're now all done!\n+again, and if it outputs the missing SHA-1 (4b945..) you're now all done!\n \n But that's the really lucky case, so let's assume that it was some older\n version that was broken. How do you tell which version it was?\ndiff --git a/Documentation/pretty-formats.txt b/Documentation/pretty-formats.txt\nindex afac703..f5b50dc 100644\n--- a/Documentation/pretty-formats.txt\n+++ b/Documentation/pretty-formats.txt\n@@ -75,7 +75,7 @@ This is designed to be as compact as possible.\n * 'raw'\n +\n The 'raw' format shows the entire commit exactly as\n-stored in the commit object.  Notably, the SHA1s are\n+stored in the commit object.  Notably, the SHA-1s are\n displayed in full, regardless of whether --abbrev or\n --no-abbrev are used, and 'parents' information show the\n true parent commits, without taking grafts nor history\ndiff --git a/Documentation/revisions.txt b/Documentation/revisions.txt\nindex 8855b1a..a8ff691 100644\n--- a/Documentation/revisions.txt\n+++ b/Documentation/revisions.txt\n@@ -2,13 +2,13 @@ SPECIFYING REVISIONS\n --------------------\n \n A revision parameter '<rev>' typically, but not necessarily, names a\n-commit object.  It uses what is called an 'extended SHA1'\n+commit object.  It uses what is called an 'extended SHA-1'\n syntax.  Here are various ways to spell object names.  The\n ones listed near the end of this list name trees and\n blobs contained in a commit.\n \n '<sha1>', e.g. 'dae86e1950b1277e545cee180551750029cfe735', 'dae86e'::\n-  The full SHA1 object name (40-byte hexadecimal string), or\n+  The full SHA-1 object name (40-byte hexadecimal string), or\n   a leading substring that is unique within the repository.\n   E.g. dae86e1950b1277e545cee180551750029cfe735 and dae86e both\n   name the same commit object if there is no other object in\ndiff --git a/Documentation/technical/api-sha1-array.txt b/Documentation/technical/api-sha1-array.txt\nindex 45d1c51..3e75497 100644\n--- a/Documentation/technical/api-sha1-array.txt\n+++ b/Documentation/technical/api-sha1-array.txt\n@@ -1,7 +1,7 @@\n sha1-array API\n ==============\n \n-The sha1-array API provides storage and manipulation of sets of SHA1\n+The sha1-array API provides storage and manipulation of sets of SHA-1\n identifiers. The emphasis is on storage and processing efficiency,\n making them suitable for large lists. Note that the ordering of items is\n not preserved over some operations.\n@@ -11,7 +11,7 @@ Data Structures\n \n `struct sha1_array`::\n \n-\tA single array of SHA1 hashes. This should be initialized by\n+\tA single array of SHA-1 hashes. This should be initialized by\n \tassignment from `SHA1_ARRAY_INIT`.  The `sha1` member contains\n \tthe actual data. The `nr` member contains the number of items in\n \tthe set.  The `alloc` and `sorted` members are used internally,\ndiff --git a/Documentation/technical/pack-format.txt b/Documentation/technical/pack-format.txt\nindex a37f137..8e5bf60 100644\n--- a/Documentation/technical/pack-format.txt\n+++ b/Documentation/technical/pack-format.txt\n@@ -34,7 +34,7 @@ Git pack format\n      Observation: length of each object is encoded in a variable\n      length format and is not constrained to 32-bit or anything.\n \n-  - The trailer records 20-byte SHA1 checksum of all of the above.\n+  - The trailer records 20-byte SHA-1 checksum of all of the above.\n \n == Original (version 1) pack-*.idx files have the following format:\n \n@@ -55,10 +55,10 @@ Git pack format\n \n   - The file is concluded with a trailer:\n \n-    A copy of the 20-byte SHA1 checksum at the end of\n+    A copy of the 20-byte SHA-1 checksum at the end of\n     corresponding packfile.\n \n-    20-byte SHA1-checksum of all of the above.\n+    20-byte SHA-1-checksum of all of the above.\n \n Pack Idx file:\n \n@@ -106,7 +106,7 @@ Pack file entry: <+\n         If it is not DELTA, then deflated bytes (the size above\n \t\tis the size before compression).\n \tIf it is REF_DELTA, then\n-\t  20-byte base object name SHA1 (the size above is the\n+\t  20-byte base object name SHA-1 (the size above is the\n \t\tsize of the delta data that follows).\n           delta data, deflated.\n \tIf it is OFS_DELTA, then\n@@ -135,7 +135,7 @@ Pack file entry: <+\n \n   - A 256-entry fan-out table just like v1.\n \n-  - A table of sorted 20-byte SHA1 object names.  These are\n+  - A table of sorted 20-byte SHA-1 object names.  These are\n     packed together without offset values to reduce the cache\n     footprint of the binary search for a specific object name.\n \n@@ -156,7 +156,7 @@ Pack file entry: <+\n \n   - The same trailer as a v1 pack file:\n \n-    A copy of the 20-byte SHA1 checksum at the end of\n+    A copy of the 20-byte SHA-1 checksum at the end of\n     corresponding packfile.\n \n-    20-byte SHA1-checksum of all of the above.\n+    20-byte SHA-1-checksum of all of the above.\ndiff --git a/Documentation/technical/pack-heuristics.txt b/Documentation/technical/pack-heuristics.txt\nindex dbdf7ba..912ebcf 100644\n--- a/Documentation/technical/pack-heuristics.txt\n+++ b/Documentation/technical/pack-heuristics.txt\n@@ -89,7 +89,7 @@ Ah, grasshopper!  And thus the enlightenment begins anew.\n \n     <linus> The \"magic\" is actually in theory totally arbitrary.\n         ANY order will give you a working pack, but no, it's not\n-        ordered by SHA1.\n+        ordered by SHA-1.\n \n         Before talking about the ordering for the sliding delta\n         window, let's talk about the recency order. That's more\ndiff --git a/Documentation/technical/shallow.txt b/Documentation/technical/shallow.txt\nindex ea2f69f..5183b15 100644\n--- a/Documentation/technical/shallow.txt\n+++ b/Documentation/technical/shallow.txt\n@@ -8,7 +8,7 @@ repo, and therefore grafts are introduced pretending that\n these commits have no parents.\n *********************************************************\n \n-The basic idea is to write the SHA1s of shallow commits into\n+The basic idea is to write the SHA-1s of shallow commits into\n $GIT_DIR/shallow, and handle its contents like the contents\n of $GIT_DIR/info/grafts (with the difference that shallow\n cannot contain parent information).\n@@ -18,7 +18,7 @@ even the config, since the user should not touch that file\n at all (even throughout development of the shallow clone, it\n was never manually edited!).\n \n-Each line contains exactly one SHA1. When read, a commit_graft\n+Each line contains exactly one SHA-1. When read, a commit_graft\n will be constructed, which has nr_parent < 0 to make it easier\n to discern from user provided grafts.\n \n-- \n1.8.1.msysgit.1\n\n\n---\nThomas\n"},{"id":"214344","messageId":"1496585271.996545.1366048207561.JavaMail.ngmail@webmail19.arcor-online.net","threadId":"33516","inReplyTo":"46832203.996447.1366047902197.JavaMail.ngmail@webmail19.arcor-online.net","subject":"[PATCH v3 4/4] glossary: improve definitions of refspec and pathspec","fromName":"Thomas Ackermann","fromEmail":"th.acker@arcor.de","sentAt":"2013-04-15T17:50:07Z","receivedAt":"2013-04-15T17:50:07Z","isPatch":true,"sender":{"key":"th.acker@arcor.de","avatar":"https://avatars.githubusercontent.com/u/1358536?v=4"},"body":"\nThe exact definition of \"refspec\" can be found in git-fetch\nand git-push manpages. So don't duplicate this here in the glossary.\n\nActually the definition of \"pathspec\" should be moved to a separate\nfile akin to the way it's done with \"refspec\". But this will only\nbe wortwhile when there's more to say about it. So for the time being\njust improve the first sentence a little bit; fix the idendation of\nthe first paragraph after the bullet list and remove the one-item\nlist of magic signatures with its - for the user - unnecessary\nintroduction of \"magic word 'top'\".\n\nSigned-off-by: Thomas Ackermann <th.acker@arcor.de>\n---\n Documentation/glossary-content.txt | 33 ++++++++++-----------------------\n 1 file changed, 10 insertions(+), 23 deletions(-)\n\ndiff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt\nindex 2734947..c36283c 100644\n--- a/Documentation/glossary-content.txt\n+++ b/Documentation/glossary-content.txt\n@@ -268,7 +268,7 @@ This commit is referred to as a \"merge commit\", or sometimes just a\n \tpack.\n \n [[def_pathspec]]pathspec::\n-       Pattern used to specify paths.\n+\tPattern used to limit paths in Git commands.\n +\n Pathspecs are used on the command line of \"git ls-files\", \"git\n ls-tree\", \"git add\", \"git grep\", \"git diff\", \"git checkout\",\n@@ -277,6 +277,8 @@ limit the scope of operations to some subset of the tree or\n worktree.  See the documentation of each command for whether\n paths are relative to the current directory or toplevel.  The\n pathspec syntax is as follows:\n++\n+--\n \n * any path matches itself\n * the pathspec up to the last slash represents a\n@@ -286,11 +288,12 @@ pathspec syntax is as follows:\n   of the pathname.  Paths relative to the directory\n   prefix will be matched against that pattern using fnmatch(3);\n   in particular, '*' and '?' _can_ match directory separators.\n+\n+--\n +\n For example, Documentation/*.jpg will match all .jpg files\n in the Documentation subtree,\n including Documentation/chapter_1/figure_1.jpg.\n-\n +\n A pathspec that begins with a colon `:` has special meaning.  In the\n short form, the leading colon `:` is followed by zero or more \"magic\n@@ -306,18 +309,10 @@ and a close parentheses `)`, and the remainder is the pattern to match\n against the path.\n +\n The \"magic signature\" consists of an ASCII symbol that is not\n-alphanumeric.\n-+\n---\n-top `/`;;\n-\tThe magic word `top` (mnemonic: `/`) makes the pattern match\n-\tfrom the root of the working tree, even when you are running\n-\tthe command from inside a subdirectory.\n---\n-+\n-Currently only the slash `/` is recognized as the \"magic signature\",\n-but it is envisioned that we will support more types of magic in later\n-versions of Git.\n+alphanumeric. Currently only the slash `/` is recognized as a\n+\"magic signature\": it makes the pattern match from the root of \n+the working tree, even when you are running the command from \n+inside a subdirectory.\n +\n A pathspec with only a colon means \"there is no pathspec\". This form\n should not be combined with other pathspec.\n@@ -389,15 +384,7 @@ should not be combined with other pathspec.\n [[def_refspec]]refspec::\n \tA \"refspec\" is used by <<def_fetch,fetch>> and\n \t<<def_push,push>> to describe the mapping between remote\n-\t<<def_ref,ref>> and local ref. They are combined with a colon in\n-\tthe format <src>:<dst>, preceded by an optional plus sign, +.\n-\tFor example: `git fetch $URL\n-\trefs/heads/master:refs/heads/origin` means \"grab the master\n-\t<<def_branch,branch>> <<def_head,head>> from the $URL and store\n-\tit as my origin branch head\". And `git push\n-\t$URL refs/heads/master:refs/heads/to-upstream` means \"publish my\n-\tmaster branch head as to-upstream branch at $URL\". See also\n-\tlinkgit:git-push[1].\n+\t<<def_ref,ref>> and local ref. \n \n [[def_remote_tracking_branch]]remote-tracking branch::\n \tA regular Git <<def_branch,branch>> that is used to follow changes from\n-- \n1.8.1.msysgit.1\n\n\n---\nThomas\n"},{"id":"214351","messageId":"7v8v4ju0e5.fsf@alter.siamese.dyndns.org","threadId":"33516","inReplyTo":"1496585271.996545.1366048207561.JavaMail.ngmail@webmail19.arcor-online.net","subject":"Re: [PATCH v3 4/4] glossary: improve definitions of refspec and pathspec","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-04-15T18:14:26Z","receivedAt":"2013-04-15T18:14:26Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Thomas Ackermann <th.acker@arcor.de> writes:\n\n> fix the idendation of\n> the first paragraph after the bullet list\n\nThat's indentation, I think, and is a good fix.\n\n> and remove the one-item\n> list of magic signatures with its - for the user - unnecessary\n> introduction of \"magic word 'top'\".\n\nBut I do not know if the description of the longhand \":(top)\" is\nunnecessary for the user.  Is the equivalence between it and :/\ndescribed anywhere else in our documentation set?\n"},{"id":"214352","messageId":"7v1uabu0dj.fsf@alter.siamese.dyndns.org","threadId":"33516","inReplyTo":"1456791522.996464.1366048016249.JavaMail.ngmail@webmail19.arcor-online.net","subject":"Re: [PATCH v3 1/4] glossary: remove outdated/misleading/irrelevant entries","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-04-15T18:14:48Z","receivedAt":"2013-04-15T18:14:48Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Thomas Ackermann <th.acker@arcor.de> writes:\n\n> Signed-off-by: Thomas Ackermann <th.acker@arcor.de>\n> ---\n\nLooks sensible.  Thanks.\n\n>  Documentation/glossary-content.txt | 11 +----------\n>  1 file changed, 1 insertion(+), 10 deletions(-)\n>\n> diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt\n> index eb7ba84..5a7a486 100644\n> --- a/Documentation/glossary-content.txt\n> +++ b/Documentation/glossary-content.txt\n> @@ -104,9 +104,6 @@ to point at the new commit.\n>  \tan arbitrary <<def_commit,commit>> that isn't necessarily the tip of any\n>  \tparticular branch.  In this case HEAD is said to be \"detached\".\n>  \n> -[[def_dircache]]dircache::\n> -\tYou are *waaaaay* behind. See <<def_index,index>>.\n> -\n>  [[def_directory]]directory::\n>  \tThe list you get with \"ls\" :-)\n>  \n> @@ -115,11 +112,6 @@ to point at the new commit.\n>  \tit contains modifications which have not been <<def_commit,committed>> to the current\n>  \t<<def_branch,branch>>.\n>  \n> -[[def_ent]]ent::\n> -\tFavorite synonym to \"<<def_tree-ish,tree-ish>>\" by some total geeks. See\n> -\thttp://en.wikipedia.org/wiki/Ent_(Middle-earth) for an in-depth\n> -\texplanation. Avoid this term, not to confuse people.\n> -\n>  [[def_evil_merge]]evil merge::\n>  \tAn evil merge is a <<def_merge,merge>> that introduces changes that\n>  \tdo not appear in any <<def_parent,parent>>.\n> @@ -257,8 +249,7 @@ This commit is referred to as a \"merge commit\", or sometimes just a\n>  \t<<def_object,object>>.\n>  \n>  [[def_octopus]]octopus::\n> -\tTo <<def_merge,merge>> more than two <<def_branch,branches>>. Also denotes an\n> -\tintelligent predator.\n> +\tTo <<def_merge,merge>> more than two <<def_branch,branches>>.\n>  \n>  [[def_origin]]origin::\n>  \tThe default upstream <<def_repository,repository>>. Most projects have\n"},{"id":"214353","messageId":"7vtxn7slro.fsf@alter.siamese.dyndns.org","threadId":"33516","inReplyTo":"1781595479.996520.1366048144788.JavaMail.ngmail@webmail19.arcor-online.net","subject":"Re: [PATCH v3 3/4] The name of the hash function is \"SHA-1\", not \"SHA1\"","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-04-15T18:15:39Z","receivedAt":"2013-04-15T18:15:39Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Thomas Ackermann <th.acker@arcor.de> writes:\n\n> Use \"SHA-1\" instead of \"SHA1\" whenever we talk about the hash function.\n> When used as a programming symbol, we keep \"SHA1\".\n>\n> Signed-off-by: Thomas Ackermann <th.acker@arcor.de>\n> ---\n\nThanks.  Will queue as-is for now, but I wonder if we want to fix\nthem to more official \"object name\", if we are going to the trouble\nof fixing all of these.  It depends on how many places already\ncorrectly spell SHA-1, I guess.\n\n>  Documentation/config.txt                              |  2 +-\n>  Documentation/git-cat-file.txt                        |  6 +++---\n>  Documentation/git-describe.txt                        |  2 +-\n>  Documentation/git-fsck.txt                            |  4 ++--\n>  Documentation/git-index-pack.txt                      |  2 +-\n>  Documentation/git-ls-files.txt                        |  2 +-\n>  Documentation/git-merge-index.txt                     |  2 +-\n>  Documentation/git-pack-objects.txt                    |  2 +-\n>  Documentation/git-patch-id.txt                        |  2 +-\n>  Documentation/git-replace.txt                         |  4 ++--\n>  Documentation/git-rev-parse.txt                       |  4 ++--\n>  Documentation/git-show-branch.txt                     |  4 ++--\n>  Documentation/git-show-index.txt                      |  2 +-\n>  Documentation/git-show-ref.txt                        |  4 ++--\n>  Documentation/git-tag.txt                             |  2 +-\n>  Documentation/git-update-index.txt                    |  2 +-\n>  Documentation/git-verify-pack.txt                     |  4 ++--\n>  Documentation/git-verify-tag.txt                      |  2 +-\n>  Documentation/git.txt                                 | 10 +++++-----\n>  Documentation/gitcore-tutorial.txt                    |  8 ++++----\n>  Documentation/gitdiffcore.txt                         |  2 +-\n>  Documentation/githooks.txt                            | 10 +++++-----\n>  Documentation/gitrepository-layout.txt                |  2 +-\n>  Documentation/gittutorial-2.txt                       | 16 ++++++++--------\n>  Documentation/howto/recover-corrupted-blob-object.txt |  6 +++---\n>  Documentation/pretty-formats.txt                      |  2 +-\n>  Documentation/revisions.txt                           |  4 ++--\n>  Documentation/technical/api-sha1-array.txt            |  4 ++--\n>  Documentation/technical/pack-format.txt               | 14 +++++++-------\n>  Documentation/technical/pack-heuristics.txt           |  2 +-\n>  Documentation/technical/shallow.txt                   |  4 ++--\n>  31 files changed, 68 insertions(+), 68 deletions(-)\n"},{"id":"214356","messageId":"298825540.997906.1366051297394.JavaMail.ngmail@webmail19.arcor-online.net","threadId":"33516","inReplyTo":"7v8v4ju0e5.fsf@alter.siamese.dyndns.org","subject":"Aw: Re: [PATCH v3 4/4] glossary: improve definitions of refspec and pathspec","fromName":"Thomas Ackermann","fromEmail":"th.acker@arcor.de","sentAt":"2013-04-15T18:41:37Z","receivedAt":"2013-04-15T18:41:37Z","isPatch":true,"sender":{"key":"th.acker@arcor.de","avatar":"https://avatars.githubusercontent.com/u/1358536?v=4"},"body":" \n> \n> But I do not know if the description of the longhand \":(top)\" is\n> unnecessary for the user.  Is the equivalence between it and :/\n> described anywhere else in our documentation set?\n> \nThe only complete \"documentation\" for all of this is in setup.c and I must\nconfess that I missed the subtle difference of \"magic words\" which can be \nused in the long form and \"magic signatures\" which are used in the short\nform. Because currently there is only one \"magic *\", from a user perspective\nI would prefer to document only the short form.\nSo I suggest to drop the \"long form\" paragraph entirely and start the \n\"short form paragraph\" with\n\"A pathspec that begins with a colon `:` has special meaning.\nIf the leading colon `:` is followed by zero or more \"magic ...\"\n\n\n\n---\nThomas\n"},{"id":"214440","messageId":"516CF968.7010606@alum.mit.edu","threadId":"33516","inReplyTo":"7vtxn7slro.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH v3 3/4] The name of the hash function is \"SHA-1\", not \"SHA1\"","fromName":"Michael Haggerty","fromEmail":"mhagger@alum.mit.edu","sentAt":"2013-04-16T07:10:32Z","receivedAt":"2013-04-16T07:10:32Z","isPatch":true,"sender":{"key":"mhagger@alum.mit.edu","avatar":"https://avatars.githubusercontent.com/u/119718?v=4"},"body":"On 04/15/2013 08:15 PM, Junio C Hamano wrote:\n> Thomas Ackermann <th.acker@arcor.de> writes:\n> \n>> Use \"SHA-1\" instead of \"SHA1\" whenever we talk about the hash function.\n>> When used as a programming symbol, we keep \"SHA1\".\n>>\n>> Signed-off-by: Thomas Ackermann <th.acker@arcor.de>\n>> ---\n> \n> Thanks.  Will queue as-is for now, but I wonder if we want to fix\n> them to more official \"object name\", if we are going to the trouble\n> of fixing all of these.  It depends on how many places already\n> correctly spell SHA-1, I guess.\n\nI like the idea of making the Git documentation (and the source code)\nmore algorithm-agnostic.  But personally, I think \"object name\" is a bad\ngeneric term for describing object hashes.  The word \"name\" suggests a\nmoniker that was intentionally given to the object.  I suppose that this\nis a big reason that the term \"SHA-1\" is used so frequently rather than\n\"object name\"--because it is transparently obvious that an \"SHA-1\" is a\nhash as opposed to, say, a filename.\n\nIn my opinion, rather than expand the use of the term \"object name\", we\nshould pick a better official term that makes it more obvious what we\nare talking about, like \"object hash\".\n\nWhile we are at it, if being more algorithm-agnostic is considered a\nworthy goal, maybe it would be helpful to establish a source code naming\nconvention to be used in new code in favor of \"sha1\"; for example,\n\n    ohash = hash of an object of unknown type\n    chash = hash of a commit object\n    etc.\n\nObviously I'm not suggesting that Git should transition away from using\nSHA-1s, just that the choice of hashing algorithm need not be quite so\nexplicit in source code that doesn't really need to care.\n\nOn a related topic, I find it shocking how often the hard-coded\nconstants \"20\", \"40\", and \"41\" appear in git source code:\n\n    $ git grep -e '\\<20\\>' -- '*.c' '*.h' '*.sh' '*.perl' | wc -l\n    689\n    $ git grep -e '\\<4[01]\\>' -- '*.c' '*.h' '*.sh' '*.perl' | wc -l\n    339\n\nThe vast majority of these have to do with the length of a SHA-1 hash.\nI think it would aid source-code readability if there were named\nconstants for the lengths of object hashes in binary and hex format.\n\nMichael\n\n-- \nMichael Haggerty\nmhagger@alum.mit.edu\nhttp://softwareswirl.blogspot.com/\n"}]}