* [PATCH v2 0/7] documentation cleanups for <rev>^{<type>}
@ 2013-09-02 5:34 Richard Hansen
2013-09-02 5:34 ` [PATCH v2 1/7] glossary: mention 'treeish' as an alternative to 'tree-ish' Richard Hansen
` (6 more replies)
0 siblings, 7 replies; 18+ messages in thread
From: Richard Hansen @ 2013-09-02 5:34 UTC (permalink / raw)
To: git, gitster; +Cc: Richard Hansen
The documentation for the <rev>^{<type>} syntax (e.g., v1.8.4^{tree})
needed some fixing, and the fixes motivated some other documentation
cleanups.
Changes since v1 (2013-06-18, see
<http://thread.gmane.org/gmane.comp.version-control.git/228325>):
* standardize on 'treeish' (don't use 'tree-ish')
* standardize on 'committish' (don't use 'commit-ish')
* don't base the definition of 'committish' on the broken definition
of 'ref'
* fix the definition of 'treeish' so that it is not based on the
broken definition of 'ref'
* fix the definiton of 'ref'
Richard Hansen (7):
glossary: mention 'treeish' as an alternative to 'tree-ish'
glossary: define committish (a.k.a. commit-ish)
use 'treeish' instead of 'tree-ish'
use 'committish' instead of 'commit-ish'
glossary: more precise definition of treeish (a.k.a. tree-ish)
revisions.txt: fix and clarify <rev>^{<type>}
glossary: fix and clarify the definition of 'ref'
Documentation/RelNotes/1.6.0.5.txt | 2 +-
Documentation/RelNotes/1.6.2.4.txt | 2 +-
Documentation/RelNotes/1.8.1.2.txt | 2 +-
Documentation/RelNotes/1.8.2.txt | 2 +-
Documentation/diff-format.txt | 10 +++----
Documentation/diff-generate-patch.txt | 2 +-
Documentation/git-archive.txt | 4 +--
Documentation/git-checkout.txt | 16 +++++------
Documentation/git-diff-index.txt | 4 +--
Documentation/git-diff-tree.txt | 14 +++++-----
Documentation/git-ls-files.txt | 6 ++--
Documentation/git-ls-tree.txt | 6 ++--
Documentation/git-read-tree.txt | 10 +++----
Documentation/git-rebase.txt | 2 +-
Documentation/git-reset.txt | 16 +++++------
Documentation/git-rev-parse.txt | 2 +-
Documentation/git-svn.txt | 6 ++--
Documentation/git-tar-tree.txt | 4 +--
Documentation/git.txt | 8 +++---
Documentation/gitcli.txt | 2 +-
Documentation/gittutorial-2.txt | 2 +-
Documentation/glossary-content.txt | 47 ++++++++++++++++++++++++++------
Documentation/revisions.txt | 14 ++++++----
archive.c | 6 ++--
builtin/checkout.c | 6 ++--
builtin/diff-index.c | 2 +-
builtin/diff-tree.c | 2 +-
builtin/diff.c | 2 +-
builtin/ls-files.c | 8 +++---
builtin/ls-tree.c | 2 +-
builtin/read-tree.c | 2 +-
builtin/reset.c | 4 +--
builtin/revert.c | 4 +--
builtin/tar-tree.c | 12 ++++----
contrib/examples/git-checkout.sh | 10 +++----
contrib/examples/git-reset.sh | 2 +-
contrib/examples/git-revert.sh | 4 +--
fast-import.c | 2 +-
git-svn.perl | 6 ++--
gitweb/gitweb.perl | 4 +--
po/de.po | 20 +++++++-------
po/fr.po | 20 +++++++-------
po/git.pot | 20 +++++++-------
po/sv.po | 20 +++++++-------
po/vi.po | 41 ++++++++++++++--------------
po/zh_CN.po | 20 +++++++-------
remote.c | 2 +-
t/t1512-rev-parse-disambiguation.sh | 26 +++++++++---------
t/t2010-checkout-ambiguous.sh | 2 +-
t/t4100/t-apply-3.patch | 8 +++---
t/t4100/t-apply-7.patch | 8 +++---
t/t9300-fast-import.sh | 2 +-
t/t9500-gitweb-standalone-no-errors.sh | 2 +-
t/t9501-gitweb-standalone-http-status.sh | 8 +++---
54 files changed, 247 insertions(+), 213 deletions(-)
--
1.8.4
^ permalink raw reply [flat|nested] 18+ messages in thread* [PATCH v2 1/7] glossary: mention 'treeish' as an alternative to 'tree-ish' 2013-09-02 5:34 [PATCH v2 0/7] documentation cleanups for <rev>^{<type>} Richard Hansen @ 2013-09-02 5:34 ` Richard Hansen 2013-09-03 22:46 ` Junio C Hamano 2013-09-02 5:34 ` [PATCH v2 2/7] glossary: define committish (a.k.a. commit-ish) Richard Hansen ` (5 subsequent siblings) 6 siblings, 1 reply; 18+ messages in thread From: Richard Hansen @ 2013-09-02 5:34 UTC (permalink / raw) To: git, gitster; +Cc: Richard Hansen The documentation contains a mix of the two spellings, so include both in the glossary so that a search for either will lead to the definition. Signed-off-by: Richard Hansen <rhansen@bbn.com> --- Documentation/glossary-content.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt index dba5062..0273095 100644 --- a/Documentation/glossary-content.txt +++ b/Documentation/glossary-content.txt @@ -486,7 +486,7 @@ should not be combined with other pathspec. with refs to the associated blob and/or tree objects. A <<def_tree,tree>> is equivalent to a <<def_directory,directory>>. -[[def_tree-ish]]tree-ish:: +[[def_tree-ish]]tree-ish (also treeish):: A <<def_ref,ref>> pointing to either a <<def_commit_object,commit object>>, a <<def_tree_object,tree object>>, or a <<def_tag_object,tag object>> pointing to a tag or commit or tree object. -- 1.8.4 ^ permalink raw reply related [flat|nested] 18+ messages in thread
* Re: [PATCH v2 1/7] glossary: mention 'treeish' as an alternative to 'tree-ish' 2013-09-02 5:34 ` [PATCH v2 1/7] glossary: mention 'treeish' as an alternative to 'tree-ish' Richard Hansen @ 2013-09-03 22:46 ` Junio C Hamano 2013-09-04 19:04 ` [PATCH v3 0/7] documentation cleanups for <rev>^{<type>} Richard Hansen 0 siblings, 1 reply; 18+ messages in thread From: Junio C Hamano @ 2013-09-03 22:46 UTC (permalink / raw) To: Richard Hansen; +Cc: git Richard Hansen <rhansen@bbn.com> writes: > The documentation contains a mix of the two spellings, so include both > in the glossary so that a search for either will lead to the > definition. > > Signed-off-by: Richard Hansen <rhansen@bbn.com> > --- I hate to say this after seeing you doing a thorough job in this series, but because "tree-ish" and "commit-ish" are both made-up words, I have a feeling that we are better off unifying to the dashed form, which unfortunately is the other way around from what your series does. Patches 5, 6 and 7 are good clarifications. > Documentation/glossary-content.txt | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt > index dba5062..0273095 100644 > --- a/Documentation/glossary-content.txt > +++ b/Documentation/glossary-content.txt > @@ -486,7 +486,7 @@ should not be combined with other pathspec. > with refs to the associated blob and/or tree objects. A > <<def_tree,tree>> is equivalent to a <<def_directory,directory>>. > > -[[def_tree-ish]]tree-ish:: > +[[def_tree-ish]]tree-ish (also treeish):: > A <<def_ref,ref>> pointing to either a <<def_commit_object,commit > object>>, a <<def_tree_object,tree object>>, or a <<def_tag_object,tag > object>> pointing to a tag or commit or tree object. ^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH v3 0/7] documentation cleanups for <rev>^{<type>} 2013-09-03 22:46 ` Junio C Hamano @ 2013-09-04 19:04 ` Richard Hansen 2013-09-04 19:04 ` [PATCH v3 1/7] glossary: mention 'treeish' as an alternative to 'tree-ish' Richard Hansen ` (7 more replies) 0 siblings, 8 replies; 18+ messages in thread From: Richard Hansen @ 2013-09-04 19:04 UTC (permalink / raw) To: git, gitster; +Cc: Richard Hansen On 2013-09-03 18:46, Junio C Hamano wrote: > I hate to say this after seeing you doing a thorough job in this > series, but because "tree-ish" and "commit-ish" are both made-up > words, I have a feeling that we are better off unifying to the > dashed form, which unfortunately is the other way around from what > your series does. I thought you might say that so I held on to the commits that standardize on tree-ish and commit-ish in my local repo. :) This series still says "tree-ish (also treeish)" and "commit-ish (also committish)" in gitglossary(7). Would you like me to eliminate the "(also ...)" part? I'm not 100% confident that these don't break translations, although it still builds and "make test" passes. Changes since v2: * standardize on 'tree-ish' instead of 'treeish' * standardize on 'commit-ish' instead of 'committish' Richard Hansen (7): glossary: mention 'treeish' as an alternative to 'tree-ish' glossary: define commit-ish (a.k.a. committish) use 'tree-ish' instead of 'treeish' use 'commit-ish' instead of 'committish' glossary: more precise definition of tree-ish (a.k.a. treeish) revisions.txt: fix and clarify <rev>^{<type>} glossary: fix and clarify the definition of 'ref' Documentation/RelNotes/1.7.11.2.txt | 2 +- Documentation/config.txt | 4 +-- Documentation/git-cat-file.txt | 2 +- Documentation/git-describe.txt | 14 ++++----- Documentation/git-fast-import.txt | 26 +++++++-------- Documentation/git-merge-tree.txt | 2 +- Documentation/git-name-rev.txt | 2 +- Documentation/git-push.txt | 2 +- Documentation/gitcli.txt | 2 +- Documentation/glossary-content.txt | 47 +++++++++++++++++++++++----- Documentation/howto/revert-branch-rebase.txt | 2 +- Documentation/revisions.txt | 12 ++++--- builtin/describe.c | 4 +-- builtin/merge.c | 2 +- contrib/examples/git-merge.sh | 2 +- fast-import.c | 20 ++++++------ git-cvsserver.perl | 2 +- po/da.po | 2 +- po/de.po | 6 ++-- po/fr.po | 4 +-- po/git.pot | 4 +-- po/it.po | 2 +- po/nl.po | 2 +- po/pt_PT.po | 2 +- po/sv.po | 6 ++-- po/vi.po | 6 ++-- po/zh_CN.po | 4 +-- sha1_name.c | 6 ++-- t/t9300-fast-import.sh | 6 ++-- test-match-trees.c | 4 +-- 30 files changed, 118 insertions(+), 83 deletions(-) -- 1.8.4 ^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH v3 1/7] glossary: mention 'treeish' as an alternative to 'tree-ish' 2013-09-04 19:04 ` [PATCH v3 0/7] documentation cleanups for <rev>^{<type>} Richard Hansen @ 2013-09-04 19:04 ` Richard Hansen 2013-09-04 19:04 ` [PATCH v3 2/7] glossary: define commit-ish (a.k.a. committish) Richard Hansen ` (6 subsequent siblings) 7 siblings, 0 replies; 18+ messages in thread From: Richard Hansen @ 2013-09-04 19:04 UTC (permalink / raw) To: git, gitster; +Cc: Richard Hansen The documentation contains a mix of the two spellings, so include both in the glossary so that a search for either will lead to the definition. Signed-off-by: Richard Hansen <rhansen@bbn.com> --- Documentation/glossary-content.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt index dba5062..0273095 100644 --- a/Documentation/glossary-content.txt +++ b/Documentation/glossary-content.txt @@ -486,7 +486,7 @@ should not be combined with other pathspec. with refs to the associated blob and/or tree objects. A <<def_tree,tree>> is equivalent to a <<def_directory,directory>>. -[[def_tree-ish]]tree-ish:: +[[def_tree-ish]]tree-ish (also treeish):: A <<def_ref,ref>> pointing to either a <<def_commit_object,commit object>>, a <<def_tree_object,tree object>>, or a <<def_tag_object,tag object>> pointing to a tag or commit or tree object. -- 1.8.4 ^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH v3 2/7] glossary: define commit-ish (a.k.a. committish) 2013-09-04 19:04 ` [PATCH v3 0/7] documentation cleanups for <rev>^{<type>} Richard Hansen 2013-09-04 19:04 ` [PATCH v3 1/7] glossary: mention 'treeish' as an alternative to 'tree-ish' Richard Hansen @ 2013-09-04 19:04 ` Richard Hansen 2013-09-04 19:04 ` [PATCH v3 3/7] use 'tree-ish' instead of 'treeish' Richard Hansen ` (5 subsequent siblings) 7 siblings, 0 replies; 18+ messages in thread From: Richard Hansen @ 2013-09-04 19:04 UTC (permalink / raw) To: git, gitster; +Cc: Richard Hansen Signed-off-by: Richard Hansen <rhansen@bbn.com> --- Documentation/glossary-content.txt | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt index 0273095..47e901e 100644 --- a/Documentation/glossary-content.txt +++ b/Documentation/glossary-content.txt @@ -82,6 +82,18 @@ to point at the new commit. to the top <<def_directory,directory>> of the stored revision. +[[def_commit-ish]]commit-ish (also committish):: + A <<def_commit_object,commit object>> or an + <<def_object,object>> that can be recursively dereferenced to + a commit object. + The following are all commit-ishes: + a commit object, + a <<def_tag_object,tag object>> that points to a commit + object, + a tag object that points to a tag object that points to a + commit object, + etc. + [[def_core_git]]core Git:: Fundamental data structures and utilities of Git. Exposes only limited source code management tools. -- 1.8.4 ^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH v3 3/7] use 'tree-ish' instead of 'treeish' 2013-09-04 19:04 ` [PATCH v3 0/7] documentation cleanups for <rev>^{<type>} Richard Hansen 2013-09-04 19:04 ` [PATCH v3 1/7] glossary: mention 'treeish' as an alternative to 'tree-ish' Richard Hansen 2013-09-04 19:04 ` [PATCH v3 2/7] glossary: define commit-ish (a.k.a. committish) Richard Hansen @ 2013-09-04 19:04 ` Richard Hansen 2013-09-04 19:04 ` [PATCH v3 4/7] use 'commit-ish' instead of 'committish' Richard Hansen ` (4 subsequent siblings) 7 siblings, 0 replies; 18+ messages in thread From: Richard Hansen @ 2013-09-04 19:04 UTC (permalink / raw) To: git, gitster; +Cc: Richard Hansen Replace 'treeish' in documentation and comments with 'tree-ish' to match gitglossary(7). The only remaining instances of 'treeish' are: * variable, function, and macro names * "(also treeish)" in the definition of tree-ish in gitglossary(7) Signed-off-by: Richard Hansen <rhansen@bbn.com> --- Documentation/RelNotes/1.7.11.2.txt | 2 +- Documentation/git-cat-file.txt | 2 +- Documentation/git-merge-tree.txt | 2 +- fast-import.c | 4 ++-- git-cvsserver.perl | 2 +- test-match-trees.c | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Documentation/RelNotes/1.7.11.2.txt b/Documentation/RelNotes/1.7.11.2.txt index a0d24d1..f0cfd02 100644 --- a/Documentation/RelNotes/1.7.11.2.txt +++ b/Documentation/RelNotes/1.7.11.2.txt @@ -31,7 +31,7 @@ Fixes since v1.7.11.1 * "git diff --no-index" did not work with pagers correctly. * "git diff COPYING HEAD:COPYING" gave a nonsense error message that - claimed that the treeish HEAD did not have COPYING in it. + claimed that the tree-ish HEAD did not have COPYING in it. * When "git log" gets "--simplify-merges/by-decoration" together with "--first-parent", the combination of these options makes the diff --git a/Documentation/git-cat-file.txt b/Documentation/git-cat-file.txt index 10fbc6a..e468ceb 100644 --- a/Documentation/git-cat-file.txt +++ b/Documentation/git-cat-file.txt @@ -54,7 +54,7 @@ OPTIONS --textconv:: Show the content as transformed by a textconv filter. In this case, - <object> has be of the form <treeish>:<path>, or :<path> in order + <object> has be of the form <tree-ish>:<path>, or :<path> in order to apply the filter to the content recorded in the index at <path>. --batch:: diff --git a/Documentation/git-merge-tree.txt b/Documentation/git-merge-tree.txt index c5f84b6..58731c1 100644 --- a/Documentation/git-merge-tree.txt +++ b/Documentation/git-merge-tree.txt @@ -13,7 +13,7 @@ SYNOPSIS DESCRIPTION ----------- -Reads three treeish, and output trivial merge results and +Reads three tree-ish, and output trivial merge results and conflicting stages to the standard output. This is similar to what three-way 'git read-tree -m' does, but instead of storing the results in the index, the command outputs the entries to the diff --git a/fast-import.c b/fast-import.c index 23f625f..019be11 100644 --- a/fast-import.c +++ b/fast-import.c @@ -2957,7 +2957,7 @@ static struct object_entry *dereference(struct object_entry *oe, case OBJ_TAG: break; default: - die("Not a treeish: %s", command_buf.buf); + die("Not a tree-ish: %s", command_buf.buf); } if (oe->pack_id != MAX_PACK_ID) { /* in a pack being written */ @@ -3041,7 +3041,7 @@ static void parse_ls(struct branch *b) struct tree_entry *root = NULL; struct tree_entry leaf = {NULL}; - /* ls SP (<treeish> SP)? <path> */ + /* ls SP (<tree-ish> SP)? <path> */ p = command_buf.buf + strlen("ls "); if (*p == '"') { if (!b) diff --git a/git-cvsserver.perl b/git-cvsserver.perl index a0d796e..a9f6f8e 100755 --- a/git-cvsserver.perl +++ b/git-cvsserver.perl @@ -4338,7 +4338,7 @@ sub getAnyHead =head2 getRevisionDirMap A "revision dir map" contains all the plain-file filenames associated -with a particular revision (treeish), organized by directory: +with a particular revision (tree-ish), organized by directory: $type = $out->{$dir}{$fullName} diff --git a/test-match-trees.c b/test-match-trees.c index a3c4688..2ef725e 100644 --- a/test-match-trees.c +++ b/test-match-trees.c @@ -12,10 +12,10 @@ int main(int ac, char **av) die("cannot parse %s as an object name", av[2]); one = parse_tree_indirect(hash1); if (!one) - die("not a treeish %s", av[1]); + die("not a tree-ish %s", av[1]); two = parse_tree_indirect(hash2); if (!two) - die("not a treeish %s", av[2]); + die("not a tree-ish %s", av[2]); shift_tree(one->object.sha1, two->object.sha1, shifted, -1); printf("shifted: %s\n", sha1_to_hex(shifted)); -- 1.8.4 ^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH v3 4/7] use 'commit-ish' instead of 'committish' 2013-09-04 19:04 ` [PATCH v3 0/7] documentation cleanups for <rev>^{<type>} Richard Hansen ` (2 preceding siblings ...) 2013-09-04 19:04 ` [PATCH v3 3/7] use 'tree-ish' instead of 'treeish' Richard Hansen @ 2013-09-04 19:04 ` Richard Hansen 2013-09-04 19:04 ` [PATCH v3 5/7] glossary: more precise definition of tree-ish (a.k.a. treeish) Richard Hansen ` (3 subsequent siblings) 7 siblings, 0 replies; 18+ messages in thread From: Richard Hansen @ 2013-09-04 19:04 UTC (permalink / raw) To: git, gitster; +Cc: Richard Hansen Replace 'committish' in documentation and comments with 'commit-ish' to match gitglossary(7) and to be consistent with 'tree-ish'. The only remaining instances of 'committish' are: * variable, function, and macro names * "(also committish)" in the definition of commit-ish in gitglossary[7] Signed-off-by: Richard Hansen <rhansen@bbn.com> --- Documentation/config.txt | 4 ++-- Documentation/git-describe.txt | 14 +++++++------- Documentation/git-fast-import.txt | 26 +++++++++++++------------- Documentation/git-name-rev.txt | 2 +- Documentation/git-push.txt | 2 +- Documentation/gitcli.txt | 2 +- Documentation/howto/revert-branch-rebase.txt | 2 +- builtin/describe.c | 4 ++-- builtin/merge.c | 2 +- contrib/examples/git-merge.sh | 2 +- fast-import.c | 16 ++++++++-------- po/da.po | 2 +- po/de.po | 6 +++--- po/fr.po | 4 ++-- po/git.pot | 4 ++-- po/it.po | 2 +- po/nl.po | 2 +- po/pt_PT.po | 2 +- po/sv.po | 6 +++--- po/vi.po | 6 +++--- po/zh_CN.po | 4 ++-- sha1_name.c | 6 +++--- t/t9300-fast-import.sh | 6 +++--- 23 files changed, 63 insertions(+), 63 deletions(-) diff --git a/Documentation/config.txt b/Documentation/config.txt index ec57a15..1ccec22 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -170,8 +170,8 @@ advice.*:: pushNeedsForce:: Shown when linkgit:git-push[1] rejects an update that tries to overwrite a remote ref that points at an - object that is not a committish, or make the remote - ref point at an object that is not a committish. + object that is not a commit-ish, or make the remote + ref point at an object that is not a commit-ish. statusHints:: Show directions on how to proceed from the current state in the output of linkgit:git-status[1], in diff --git a/Documentation/git-describe.txt b/Documentation/git-describe.txt index 9439cd6..d20ca40 100644 --- a/Documentation/git-describe.txt +++ b/Documentation/git-describe.txt @@ -9,7 +9,7 @@ git-describe - Show the most recent tag that is reachable from a commit SYNOPSIS -------- [verse] -'git describe' [--all] [--tags] [--contains] [--abbrev=<n>] <committish>... +'git describe' [--all] [--tags] [--contains] [--abbrev=<n>] <commit-ish>... 'git describe' [--all] [--tags] [--contains] [--abbrev=<n>] --dirty[=<mark>] DESCRIPTION @@ -26,8 +26,8 @@ see the -a and -s options to linkgit:git-tag[1]. OPTIONS ------- -<committish>...:: - Committish object names to describe. +<commit-ish>...:: + Commit-ish object names to describe. --dirty[=<mark>]:: Describe the working tree. @@ -57,7 +57,7 @@ OPTIONS --candidates=<n>:: Instead of considering only the 10 most recent tags as - candidates to describe the input committish consider + candidates to describe the input commit-ish consider up to <n> candidates. Increasing <n> above 10 will take slightly longer but may produce a more accurate result. An <n> of 0 will cause only exact matches to be output. @@ -145,7 +145,7 @@ be sufficient to disambiguate these commits. SEARCH STRATEGY --------------- -For each committish supplied, 'git describe' will first look for +For each commit-ish supplied, 'git describe' will first look for a tag which tags exactly that commit. Annotated tags will always be preferred over lightweight tags, and tags with newer dates will always be preferred over tags with older dates. If an exact match @@ -154,12 +154,12 @@ is found, its name will be output and searching will stop. If an exact match was not found, 'git describe' will walk back through the commit history to locate an ancestor commit which has been tagged. The ancestor's tag will be output along with an -abbreviation of the input committish's SHA-1. If '--first-parent' was +abbreviation of the input commit-ish's SHA-1. If '--first-parent' was specified then the walk will only consider the first parent of each commit. If multiple tags were found during the walk then the tag which -has the fewest commits different from the input committish will be +has the fewest commits different from the input commit-ish will be selected and output. Here fewest commits different is defined as the number of commits which would be shown by `git log tag..input` will be the smallest number of commits possible. diff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt index bf1a02a..bba3ec9 100644 --- a/Documentation/git-fast-import.txt +++ b/Documentation/git-fast-import.txt @@ -380,8 +380,8 @@ change to the project. ('author' (SP <name>)? SP LT <email> GT SP <when> LF)? 'committer' (SP <name>)? SP LT <email> GT SP <when> LF data - ('from' SP <committish> LF)? - ('merge' SP <committish> LF)? + ('from' SP <commit-ish> LF)? + ('merge' SP <commit-ish> LF)? (filemodify | filedelete | filecopy | filerename | filedeleteall | notemodify)* LF? .... @@ -460,9 +460,9 @@ as the current commit on that branch is automatically assumed to be the first ancestor of the new commit. As `LF` is not valid in a Git refname or SHA-1 expression, no -quoting or escaping syntax is supported within `<committish>`. +quoting or escaping syntax is supported within `<commit-ish>`. -Here `<committish>` is any of the following: +Here `<commit-ish>` is any of the following: * The name of an existing branch already in fast-import's internal branch table. If fast-import doesn't know the name, it's treated as a SHA-1 @@ -509,7 +509,7 @@ additional ancestors (forming a 16-way merge). For this reason it is suggested that frontends do not use more than 15 `merge` commands per commit; 16, if starting a new, empty branch. -Here `<committish>` is any of the commit specification expressions +Here `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above). `filemodify` @@ -677,8 +677,8 @@ paths for a commit are encouraged to do so. `notemodify` ^^^^^^^^^^^^ Included in a `commit` `<notes_ref>` command to add a new note -annotating a `<committish>` or change this annotation contents. -Internally it is similar to filemodify 100644 on `<committish>` +annotating a `<commit-ish>` or change this annotation contents. +Internally it is similar to filemodify 100644 on `<commit-ish>` path (maybe split into subdirectories). It's not advised to use any other commands to write to the `<notes_ref>` tree except `filedeleteall` to delete all existing notes in this tree. @@ -691,7 +691,7 @@ External data format:: commit that is to be annotated. + .... - 'N' SP <dataref> SP <committish> LF + 'N' SP <dataref> SP <commit-ish> LF .... + Here `<dataref>` can be either a mark reference (`:<idnum>`) @@ -704,13 +704,13 @@ Inline data format:: command. + .... - 'N' SP 'inline' SP <committish> LF + 'N' SP 'inline' SP <commit-ish> LF data .... + See below for a detailed description of the `data` command. -In both formats `<committish>` is any of the commit specification +In both formats `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above). `mark` @@ -741,7 +741,7 @@ lightweight (non-annotated) tags see the `reset` command below. .... 'tag' SP <name> LF - 'from' SP <committish> LF + 'from' SP <commit-ish> LF 'tagger' (SP <name>)? SP LT <email> GT SP <when> LF data .... @@ -786,11 +786,11 @@ branch from an existing commit without creating a new commit. .... 'reset' SP <ref> LF - ('from' SP <committish> LF)? + ('from' SP <commit-ish> LF)? LF? .... -For a detailed description of `<ref>` and `<committish>` see above +For a detailed description of `<ref>` and `<commit-ish>` see above under `commit` and `from`. The `LF` after the command is optional (it used to be required). diff --git a/Documentation/git-name-rev.txt b/Documentation/git-name-rev.txt index 15b00e0..ca28fb8 100644 --- a/Documentation/git-name-rev.txt +++ b/Documentation/git-name-rev.txt @@ -10,7 +10,7 @@ SYNOPSIS -------- [verse] 'git name-rev' [--tags] [--refs=<pattern>] - ( --all | --stdin | <committish>... ) + ( --all | --stdin | <commit-ish>... ) DESCRIPTION ----------- diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt index f7dfe48..a5c6f7d 100644 --- a/Documentation/git-push.txt +++ b/Documentation/git-push.txt @@ -120,7 +120,7 @@ already exists on the remote side. --follow-tags:: Push all the refs that would be pushed without this option, and also push annotated tags in `refs/tags` that are missing - from the remote but are pointing at committish that are + from the remote but are pointing at commit-ish that are reachable from the refs being pushed. --receive-pack=<git-receive-pack>:: diff --git a/Documentation/gitcli.txt b/Documentation/gitcli.txt index 9ac5088..7d54b77 100644 --- a/Documentation/gitcli.txt +++ b/Documentation/gitcli.txt @@ -106,7 +106,7 @@ couple of magic command line options: + --------------------------------------------- $ git describe -h -usage: git describe [options] <committish>* +usage: git describe [options] <commit-ish>* or: git describe [options] --dirty --contains find the tag that comes after the commit diff --git a/Documentation/howto/revert-branch-rebase.txt b/Documentation/howto/revert-branch-rebase.txt index 0d5419e..85f69db 100644 --- a/Documentation/howto/revert-branch-rebase.txt +++ b/Documentation/howto/revert-branch-rebase.txt @@ -154,7 +154,7 @@ $ git pull . master Packing 0 objects Unpacking 0 objects -* committish: e3a693c... refs/heads/master from . +* commit-ish: e3a693c... refs/heads/master from . Trying to merge e3a693c... into 8c1f5f0... using 10d781b... Committed merge 7fb9b7262a1d1e0a47bbfdcbbcf50ce0635d3f8f cache.h | 8 ++++---- diff --git a/builtin/describe.c b/builtin/describe.c index 7d73722..121a535 100644 --- a/builtin/describe.c +++ b/builtin/describe.c @@ -13,7 +13,7 @@ #define MAX_TAGS (FLAG_BITS - 1) static const char * const describe_usage[] = { - N_("git describe [options] <committish>*"), + N_("git describe [options] <commit-ish>*"), N_("git describe [options] --dirty"), NULL }; @@ -486,7 +486,7 @@ int cmd_describe(int argc, const char **argv, const char *prefix) } describe("HEAD", 1); } else if (dirty) { - die(_("--dirty is incompatible with committishes")); + die(_("--dirty is incompatible with commit-ishes")); } else { while (argc-- > 0) { describe(*argv++, argc == 0); diff --git a/builtin/merge.c b/builtin/merge.c index 34a6166..9a2c58a 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -1193,7 +1193,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix) * This could be traditional "merge <msg> HEAD <commit>..." and * the way we can tell it is to see if the second token is HEAD, * but some people might have misused the interface and used a - * committish that is the same as HEAD there instead. + * commit-ish that is the same as HEAD there instead. * Traditional format never would have "-m" so it is an * additional safety measure to check for it. */ diff --git a/contrib/examples/git-merge.sh b/contrib/examples/git-merge.sh index 7b922c3..a5e42a9 100755 --- a/contrib/examples/git-merge.sh +++ b/contrib/examples/git-merge.sh @@ -263,7 +263,7 @@ fi # This could be traditional "merge <msg> HEAD <commit>..." and the # way we can tell it is to see if the second token is HEAD, but some -# people might have misused the interface and used a committish that +# people might have misused the interface and used a commit-ish that # is the same as HEAD there instead. Traditional format never would # have "-m" so it is an additional safety measure to check for it. diff --git a/fast-import.c b/fast-import.c index 019be11..f5babae 100644 --- a/fast-import.c +++ b/fast-import.c @@ -22,8 +22,8 @@ Format of STDIN stream: ('author' (sp name)? sp '<' email '>' sp when lf)? 'committer' (sp name)? sp '<' email '>' sp when lf commit_msg - ('from' sp committish lf)? - ('merge' sp committish lf)* + ('from' sp commit-ish lf)? + ('merge' sp commit-ish lf)* (file_change | ls)* lf?; commit_msg ::= data; @@ -43,18 +43,18 @@ Format of STDIN stream: file_obm ::= 'M' sp mode sp (hexsha1 | idnum) sp path_str lf; file_inm ::= 'M' sp mode sp 'inline' sp path_str lf data; - note_obm ::= 'N' sp (hexsha1 | idnum) sp committish lf; - note_inm ::= 'N' sp 'inline' sp committish lf + note_obm ::= 'N' sp (hexsha1 | idnum) sp commit-ish lf; + note_inm ::= 'N' sp 'inline' sp commit-ish lf data; new_tag ::= 'tag' sp tag_str lf - 'from' sp committish lf + 'from' sp commit-ish lf ('tagger' (sp name)? sp '<' email '>' sp when lf)? tag_msg; tag_msg ::= data; reset_branch ::= 'reset' sp ref_str lf - ('from' sp committish lf)? + ('from' sp commit-ish lf)? lf?; checkpoint ::= 'checkpoint' lf @@ -93,7 +93,7 @@ Format of STDIN stream: # stream formatting is: \, " and LF. Otherwise these values # are UTF8. # - committish ::= (ref_str | hexsha1 | sha1exp_str | idnum); + commit-ish ::= (ref_str | hexsha1 | sha1exp_str | idnum); ref_str ::= ref; sha1exp_str ::= sha1exp; tag_str ::= tag; @@ -2478,7 +2478,7 @@ static void note_change_n(struct branch *b, unsigned char *old_fanout) assert(*p == ' '); p++; /* skip space */ - /* <committish> */ + /* <commit-ish> */ s = lookup_branch(p); if (s) { if (is_null_sha1(s->sha1)) diff --git a/po/da.po b/po/da.po index 20a88ea..898b18d 100644 --- a/po/da.po +++ b/po/da.po @@ -1674,7 +1674,7 @@ msgid "No names found, cannot describe anything." msgstr "" #: builtin/describe.c:482 -msgid "--dirty is incompatible with committishes" +msgid "--dirty is incompatible with commit-ishes" msgstr "" #: builtin/diff.c:77 diff --git a/po/de.po b/po/de.po index 11dde11..da3b0f5 100644 --- a/po/de.po +++ b/po/de.po @@ -4684,8 +4684,8 @@ msgid "print sizes in human readable format" msgstr "gibt Größenangaben in menschenlesbaren Format aus" #: builtin/describe.c:16 -msgid "git describe [options] <committish>*" -msgstr "git describe [Optionen] <committish>*" +msgid "git describe [options] <commit-ish>*" +msgstr "git describe [Optionen] <commit-ish>*" #: builtin/describe.c:17 msgid "git describe [options] --dirty" @@ -4822,7 +4822,7 @@ msgid "No names found, cannot describe anything." msgstr "Keine Namen gefunden, kann nichts beschreiben." #: builtin/describe.c:489 -msgid "--dirty is incompatible with committishes" +msgid "--dirty is incompatible with commit-ishes" msgstr "Die Option --dirty kann nicht mit Commits verwendet werden." #: builtin/diff.c:79 diff --git a/po/fr.po b/po/fr.po index 2cdb6f9..49e0ec1 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4291,7 +4291,7 @@ msgid "print sizes in human readable format" msgstr "" #: builtin/describe.c:15 -msgid "git describe [options] <committish>*" +msgid "git describe [options] <commit-ish>*" msgstr "" #: builtin/describe.c:16 @@ -4417,7 +4417,7 @@ msgid "No names found, cannot describe anything." msgstr "" #: builtin/describe.c:481 -msgid "--dirty is incompatible with committishes" +msgid "--dirty is incompatible with commit-ishes" msgstr "" #: builtin/diff.c:79 diff --git a/po/git.pot b/po/git.pot index cf1e446..c91e197 100644 --- a/po/git.pot +++ b/po/git.pot @@ -4335,7 +4335,7 @@ msgid "print sizes in human readable format" msgstr "" #: builtin/describe.c:16 -msgid "git describe [options] <committish>*" +msgid "git describe [options] <commit-ish>*" msgstr "" #: builtin/describe.c:17 @@ -4465,7 +4465,7 @@ msgid "No names found, cannot describe anything." msgstr "" #: builtin/describe.c:489 -msgid "--dirty is incompatible with committishes" +msgid "--dirty is incompatible with commit-ishes" msgstr "" #: builtin/diff.c:79 diff --git a/po/it.po b/po/it.po index fe61f1a..9080219 100644 --- a/po/it.po +++ b/po/it.po @@ -2476,7 +2476,7 @@ msgid "No names found, cannot describe anything." msgstr "" #: builtin/describe.c:482 -msgid "--dirty is incompatible with committishes" +msgid "--dirty is incompatible with commit-ishes" msgstr "" #: builtin/diff.c:77 diff --git a/po/nl.po b/po/nl.po index e1399e2..ad31c66 100644 --- a/po/nl.po +++ b/po/nl.po @@ -1669,7 +1669,7 @@ msgid "No names found, cannot describe anything." msgstr "" #: builtin/describe.c:482 -msgid "--dirty is incompatible with committishes" +msgid "--dirty is incompatible with commit-ishes" msgstr "" #: builtin/diff.c:77 diff --git a/po/pt_PT.po b/po/pt_PT.po index 517ec29..689ad1b 100644 --- a/po/pt_PT.po +++ b/po/pt_PT.po @@ -2312,7 +2312,7 @@ msgid "No names found, cannot describe anything." msgstr "Nenhum nome encontrado, não descreve nada." #: builtin/describe.c:482 -msgid "--dirty is incompatible with committishes" +msgid "--dirty is incompatible with commit-ishes" msgstr "" #: builtin/diff.c:77 diff --git a/po/sv.po b/po/sv.po index 12dfca9..dcf579b 100644 --- a/po/sv.po +++ b/po/sv.po @@ -4560,7 +4560,7 @@ msgid "print sizes in human readable format" msgstr "skriv storlekar i människoläsbart format" #: builtin/describe.c:16 -msgid "git describe [options] <committish>*" +msgid "git describe [options] <commit-ish>*" msgstr "git describe [flaggor] <incheckning-igt>*" #: builtin/describe.c:17 @@ -4696,8 +4696,8 @@ msgid "No names found, cannot describe anything." msgstr "Inga namn hittades, kan inte beskriva något." #: builtin/describe.c:489 -msgid "--dirty is incompatible with committishes" -msgstr "--dirty är inkompatibelt med \"committish\"-värden" +msgid "--dirty is incompatible with commit-ishes" +msgstr "--dirty är inkompatibelt med \"commit-ish\"-värden" #: builtin/diff.c:79 #, c-format diff --git a/po/vi.po b/po/vi.po index dd2d2a7..11b4912 100644 --- a/po/vi.po +++ b/po/vi.po @@ -4663,8 +4663,8 @@ msgid "print sizes in human readable format" msgstr "hiển thị kích cỡ theo định dạng dành cho người đọc" #: builtin/describe.c:16 -msgid "git describe [options] <committish>*" -msgstr "git describe [các-tùy-chọn] <committish>*" +msgid "git describe [options] <commit-ish>*" +msgstr "git describe [các-tùy-chọn] <commit-ish>*" #: builtin/describe.c:17 msgid "git describe [options] --dirty" @@ -4799,7 +4799,7 @@ msgid "No names found, cannot describe anything." msgstr "Không tìm thấy các tên, không thể mô tả gì cả." #: builtin/describe.c:489 -msgid "--dirty is incompatible with committishes" +msgid "--dirty is incompatible with commit-ishes" msgstr "--dirty là xung khắc với các tùy chọn dành cho chuyển giao (commit)" #: builtin/diff.c:79 diff --git a/po/zh_CN.po b/po/zh_CN.po index b7b46f1..1a042af 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -4562,7 +4562,7 @@ msgid "print sizes in human readable format" msgstr "以用户可读的格式显示大小" #: builtin/describe.c:16 -msgid "git describe [options] <committish>*" +msgid "git describe [options] <commit-ish>*" msgstr "git describe [选项] <提交号>*" #: builtin/describe.c:17 @@ -4698,7 +4698,7 @@ msgid "No names found, cannot describe anything." msgstr "没有发现名称，无法描述任何东西。" #: builtin/describe.c:489 -msgid "--dirty is incompatible with committishes" +msgid "--dirty is incompatible with commit-ishes" msgstr "--dirty 不能与提交同时使用" #: builtin/diff.c:79 diff --git a/sha1_name.c b/sha1_name.c index 65ad066..ad79d7b 100644 --- a/sha1_name.c +++ b/sha1_name.c @@ -1130,13 +1130,13 @@ int get_sha1(const char *name, unsigned char *sha1) } /* - * Many callers know that the user meant to name a committish by + * Many callers know that the user meant to name a commit-ish by * syntactical positions where the object name appears. Calling this * function allows the machinery to disambiguate shorter-than-unique - * abbreviated object names between committish and others. + * abbreviated object names between commit-ish and others. * * Note that this does NOT error out when the named object is not a - * committish. It is merely to give a hint to the disambiguation + * commit-ish. It is merely to give a hint to the disambiguation * machinery. */ int get_sha1_committish(const char *name, unsigned char *sha1) diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh index ac6f3b6..a74b9cf 100755 --- a/t/t9300-fast-import.sh +++ b/t/t9300-fast-import.sh @@ -2815,14 +2815,14 @@ test_expect_success 'S: notemodify with garbage after sha1 dataref must fail' ' ' # -# notemodify, mark in committish +# notemodify, mark in commit-ish # -test_expect_success 'S: notemodify with garbarge after mark committish must fail' ' +test_expect_success 'S: notemodify with garbarge after mark commit-ish must fail' ' test_must_fail git fast-import --import-marks=marks <<-EOF 2>err && commit refs/heads/Snotes committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE data <<COMMIT - commit S note committish + commit S note commit-ish COMMIT N :202 :302x EOF -- 1.8.4 ^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH v3 5/7] glossary: more precise definition of tree-ish (a.k.a. treeish) 2013-09-04 19:04 ` [PATCH v3 0/7] documentation cleanups for <rev>^{<type>} Richard Hansen ` (3 preceding siblings ...) 2013-09-04 19:04 ` [PATCH v3 4/7] use 'commit-ish' instead of 'committish' Richard Hansen @ 2013-09-04 19:04 ` Richard Hansen 2013-09-04 19:04 ` [PATCH v3 6/7] revisions.txt: fix and clarify <rev>^{<type>} Richard Hansen ` (2 subsequent siblings) 7 siblings, 0 replies; 18+ messages in thread From: Richard Hansen @ 2013-09-04 19:04 UTC (permalink / raw) To: git, gitster; +Cc: Richard Hansen A tree-ish isn't a ref. Also, mention dereferencing, and that a commit dereferences to a tree, to support gitrevisions(7) and rev-parse's error messages. Signed-off-by: Richard Hansen <rhansen@bbn.com> --- Documentation/glossary-content.txt | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt index 47e901e..3466ce9 100644 --- a/Documentation/glossary-content.txt +++ b/Documentation/glossary-content.txt @@ -499,9 +499,18 @@ should not be combined with other pathspec. <<def_tree,tree>> is equivalent to a <<def_directory,directory>>. [[def_tree-ish]]tree-ish (also treeish):: - A <<def_ref,ref>> pointing to either a <<def_commit_object,commit - object>>, a <<def_tree_object,tree object>>, or a <<def_tag_object,tag - object>> pointing to a tag or commit or tree object. + A <<def_tree_object,tree object>> or an <<def_object,object>> + that can be recursively dereferenced to a tree object. + Dereferencing a <<def_commit_object,commit object>> yields the + tree object corresponding to the <<def_revision,revision>>'s + top <<def_directory,directory>>. + The following are all tree-ishes: + a <<def_commit-ish,commit-ish>>, + a tree object, + a <<def_tag_object,tag object>> that points to a tree object, + a tag object that points to a tag object that points to a tree + object, + etc. [[def_unmerged_index]]unmerged index:: An <<def_index,index>> which contains unmerged -- 1.8.4 ^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH v3 6/7] revisions.txt: fix and clarify <rev>^{<type>} 2013-09-04 19:04 ` [PATCH v3 0/7] documentation cleanups for <rev>^{<type>} Richard Hansen ` (4 preceding siblings ...) 2013-09-04 19:04 ` [PATCH v3 5/7] glossary: more precise definition of tree-ish (a.k.a. treeish) Richard Hansen @ 2013-09-04 19:04 ` Richard Hansen 2013-09-04 19:04 ` [PATCH v3 7/7] glossary: fix and clarify the definition of 'ref' Richard Hansen 2013-09-04 22:27 ` [PATCH v3 0/7] documentation cleanups for <rev>^{<type>} Junio C Hamano 7 siblings, 0 replies; 18+ messages in thread From: Richard Hansen @ 2013-09-04 19:04 UTC (permalink / raw) To: git, gitster; +Cc: Richard Hansen If possible, <rev> will be dereferenced even if it is not a tag type (e.g., commit dereferenced to a tree). Signed-off-by: Richard Hansen <rhansen@bbn.com> --- Documentation/revisions.txt | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/Documentation/revisions.txt b/Documentation/revisions.txt index d477b3f..b0f4284 100644 --- a/Documentation/revisions.txt +++ b/Documentation/revisions.txt @@ -111,10 +111,14 @@ some output processing may assume ref names in UTF-8. '<rev>{caret}\{<type>\}', e.g. 'v0.99.8{caret}\{commit\}':: A suffix '{caret}' followed by an object type name enclosed in - brace pair means the object - could be a tag, and dereference the tag recursively until an - object of that type is found or the object cannot be - dereferenced anymore (in which case, barf). '<rev>{caret}0' + brace pair means dereference the object at '<rev>' recursively until + an object of type '<type>' is found or the object cannot be + dereferenced anymore (in which case, barf). + For example, if '<rev>' is a commit-ish, '<rev>{caret}\{commit\}' + describes the corresponding commit object. + Similarly, if '<rev>' is a tree-ish, '<rev>{caret}\{tree\}' + describes the corresponding tree object. + '<rev>{caret}0' is a short-hand for '<rev>{caret}\{commit\}'. + 'rev{caret}\{object\}' can be used to make sure 'rev' names an -- 1.8.4 ^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH v3 7/7] glossary: fix and clarify the definition of 'ref' 2013-09-04 19:04 ` [PATCH v3 0/7] documentation cleanups for <rev>^{<type>} Richard Hansen ` (5 preceding siblings ...) 2013-09-04 19:04 ` [PATCH v3 6/7] revisions.txt: fix and clarify <rev>^{<type>} Richard Hansen @ 2013-09-04 19:04 ` Richard Hansen 2013-09-04 22:27 ` [PATCH v3 0/7] documentation cleanups for <rev>^{<type>} Junio C Hamano 7 siblings, 0 replies; 18+ messages in thread From: Richard Hansen @ 2013-09-04 19:04 UTC (permalink / raw) To: git, gitster; +Cc: Richard Hansen Signed-off-by: Richard Hansen <rhansen@bbn.com> --- Documentation/glossary-content.txt | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt index 3466ce9..7ad13e1 100644 --- a/Documentation/glossary-content.txt +++ b/Documentation/glossary-content.txt @@ -395,10 +395,20 @@ should not be combined with other pathspec. to the result. [[def_ref]]ref:: - A 40-byte hex representation of a <<def_SHA1,SHA-1>> or a name that - denotes a particular <<def_object,object>>. They may be stored in - a file under `$GIT_DIR/refs/` directory, or - in the `$GIT_DIR/packed-refs` file. + A name that begins with `refs/` (e.g. `refs/heads/master`) + that points to an <<def_object_name,object name>> or another + ref (the latter is called a <<def_symref,symbolic ref>>). + For convenience, a ref can sometimes be abbreviated when used + as an argument to a Git command; see linkgit:gitrevisions[7] + for details. + Refs are stored in the <<def_repository,repository>>. ++ +The ref namespace is hierarchical. +Different subhierarchies are used for different purposes (e.g. the +`refs/heads/` hierarchy is used to represent local branches). ++ +There are a few special-purpose refs that do not begin with `refs/`. +The most notable example is `HEAD`. [[def_reflog]]reflog:: A reflog shows the local "history" of a ref. In other words, -- 1.8.4 ^ permalink raw reply related [flat|nested] 18+ messages in thread
* Re: [PATCH v3 0/7] documentation cleanups for <rev>^{<type>} 2013-09-04 19:04 ` [PATCH v3 0/7] documentation cleanups for <rev>^{<type>} Richard Hansen ` (6 preceding siblings ...) 2013-09-04 19:04 ` [PATCH v3 7/7] glossary: fix and clarify the definition of 'ref' Richard Hansen @ 2013-09-04 22:27 ` Junio C Hamano 7 siblings, 0 replies; 18+ messages in thread From: Junio C Hamano @ 2013-09-04 22:27 UTC (permalink / raw) To: Richard Hansen; +Cc: git Richard Hansen <rhansen@bbn.com> writes: > On 2013-09-03 18:46, Junio C Hamano wrote: >> I hate to say this after seeing you doing a thorough job in this >> series, but because "tree-ish" and "commit-ish" are both made-up >> words, I have a feeling that we are better off unifying to the >> dashed form, which unfortunately is the other way around from what >> your series does. > > I thought you might say that so I held on to the commits that > standardize on tree-ish and commit-ish in my local repo. :) > > This series still says "tree-ish (also treeish)" and "commit-ish (also > committish)" in gitglossary(7). Would you like me to eliminate the > "(also ...)" part? > > I'm not 100% confident that these don't break translations, although > it still builds and "make test" passes. We will find out ;-) > Changes since v2: > * standardize on 'tree-ish' instead of 'treeish' > * standardize on 'commit-ish' instead of 'committish' > > Richard Hansen (7): > glossary: mention 'treeish' as an alternative to 'tree-ish' > glossary: define commit-ish (a.k.a. committish) > use 'tree-ish' instead of 'treeish' > use 'commit-ish' instead of 'committish' > glossary: more precise definition of tree-ish (a.k.a. treeish) > revisions.txt: fix and clarify <rev>^{<type>} > glossary: fix and clarify the definition of 'ref' > > Documentation/RelNotes/1.7.11.2.txt | 2 +- > Documentation/howto/revert-branch-rebase.txt | 2 +- I generally prefer not to touch historical documents but the change in this series is small enough that I think it is OK. Thanks, will queue. ^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH v2 2/7] glossary: define committish (a.k.a. commit-ish) 2013-09-02 5:34 [PATCH v2 0/7] documentation cleanups for <rev>^{<type>} Richard Hansen 2013-09-02 5:34 ` [PATCH v2 1/7] glossary: mention 'treeish' as an alternative to 'tree-ish' Richard Hansen @ 2013-09-02 5:34 ` Richard Hansen 2013-09-02 5:34 ` [PATCH v2 3/7] use 'treeish' instead of 'tree-ish' Richard Hansen ` (4 subsequent siblings) 6 siblings, 0 replies; 18+ messages in thread From: Richard Hansen @ 2013-09-02 5:34 UTC (permalink / raw) To: git, gitster; +Cc: Richard Hansen Signed-off-by: Richard Hansen <rhansen@bbn.com> --- Documentation/glossary-content.txt | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt index 0273095..b1993e0 100644 --- a/Documentation/glossary-content.txt +++ b/Documentation/glossary-content.txt @@ -82,6 +82,18 @@ to point at the new commit. to the top <<def_directory,directory>> of the stored revision. +[[def_committish]]committish (also commit-ish):: + A <<def_commit_object,commit object>> or an + <<def_object,object>> that can be recursively dereferenced to + a commit object. + The following are all committishes: + a commit object, + a <<def_tag_object,tag object>> that points to a commit + object, + a tag object that points to a tag object that points to a + commit object, + etc. + [[def_core_git]]core Git:: Fundamental data structures and utilities of Git. Exposes only limited source code management tools. -- 1.8.4 ^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH v2 3/7] use 'treeish' instead of 'tree-ish' 2013-09-02 5:34 [PATCH v2 0/7] documentation cleanups for <rev>^{<type>} Richard Hansen 2013-09-02 5:34 ` [PATCH v2 1/7] glossary: mention 'treeish' as an alternative to 'tree-ish' Richard Hansen 2013-09-02 5:34 ` [PATCH v2 2/7] glossary: define committish (a.k.a. commit-ish) Richard Hansen @ 2013-09-02 5:34 ` Richard Hansen 2013-09-02 5:34 ` [PATCH v2 4/7] use 'committish' instead of 'commit-ish' Richard Hansen ` (3 subsequent siblings) 6 siblings, 0 replies; 18+ messages in thread From: Richard Hansen @ 2013-09-02 5:34 UTC (permalink / raw) To: git, gitster; +Cc: Richard Hansen Replace all instances of 'tree-ish' with 'treeish': * to standardize on a single spelling (the documentation contained a mix of 'treeish' and 'tree-ish') * to be consistent with variable names (hyphens are not usually allowed in variable names) * to be consistent with 'committish' * some search engines don't handle hyphens gracefully Signed-off-by: Richard Hansen <rhansen@bbn.com> --- Documentation/RelNotes/1.6.0.5.txt | 2 +- Documentation/RelNotes/1.6.2.4.txt | 2 +- Documentation/RelNotes/1.8.1.2.txt | 2 +- Documentation/RelNotes/1.8.2.txt | 2 +- Documentation/diff-format.txt | 10 +++++----- Documentation/diff-generate-patch.txt | 2 +- Documentation/git-archive.txt | 4 ++-- Documentation/git-checkout.txt | 16 ++++++++-------- Documentation/git-diff-index.txt | 4 ++-- Documentation/git-diff-tree.txt | 14 +++++++------- Documentation/git-ls-files.txt | 6 +++--- Documentation/git-ls-tree.txt | 6 +++--- Documentation/git-read-tree.txt | 10 +++++----- Documentation/git-reset.txt | 16 ++++++++-------- Documentation/git-svn.txt | 6 +++--- Documentation/git-tar-tree.txt | 4 ++-- Documentation/git.txt | 4 ++-- Documentation/gitcli.txt | 2 +- Documentation/gittutorial-2.txt | 2 +- Documentation/glossary-content.txt | 2 +- Documentation/revisions.txt | 2 +- archive.c | 6 +++--- builtin/checkout.c | 6 +++--- builtin/diff-index.c | 2 +- builtin/diff-tree.c | 2 +- builtin/diff.c | 2 +- builtin/ls-files.c | 8 ++++---- builtin/ls-tree.c | 2 +- builtin/read-tree.c | 2 +- builtin/reset.c | 4 ++-- builtin/tar-tree.c | 12 ++++++------ contrib/examples/git-checkout.sh | 10 +++++----- fast-import.c | 2 +- git-svn.perl | 6 +++--- gitweb/gitweb.perl | 4 ++-- po/de.po | 16 ++++++++-------- po/fr.po | 16 ++++++++-------- po/git.pot | 16 ++++++++-------- po/sv.po | 16 ++++++++-------- po/vi.po | 33 ++++++++++++++++---------------- po/zh_CN.po | 16 ++++++++-------- t/t1512-rev-parse-disambiguation.sh | 10 +++++----- t/t2010-checkout-ambiguous.sh | 2 +- t/t4100/t-apply-3.patch | 8 ++++---- t/t4100/t-apply-7.patch | 8 ++++---- t/t9300-fast-import.sh | 2 +- t/t9500-gitweb-standalone-no-errors.sh | 2 +- t/t9501-gitweb-standalone-http-status.sh | 8 ++++---- 48 files changed, 169 insertions(+), 170 deletions(-) diff --git a/Documentation/RelNotes/1.6.0.5.txt b/Documentation/RelNotes/1.6.0.5.txt index a08bb96..d47386b 100644 --- a/Documentation/RelNotes/1.6.0.5.txt +++ b/Documentation/RelNotes/1.6.0.5.txt @@ -13,7 +13,7 @@ Fixes since v1.6.0.4 * "git diff" always allowed GIT_EXTERNAL_DIFF and --no-ext-diff was no-op for the command. -* Giving 3 or more tree-ish to "git diff" is supposed to show the combined +* Giving 3 or more treeish to "git diff" is supposed to show the combined diff from second and subsequent trees to the first one, but the order was screwed up. diff --git a/Documentation/RelNotes/1.6.2.4.txt b/Documentation/RelNotes/1.6.2.4.txt index f4bf1d0..f75086d 100644 --- a/Documentation/RelNotes/1.6.2.4.txt +++ b/Documentation/RelNotes/1.6.2.4.txt @@ -13,7 +13,7 @@ Fixes since v1.6.2.3 * "git-add -p" lacked a way to say "q"uit to refuse staging any hunks for the remaining paths. You had to say "d" and then ^C. -* "git-checkout <tree-ish> <submodule>" did not update the index entry at +* "git-checkout <treeish> <submodule>" did not update the index entry at the named path; it now does. * "git-fast-export" choked when seeing a tag that does not point at commit. diff --git a/Documentation/RelNotes/1.8.1.2.txt b/Documentation/RelNotes/1.8.1.2.txt index 5ab7b18..0cdb2f9 100644 --- a/Documentation/RelNotes/1.8.1.2.txt +++ b/Documentation/RelNotes/1.8.1.2.txt @@ -12,7 +12,7 @@ Fixes since v1.8.1.1 after completing a single directory name. * Command line completion leaked an unnecessary error message while - looking for possible matches with paths in <tree-ish>. + looking for possible matches with paths in <treeish>. * "git archive" did not record uncompressed size in the header when streaming a zip archive, which confused some implementations of unzip. diff --git a/Documentation/RelNotes/1.8.2.txt b/Documentation/RelNotes/1.8.2.txt index fc606ae..70fda04 100644 --- a/Documentation/RelNotes/1.8.2.txt +++ b/Documentation/RelNotes/1.8.2.txt @@ -421,7 +421,7 @@ details). to add a newline after such a line. * Command line completion leaked an unnecessary error message while - looking for possible matches with paths in <tree-ish>. + looking for possible matches with paths in <treeish>. * Command line completion for "tcsh" emitted an unwanted space after completing a single directory name. diff --git a/Documentation/diff-format.txt b/Documentation/diff-format.txt index 15c7e79..28cef30 100644 --- a/Documentation/diff-format.txt +++ b/Documentation/diff-format.txt @@ -7,13 +7,13 @@ The raw output format from "git-diff-index", "git-diff-tree", These commands all compare two sets of things; what is compared differs: -git-diff-index <tree-ish>:: - compares the <tree-ish> and the files on the filesystem. +git-diff-index <treeish>:: + compares the <treeish> and the files on the filesystem. -git-diff-index --cached <tree-ish>:: - compares the <tree-ish> and the index. +git-diff-index --cached <treeish>:: + compares the <treeish> and the index. -git-diff-tree [-r] <tree-ish-1> <tree-ish-2> [<pattern>...]:: +git-diff-tree [-r] <treeish-1> <treeish-2> [<pattern>...]:: compares the trees named by the two arguments. git-diff-files [<pattern>...]:: diff --git a/Documentation/diff-generate-patch.txt b/Documentation/diff-generate-patch.txt index 55f499a..3458c22 100644 --- a/Documentation/diff-generate-patch.txt +++ b/Documentation/diff-generate-patch.txt @@ -134,7 +134,7 @@ The `mode <mode>,<mode>..<mode>` line appears only if at least one of the <mode> is different from the rest. Extended headers with information about detected contents movement (renames and copying detection) are designed to work with diff of two -<tree-ish> and are not used by combined diff format. +<treeish> and are not used by combined diff format. 3. It is followed by two-line from-file/to-file header diff --git a/Documentation/git-archive.txt b/Documentation/git-archive.txt index b97aaab..5c6aef9 100644 --- a/Documentation/git-archive.txt +++ b/Documentation/git-archive.txt @@ -11,7 +11,7 @@ SYNOPSIS [verse] 'git archive' [--format=<fmt>] [--list] [--prefix=<prefix>/] [<extra>] [-o <file> | --output=<file>] [--worktree-attributes] - [--remote=<repo> [--exec=<git-upload-archive>]] <tree-ish> + [--remote=<repo> [--exec=<git-upload-archive>]] <treeish> [<path>...] DESCRIPTION @@ -71,7 +71,7 @@ OPTIONS Used with --remote to specify the path to the 'git-upload-archive' on the remote side. -<tree-ish>:: +<treeish>:: The tree or commit to produce an archive for. <path>:: diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt index ca118ac..ea12697 100644 --- a/Documentation/git-checkout.txt +++ b/Documentation/git-checkout.txt @@ -11,8 +11,8 @@ SYNOPSIS 'git checkout' [-q] [-f] [-m] [<branch>] 'git checkout' [-q] [-f] [-m] [--detach] [<commit>] 'git checkout' [-q] [-f] [-m] [[-b|-B|--orphan] <new_branch>] [<start_point>] -'git checkout' [-f|--ours|--theirs|-m|--conflict=<style>] [<tree-ish>] [--] <paths>... -'git checkout' [-p|--patch] [<tree-ish>] [--] [<paths>...] +'git checkout' [-f|--ours|--theirs|-m|--conflict=<style>] [<treeish>] [--] <paths>... +'git checkout' [-p|--patch] [<treeish>] [--] [<paths>...] DESCRIPTION ----------- @@ -76,14 +76,14 @@ the option, giving a branch name to the command would check out the branch, instead of detaching HEAD at it), or the current commit, if no <branch> is specified. -'git checkout' [-p|--patch] [<tree-ish>] [--] <pathspec>...:: +'git checkout' [-p|--patch] [<treeish>] [--] <pathspec>...:: When <paths> or `--patch` are given, 'git checkout' does *not* switch branches. It updates the named paths in the working tree - from the index file or from a named <tree-ish> (most often a + from the index file or from a named <treeish> (most often a commit). In this case, the `-b` and `--track` options are meaningless and giving either of them results in an error. The - <tree-ish> argument can be used to specify a specific tree-ish + <treeish> argument can be used to specify a specific treeish (i.e. commit, tag or tree) to update the index for the given paths before updating the working tree. + @@ -215,9 +215,9 @@ the conflicted merge in the specified paths. -p:: --patch:: Interactively select hunks in the difference between the - <tree-ish> (or the index, if unspecified) and the working + <treeish> (or the index, if unspecified) and the working tree. The chosen hunks are then applied in reverse to the - working tree (and if a <tree-ish> was specified, the index). + working tree (and if a <treeish> was specified, the index). + This means that you can use `git checkout -p` to selectively discard edits from your current working tree. See the ``Interactive Mode'' @@ -245,7 +245,7 @@ leave out at most one of `A` and `B`, in which case it defaults to `HEAD`. The name of a commit at which to start the new branch; see linkgit:git-branch[1] for details. Defaults to HEAD. -<tree-ish>:: +<treeish>:: Tree to checkout from (when paths are given). If not specified, the index will be used. diff --git a/Documentation/git-diff-index.txt b/Documentation/git-diff-index.txt index a86cf62..23bff68 100644 --- a/Documentation/git-diff-index.txt +++ b/Documentation/git-diff-index.txt @@ -9,7 +9,7 @@ git-diff-index - Compare a tree to the working tree or index SYNOPSIS -------- [verse] -'git diff-index' [-m] [--cached] [<common diff options>] <tree-ish> [<path>...] +'git diff-index' [-m] [--cached] [<common diff options>] <treeish> [<path>...] DESCRIPTION ----------- @@ -23,7 +23,7 @@ OPTIONS ------- include::diff-options.txt[] -<tree-ish>:: +<treeish>:: The id of a tree object to diff against. --cached:: diff --git a/Documentation/git-diff-tree.txt b/Documentation/git-diff-tree.txt index 1439486..523d9e4 100644 --- a/Documentation/git-diff-tree.txt +++ b/Documentation/git-diff-tree.txt @@ -11,13 +11,13 @@ SYNOPSIS [verse] 'git diff-tree' [--stdin] [-m] [-s] [-v] [--no-commit-id] [--pretty] [-t] [-r] [-c | --cc] [--root] [<common diff options>] - <tree-ish> [<tree-ish>] [<path>...] + <treeish> [<treeish>] [<path>...] DESCRIPTION ----------- Compares the content and mode of the blobs found via two tree objects. -If there is only one <tree-ish> given, the commit is compared with its parents +If there is only one <treeish> given, the commit is compared with its parents (see --stdin below). Note that 'git diff-tree' can use the tree encapsulated in a commit object. @@ -26,7 +26,7 @@ OPTIONS ------- include::diff-options.txt[] -<tree-ish>:: +<treeish>:: The id of a tree object. <path>...:: @@ -48,7 +48,7 @@ include::diff-options.txt[] --stdin:: When '--stdin' is specified, the command does not take - <tree-ish> arguments from the command line. Instead, it + <treeish> arguments from the command line. Instead, it reads lines containing either two <tree>, one <commit>, or a list of <commit> from its standard input. (Use a single space as separator.) @@ -91,7 +91,7 @@ include::pretty-options.txt[] -c:: This flag changes the way a merge commit is displayed (which means it is useful only when the command is given - one <tree-ish>, or '--stdin'). It shows the differences + one <treeish>, or '--stdin'). It shows the differences from each of the parents to the merge result simultaneously instead of showing pairwise diff between a parent and the result one at a time (which is what the '-m' option does). @@ -121,13 +121,13 @@ Limiting Output If you're only interested in differences in a subset of files, for example some architecture-specific files, you might do: - git diff-tree -r <tree-ish> <tree-ish> arch/ia64 include/asm-ia64 + git diff-tree -r <treeish> <treeish> arch/ia64 include/asm-ia64 and it will only show you what changed in those two directories. Or if you are searching for what changed in just `kernel/sched.c`, just do - git diff-tree -r <tree-ish> <tree-ish> kernel/sched.c + git diff-tree -r <treeish> <treeish> kernel/sched.c and it will ignore all differences to other files. diff --git a/Documentation/git-ls-files.txt b/Documentation/git-ls-files.txt index c0856a6..13f37dc 100644 --- a/Documentation/git-ls-files.txt +++ b/Documentation/git-ls-files.txt @@ -16,7 +16,7 @@ SYNOPSIS [-X <file>|--exclude-from=<file>] [--exclude-per-directory=<file>] [--exclude-standard] - [--error-unmatch] [--with-tree=<tree-ish>] + [--error-unmatch] [--with-tree=<treeish>] [--full-name] [--abbrev] [--] [<file>...] DESCRIPTION @@ -99,11 +99,11 @@ OPTIONS If any <file> does not appear in the index, treat this as an error (return 1). ---with-tree=<tree-ish>:: +--with-tree=<treeish>:: When using --error-unmatch to expand the user supplied <file> (i.e. path pattern) arguments to paths, pretend that paths which were removed in the index since the - named <tree-ish> are still present. Using this option + named <treeish> are still present. Using this option with `-s` or `-u` options does not make any sense. -t:: diff --git a/Documentation/git-ls-tree.txt b/Documentation/git-ls-tree.txt index 16e87fd..8c99cda 100644 --- a/Documentation/git-ls-tree.txt +++ b/Documentation/git-ls-tree.txt @@ -11,7 +11,7 @@ SYNOPSIS [verse] 'git ls-tree' [-d] [-r] [-t] [-l] [-z] [--name-only] [--name-status] [--full-name] [--full-tree] [--abbrev[=<n>]] - <tree-ish> [<path>...] + <treeish> [<path>...] DESCRIPTION ----------- @@ -35,8 +35,8 @@ in the current working directory. Note that: OPTIONS ------- -<tree-ish>:: - Id of a tree-ish. +<treeish>:: + Id of a treeish. -d:: Show only the named tree entry itself, not its children. diff --git a/Documentation/git-read-tree.txt b/Documentation/git-read-tree.txt index c4bde65..98ba1f6 100644 --- a/Documentation/git-read-tree.txt +++ b/Documentation/git-read-tree.txt @@ -12,12 +12,12 @@ SYNOPSIS 'git read-tree' [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] [-u [--exclude-per-directory=<gitignore>] | -i]] [--index-output=<file>] [--no-sparse-checkout] - (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]]) + (--empty | <treeish1> [<treeish2> [<treeish3>]]) DESCRIPTION ----------- -Reads the tree information given by <tree-ish> into the index, +Reads the tree information given by <treeish> into the index, but does not actually *update* any of the files it "caches". (see: linkgit:git-checkout-index[1]) @@ -83,7 +83,7 @@ OPTIONS --prefix=<prefix>/:: Keep the current index contents, and read the contents - of the named tree-ish under the directory at `<prefix>`. + of the named treeish under the directory at `<prefix>`. The command will refuse to overwrite entries that already existed in the original index file. Note that the `<prefix>/` value must end with a slash. @@ -123,7 +123,7 @@ OPTIONS Instead of reading tree object(s) into the index, just empty it. -<tree-ish#>:: +<treeish#>:: The id of the tree object(s) to be read/merged. @@ -283,7 +283,7 @@ merge. The different stages represent the "result tree" (stage 0, aka you are trying to merge (stage 2 and 3 respectively). The order of stages 1, 2 and 3 (hence the order of three -<tree-ish> command line arguments) are significant when you +<treeish> command line arguments) are significant when you start a 3-way merge with an index file that is already populated. Here is an outline of how the algorithm works: diff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt index f445cb3..058f578 100644 --- a/Documentation/git-reset.txt +++ b/Documentation/git-reset.txt @@ -8,20 +8,20 @@ git-reset - Reset current HEAD to the specified state SYNOPSIS -------- [verse] -'git reset' [-q] [<tree-ish>] [--] <paths>... -'git reset' (--patch | -p) [<tree-ish>] [--] [<paths>...] +'git reset' [-q] [<treeish>] [--] <paths>... +'git reset' (--patch | -p) [<treeish>] [--] [<paths>...] 'git reset' [--soft | --mixed | --hard | --merge | --keep] [-q] [<commit>] DESCRIPTION ----------- -In the first and second form, copy entries from <tree-ish> to the index. +In the first and second form, copy entries from <treeish> to the index. In the third form, set the current branch head (HEAD) to <commit>, optionally -modifying index and working tree to match. The <tree-ish>/<commit> defaults +modifying index and working tree to match. The <treeish>/<commit> defaults to HEAD in all forms. -'git reset' [-q] [<tree-ish>] [--] <paths>...:: +'git reset' [-q] [<treeish>] [--] <paths>...:: This form resets the index entries for all <paths> to their - state at <tree-ish>. (It does not affect the working tree, nor + state at <treeish>. (It does not affect the working tree, nor the current branch.) + This means that `git reset <paths>` is the opposite of `git add @@ -34,9 +34,9 @@ Alternatively, using linkgit:git-checkout[1] and specifying a commit, you can copy the contents of a path out of a commit to the index and to the working tree in one go. -'git reset' (--patch | -p) [<tree-ish>] [--] [<paths>...]:: +'git reset' (--patch | -p) [<treeish>] [--] [<paths>...]:: Interactively select hunks in the difference between the index - and <tree-ish> (defaults to HEAD). The chosen hunks are applied + and <treeish> (defaults to HEAD). The chosen hunks are applied in reverse to the index. + This means that `git reset -p` is the opposite of `git add -p`, i.e. diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt index 4dd3bcb..e6cb24a 100644 --- a/Documentation/git-svn.txt +++ b/Documentation/git-svn.txt @@ -363,8 +363,8 @@ Any other arguments are passed directly to 'git log' 'find-rev':: When given an SVN revision number of the form 'rN', returns the corresponding Git commit hash (this can optionally be followed by a - tree-ish to specify which branch should be searched). When given a - tree-ish, returns the corresponding SVN revision number. + treeish to specify which branch should be searched). When given a + treeish, returns the corresponding SVN revision number. + --before;; Don't require an exact match if given an SVN revision, instead find @@ -406,7 +406,7 @@ Any other arguments are passed directly to 'git log' more information.) 'commit-diff':: - Commits the diff of two tree-ish arguments from the + Commits the diff of two treeish arguments from the command-line. This command does not rely on being inside an `git svn init`-ed repository. This command takes three arguments, (a) the original tree to diff against, (b) the new tree result, (c) the diff --git a/Documentation/git-tar-tree.txt b/Documentation/git-tar-tree.txt index f7362dc..75417c6 100644 --- a/Documentation/git-tar-tree.txt +++ b/Documentation/git-tar-tree.txt @@ -9,7 +9,7 @@ git-tar-tree - Create a tar archive of the files in the named tree object SYNOPSIS -------- [verse] -'git tar-tree' [--remote=<repo>] <tree-ish> [ <base> ] +'git tar-tree' [--remote=<repo>] <treeish> [ <base> ] DESCRIPTION ----------- @@ -30,7 +30,7 @@ It can be extracted using 'git get-tar-commit-id'. OPTIONS ------- -<tree-ish>:: +<treeish>:: The tree or commit to produce tar archive for. If it is the object name of a commit object. diff --git a/Documentation/git.txt b/Documentation/git.txt index 83edf30..c07915b 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -600,9 +600,9 @@ Identifier Terminology <commit>:: Indicates a commit object name. -<tree-ish>:: +<treeish>:: Indicates a tree, commit or tag object name. A - command that takes a <tree-ish> argument ultimately wants to + command that takes a <treeish> argument ultimately wants to operate on a <tree> object but automatically dereferences <commit> and <tag> objects that point at a <tree>. diff --git a/Documentation/gitcli.txt b/Documentation/gitcli.txt index 9ac5088..4f8d4a0 100644 --- a/Documentation/gitcli.txt +++ b/Documentation/gitcli.txt @@ -16,7 +16,7 @@ DESCRIPTION This manual describes the convention used throughout Git CLI. Many commands take revisions (most often "commits", but sometimes -"tree-ish", depending on the context and command) and paths as their +"treeish", depending on the context and command) and paths as their arguments. Here are the rules: * Revisions come first and then paths. diff --git a/Documentation/gittutorial-2.txt b/Documentation/gittutorial-2.txt index 3109ea8..c5f9903 100644 --- a/Documentation/gittutorial-2.txt +++ b/Documentation/gittutorial-2.txt @@ -212,7 +212,7 @@ ways--by the SHA-1 name for that tree, by the name of a commit that refers to the tree, by the name of a branch whose head refers to that tree, etc.--and most such commands can accept any of these names. -In command synopses, the word "tree-ish" is sometimes used to +In command synopses, the word "treeish" is sometimes used to designate such an argument. The index file diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt index b1993e0..257a7fe 100644 --- a/Documentation/glossary-content.txt +++ b/Documentation/glossary-content.txt @@ -498,7 +498,7 @@ should not be combined with other pathspec. with refs to the associated blob and/or tree objects. A <<def_tree,tree>> is equivalent to a <<def_directory,directory>>. -[[def_tree-ish]]tree-ish (also treeish):: +[[def_treeish]]treeish (also tree-ish):: A <<def_ref,ref>> pointing to either a <<def_commit_object,commit object>>, a <<def_tree_object,tree object>>, or a <<def_tag_object,tag object>> pointing to a tag or commit or tree object. diff --git a/Documentation/revisions.txt b/Documentation/revisions.txt index d477b3f..569b563 100644 --- a/Documentation/revisions.txt +++ b/Documentation/revisions.txt @@ -147,7 +147,7 @@ it does not have to be dereferenced even once to get to an object. '<rev>:<path>', e.g. 'HEAD:README', ':README', 'master:./README':: A suffix ':' followed by a path names the blob or tree - at the given path in the tree-ish object named by the part + at the given path in the treeish object named by the part before the colon. ':path' (with an empty part before the colon) is a special case of the syntax described next: content diff --git a/archive.c b/archive.c index d254fa5..a76c068 100644 --- a/archive.c +++ b/archive.c @@ -7,9 +7,9 @@ #include "unpack-trees.h" static char const * const archive_usage[] = { - N_("git archive [options] <tree-ish> [<path>...]"), + N_("git archive [options] <treeish> [<path>...]"), N_("git archive --list"), - N_("git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [<path>...]"), + N_("git archive --remote <repo> [--exec <cmd>] [options] <treeish> [<path>...]"), N_("git archive --remote <repo> [--exec <cmd>] --list"), NULL }; @@ -373,7 +373,7 @@ static int parse_archive_args(int argc, const char **argv, if (!format) format = "tar"; - /* We need at least one parameter -- tree-ish */ + /* We need at least one parameter -- treeish */ if (argc < 1) usage_with_options(archive_usage, opts); *ar = lookup_archiver(format); diff --git a/builtin/checkout.c b/builtin/checkout.c index 7025938..3b375e4 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -283,7 +283,7 @@ static int checkout_paths(const struct checkout_opts *opts, continue; if (opts->source_tree && !(ce->ce_flags & CE_UPDATE)) /* - * "git checkout tree-ish -- path", but this entry + * "git checkout treeish -- path", but this entry * is in the original index; it will not be checked * out to the working tree and it does not matter * if pathspec matched this entry. We will not do @@ -291,11 +291,11 @@ static int checkout_paths(const struct checkout_opts *opts, */ continue; /* - * Either this entry came from the tree-ish we are + * Either this entry came from the treeish we are * checking the paths out of, or we are checking out * of the index. * - * If it comes from the tree-ish, we already know it + * If it comes from the treeish, we already know it * matches the pathspec and could just stamp * CE_MATCHED to it from update_some(). But we still * need ps_matched and read_tree_recursive (and diff --git a/builtin/diff-index.c b/builtin/diff-index.c index 1c737f7..d931078 100644 --- a/builtin/diff-index.c +++ b/builtin/diff-index.c @@ -7,7 +7,7 @@ static const char diff_cache_usage[] = "git diff-index [-m] [--cached] " -"[<common diff options>] <tree-ish> [<path>...]" +"[<common diff options>] <treeish> [<path>...]" COMMON_DIFF_OPTIONS_HELP; int cmd_diff_index(int argc, const char **argv, const char *prefix) diff --git a/builtin/diff-tree.c b/builtin/diff-tree.c index be6417d..757b2e8 100644 --- a/builtin/diff-tree.c +++ b/builtin/diff-tree.c @@ -88,7 +88,7 @@ static int diff_tree_stdin(char *line) static const char diff_tree_usage[] = "git diff-tree [--stdin] [-m] [-c] [--cc] [-s] [-v] [--pretty] [-t] [-r] [--root] " -"[<common diff options>] <tree-ish> [<tree-ish>] [<path>...]\n" +"[<common diff options>] <treeish> [<treeish>] [<path>...]\n" " -r diff recursively\n" " --root include the initial commit as diff against /dev/null\n" COMMON_DIFF_OPTIONS_HELP; diff --git a/builtin/diff.c b/builtin/diff.c index 9fc273d..05de306 100644 --- a/builtin/diff.c +++ b/builtin/diff.c @@ -261,7 +261,7 @@ int cmd_diff(int argc, const char **argv, const char *prefix) int result = 0; /* - * We could get N tree-ish in the rev.pending_objects list. + * We could get N treeish in the rev.pending_objects list. * Also there could be M blobs there, and P pathspecs. * * N=0, M=0: diff --git a/builtin/ls-files.c b/builtin/ls-files.c index 5cf3e31..d57232a 100644 --- a/builtin/ls-files.c +++ b/builtin/ls-files.c @@ -319,10 +319,10 @@ void overlay_tree_on_cache(const char *tree_name, const char *prefix) int i; if (get_sha1(tree_name, sha1)) - die("tree-ish %s not found.", tree_name); + die("treeish %s not found.", tree_name); tree = parse_tree_indirect(sha1); if (!tree) - die("bad tree-ish %s", tree_name); + die("bad treeish %s", tree_name); /* Hoist the unmerged entries up to stage #3 to make room */ for (i = 0; i < active_nr; i++) { @@ -506,8 +506,8 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix) PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL }, OPT_BOOLEAN(0, "error-unmatch", &error_unmatch, N_("if any <file> is not in the index, treat this as an error")), - OPT_STRING(0, "with-tree", &with_tree, N_("tree-ish"), - N_("pretend that paths removed since <tree-ish> are still present")), + OPT_STRING(0, "with-tree", &with_tree, N_("treeish"), + N_("pretend that paths removed since <treeish> are still present")), OPT__ABBREV(&abbrev), OPT_BOOLEAN(0, "debug", &debug_mode, N_("show debugging data")), OPT_END() diff --git a/builtin/ls-tree.c b/builtin/ls-tree.c index fb76e38..948116a 100644 --- a/builtin/ls-tree.c +++ b/builtin/ls-tree.c @@ -24,7 +24,7 @@ static int chomp_prefix; static const char *ls_tree_prefix; static const char * const ls_tree_usage[] = { - N_("git ls-tree [<options>] <tree-ish> [<path>...]"), + N_("git ls-tree [<options>] <treeish> [<path>...]"), NULL }; diff --git a/builtin/read-tree.c b/builtin/read-tree.c index 0f5d7fe..14a6367 100644 --- a/builtin/read-tree.c +++ b/builtin/read-tree.c @@ -33,7 +33,7 @@ static int list_tree(unsigned char *sha1) } static const char * const read_tree_usage[] = { - N_("git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] [-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"), + N_("git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] [-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--index-output=<file>] (--empty | <treeish1> [<treeish2> [<treeish3>]])"), NULL }; diff --git a/builtin/reset.c b/builtin/reset.c index afa6e02..ecc47d9 100644 --- a/builtin/reset.c +++ b/builtin/reset.c @@ -23,8 +23,8 @@ static const char * const git_reset_usage[] = { N_("git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"), - N_("git reset [-q] <tree-ish> [--] <paths>..."), - N_("git reset --patch [<tree-ish>] [--] [<paths>...]"), + N_("git reset [-q] <treeish> [--] <paths>..."), + N_("git reset --patch [<treeish>] [--] [<paths>...]"), NULL }; diff --git a/builtin/tar-tree.c b/builtin/tar-tree.c index 3f1e701..8d751a2 100644 --- a/builtin/tar-tree.c +++ b/builtin/tar-tree.c @@ -8,7 +8,7 @@ #include "quote.h" static const char tar_tree_usage[] = -"git tar-tree [--remote=<repo>] <tree-ish> [basedir]\n" +"git tar-tree [--remote=<repo>] <treeish> [basedir]\n" "*** Note that this command is now deprecated; use \"git archive\" instead."; static const char builtin_get_tar_commit_id_usage[] = @@ -21,10 +21,10 @@ int cmd_tar_tree(int argc, const char **argv, const char *prefix) * * $0 --remote=<repo> arg... ==> * git archive --format=tar --remote=<repo> arg... - * $0 tree-ish ==> - * git archive --format=tar tree-ish - * $0 tree-ish basedir ==> - * git archive --format-tar --prefix=basedir tree-ish + * $0 treeish ==> + * git archive --format=tar treeish + * $0 treeish basedir ==> + * git archive --format-tar --prefix=basedir treeish */ int i; const char **nargv = xcalloc(sizeof(*nargv), argc + 3); @@ -57,7 +57,7 @@ int cmd_tar_tree(int argc, const char **argv, const char *prefix) nargv[nargc++] = basedir_arg; /* fallthru */ case 2: - /* tree-ish */ + /* treeish */ nargv[nargc++] = argv[1]; } nargv[nargc] = NULL; diff --git a/contrib/examples/git-checkout.sh b/contrib/examples/git-checkout.sh index 1a7689a..9c6a1a9 100755 --- a/contrib/examples/git-checkout.sh +++ b/contrib/examples/git-checkout.sh @@ -85,7 +85,7 @@ then shift elif rev=$(git rev-parse --verify "$rev^{tree}" 2>/dev/null) then - # checking out selected paths from a tree-ish. + # checking out selected paths from a treeish. new="$rev" new_name="$rev^{tree}" shift @@ -110,7 +110,7 @@ esac # # With paths, we are _never_ switching branch, but checking out # the named paths from either index (when no rev is given), -# or the named tree-ish (when rev is given). +# or the named treeish (when rev is given). if test "$#" -ge 1 then @@ -126,9 +126,9 @@ Did you intend to checkout '$@' which can not be resolved as commit?" fi if test '' != "$new" then - # from a specific tree-ish; note that this is for + # from a specific treeish; note that this is for # rescuing paths and is never meant to remove what - # is not in the named tree-ish. + # is not in the named treeish. git ls-tree --full-name -r "$new" "$@" | git update-index --index-info || exit $? fi @@ -147,7 +147,7 @@ Did you intend to checkout '$@' which can not be resolved as commit?" exit $? else # Make sure we did not fall back on $arg^{tree} codepath - # since we are not checking out from an arbitrary tree-ish, + # since we are not checking out from an arbitrary treeish, # but switching branches. if test '' != "$new" then diff --git a/fast-import.c b/fast-import.c index 23f625f..b86576b 100644 --- a/fast-import.c +++ b/fast-import.c @@ -3053,7 +3053,7 @@ static void parse_ls(struct branch *b) hashcpy(root->versions[1].sha1, e->idx.sha1); load_tree(root); if (*p++ != ' ') - die("Missing space after tree-ish: %s", command_buf.buf); + die("Missing space after treeish: %s", command_buf.buf); } if (*p == '"') { static struct strbuf uq = STRBUF_INIT; diff --git a/git-svn.perl b/git-svn.perl index ff1ce3d..f9de11e 100755 --- a/git-svn.perl +++ b/git-svn.perl @@ -216,7 +216,7 @@ my %cmd = ( 'username=s' => \$Git::SVN::Prompt::_username, 'commit-url=s' => \$_commit_url } ], 'set-tree' => [ \&cmd_set_tree, - "Set an SVN repository to a git tree-ish", + "Set an SVN repository to a git treeish", { 'stdin' => \$_stdin, %cmt_opts, %fc_opts, } ], 'create-ignore' => [ \&cmd_create_ignore, 'Create a .gitignore per svn:ignore', @@ -259,7 +259,7 @@ my %cmd = ( 'pager=s' => \$Git::SVN::Log::pager } ], 'find-rev' => [ \&cmd_find_rev, - "Translate between SVN revision numbers and tree-ish", + "Translate between SVN revision numbers and treeish", { 'before' => \$_before, 'after' => \$_after } ], 'rebase' => [ \&cmd_rebase, "Fetch and rebase your working directory", @@ -1431,7 +1431,7 @@ sub cmd_multi_fetch { sub cmd_commit_diff { my ($ta, $tb, $url) = @_; my $usage = "usage: $0 commit-diff -r<revision> ". - "<tree-ish> <tree-ish> [<URL>]"; + "<treeish> <treeish> [<URL>]"; fatal($usage) if (!defined $ta || !defined $tb); my $svn_path = ''; if (!defined $url) { diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index f429f75..3f4c8ae 100755 --- a/gitweb/gitweb.perl +++ b/gitweb/gitweb.perl @@ -2765,7 +2765,7 @@ sub git_get_hash_by_path { return $3; } -# get path of entry with given hash at given tree-ish (ref) +# get path of entry with given hash at given treeish (ref) # used to get 'from' filename for combined diff (merge commit) for renames sub git_get_path_by_hash { my $base = shift || return; @@ -7235,7 +7235,7 @@ sub git_snapshot { if (!$type) { die_error(404, 'Object does not exist'); } elsif ($type eq 'blob') { - die_error(400, 'Object is not a tree-ish'); + die_error(400, 'Object is not a treeish'); } my ($name, $prefix) = snapshot_name($project, $hash); diff --git a/po/de.po b/po/de.po index 11dde11..00519b2 100644 --- a/po/de.po +++ b/po/de.po @@ -39,7 +39,7 @@ msgstr "" "oder benutzen Sie 'git commit -a'." #: archive.c:10 -msgid "git archive [options] <tree-ish> [<path>...]" +msgid "git archive [options] <treeish> [<path>...]" msgstr "git archive [Optionen] <Commit-Referenz> [<Pfad>...]" #: archive.c:11 @@ -48,7 +48,7 @@ msgstr "git archive --list" #: archive.c:12 msgid "" -"git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [<path>...]" +"git archive --remote <repo> [--exec <cmd>] [options] <treeish> [<path>...]" msgstr "" "git archive --remote <Repository> [--exec <Programm>] [Optionen] <Commit-" "Referenz> [Pfad...]" @@ -6494,11 +6494,11 @@ msgstr "" "befindet" #: builtin/ls-files.c:509 -msgid "tree-ish" +msgid "treeish" msgstr "Commit-Referenz" #: builtin/ls-files.c:510 -msgid "pretend that paths removed since <tree-ish> are still present" +msgid "pretend that paths removed since <treeish> are still present" msgstr "" "gibt vor, dass Pfade, die seit <Commit-Referenz> gelöscht wurden, immer noch " "vorhanden sind" @@ -6508,7 +6508,7 @@ msgid "show debugging data" msgstr "zeigt Ausgaben zur Fehlersuche an" #: builtin/ls-tree.c:27 -msgid "git ls-tree [<options>] <tree-ish> [<path>...]" +msgid "git ls-tree [<options>] <treeish> [<path>...]" msgstr "git ls-tree [<Optionen>] <Commit-Referenz> [<Pfad>...]" #: builtin/ls-tree.c:125 @@ -7969,7 +7969,7 @@ msgstr "Die Option --delete kann nur mit Referenzen verwendet werden." msgid "" "git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] " "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" -"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])" +"index-output=<file>] (--empty | <treeish1> [<treeish2> [<treeish3>]])" msgstr "" "git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<Prefix>] " "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" @@ -8596,11 +8596,11 @@ msgstr "" "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<Commit>]" #: builtin/reset.c:26 -msgid "git reset [-q] <tree-ish> [--] <paths>..." +msgid "git reset [-q] <treeish> [--] <paths>..." msgstr "git reset [-q] <Commit-Referenz> [--] <Pfade>..." #: builtin/reset.c:27 -msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" +msgid "git reset --patch [<treeish>] [--] [<paths>...]" msgstr "git reset --patch [<Commit-Referenz>] [--] [<Pfade>...]" #: builtin/reset.c:33 diff --git a/po/fr.po b/po/fr.po index fa98cfe..8d74171 100644 --- a/po/fr.po +++ b/po/fr.po @@ -37,7 +37,7 @@ msgstr "Corrigez-les dans l'espace de travail,\n" "ou utilisez 'git commit -a'." #: archive.c:10 -msgid "git archive [options] <tree-ish> [<path>...]" +msgid "git archive [options] <treeish> [<path>...]" msgstr "git archive [options] <arbre> [<chemin>...]" #: archive.c:11 @@ -46,7 +46,7 @@ msgstr "git archive --list" #: archive.c:12 msgid "" -"git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [<path>...]" +"git archive --remote <repo> [--exec <cmd>] [options] <treeish> [<path>...]" msgstr "git archive --remote <dépot> [--exec <commande>] [options] <arbre> [<chemin>...]" #: archive.c:13 @@ -5959,11 +5959,11 @@ msgid "if any <file> is not in the index, treat this as an error" msgstr "" #: builtin/ls-files.c:503 -msgid "tree-ish" +msgid "treeish" msgstr "" #: builtin/ls-files.c:504 -msgid "pretend that paths removed since <tree-ish> are still present" +msgid "pretend that paths removed since <treeish> are still present" msgstr "" #: builtin/ls-files.c:506 @@ -5971,7 +5971,7 @@ msgid "show debugging data" msgstr "" #: builtin/ls-tree.c:27 -msgid "git ls-tree [<options>] <tree-ish> [<path>...]" +msgid "git ls-tree [<options>] <treeish> [<path>...]" msgstr "" #: builtin/ls-tree.c:125 @@ -7307,7 +7307,7 @@ msgstr "" msgid "" "git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] " "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" -"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])" +"index-output=<file>] (--empty | <treeish1> [<treeish2> [<treeish3>]])" msgstr "" #: builtin/read-tree.c:108 @@ -7894,11 +7894,11 @@ msgid "" msgstr "" #: builtin/reset.c:26 -msgid "git reset [-q] <tree-ish> [--] <paths>..." +msgid "git reset [-q] <treeish> [--] <paths>..." msgstr "" #: builtin/reset.c:27 -msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" +msgid "git reset --patch [<treeish>] [--] [<paths>...]" msgstr "" #: builtin/reset.c:33 diff --git a/po/git.pot b/po/git.pot index cf1e446..928268f 100644 --- a/po/git.pot +++ b/po/git.pot @@ -36,7 +36,7 @@ msgid "" msgstr "" #: archive.c:10 -msgid "git archive [options] <tree-ish> [<path>...]" +msgid "git archive [options] <treeish> [<path>...]" msgstr "" #: archive.c:11 @@ -45,7 +45,7 @@ msgstr "" #: archive.c:12 msgid "" -"git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [<path>...]" +"git archive --remote <repo> [--exec <cmd>] [options] <treeish> [<path>...]" msgstr "" #: archive.c:13 @@ -6084,11 +6084,11 @@ msgid "if any <file> is not in the index, treat this as an error" msgstr "" #: builtin/ls-files.c:509 -msgid "tree-ish" +msgid "treeish" msgstr "" #: builtin/ls-files.c:510 -msgid "pretend that paths removed since <tree-ish> are still present" +msgid "pretend that paths removed since <treeish> are still present" msgstr "" #: builtin/ls-files.c:512 @@ -6096,7 +6096,7 @@ msgid "show debugging data" msgstr "" #: builtin/ls-tree.c:27 -msgid "git ls-tree [<options>] <tree-ish> [<path>...]" +msgid "git ls-tree [<options>] <treeish> [<path>...]" msgstr "" #: builtin/ls-tree.c:125 @@ -7411,7 +7411,7 @@ msgstr "" msgid "" "git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] " "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" -"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])" +"index-output=<file>] (--empty | <treeish1> [<treeish2> [<treeish3>]])" msgstr "" #: builtin/read-tree.c:109 @@ -8008,11 +8008,11 @@ msgid "" msgstr "" #: builtin/reset.c:26 -msgid "git reset [-q] <tree-ish> [--] <paths>..." +msgid "git reset [-q] <treeish> [--] <paths>..." msgstr "" #: builtin/reset.c:27 -msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" +msgid "git reset --patch [<treeish>] [--] [<paths>...]" msgstr "" #: builtin/reset.c:33 diff --git a/po/sv.po b/po/sv.po index 12dfca9..cdee340 100644 --- a/po/sv.po +++ b/po/sv.po @@ -39,7 +39,7 @@ msgstr "" "eller använd \"git commit -a\"." #: archive.c:10 -msgid "git archive [options] <tree-ish> [<path>...]" +msgid "git archive [options] <treeish> [<path>...]" msgstr "git archive [flaggor] <träd-igt> [<sökväg>...]" #: archive.c:11 @@ -48,7 +48,7 @@ msgstr "git archive --list" #: archive.c:12 msgid "" -"git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [<path>...]" +"git archive --remote <repo> [--exec <cmd>] [options] <treeish> [<path>...]" msgstr "" "git archive --remote <arkiv> [--exec <kmd>] [flaggor] <träd-igt> " "[<sökväg>...]" @@ -6334,11 +6334,11 @@ msgid "if any <file> is not in the index, treat this as an error" msgstr "om en <fil> inte är indexet, betrakta det som ett fel" #: builtin/ls-files.c:509 -msgid "tree-ish" +msgid "treeish" msgstr "träd-igt" #: builtin/ls-files.c:510 -msgid "pretend that paths removed since <tree-ish> are still present" +msgid "pretend that paths removed since <treeish> are still present" msgstr "låtsas att sökvägar borttagna sedan <träd-igt> fortfarande finns" #: builtin/ls-files.c:512 @@ -6346,7 +6346,7 @@ msgid "show debugging data" msgstr "visa felsökningsutdata" #: builtin/ls-tree.c:27 -msgid "git ls-tree [<options>] <tree-ish> [<path>...]" +msgid "git ls-tree [<options>] <treeish> [<path>...]" msgstr "git ls-tree [<flaggor>] <träd-igt> [<sökväg>...]" #: builtin/ls-tree.c:125 @@ -7770,7 +7770,7 @@ msgstr "--delete kan inte användas utan referenser" msgid "" "git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] " "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" -"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])" +"index-output=<file>] (--empty | <treeish1> [<treeish2> [<treeish3>]])" msgstr "" "git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] " "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" @@ -8383,11 +8383,11 @@ msgstr "" "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<incheckning>]" #: builtin/reset.c:26 -msgid "git reset [-q] <tree-ish> [--] <paths>..." +msgid "git reset [-q] <treeish> [--] <paths>..." msgstr "git reset [-q] <träd-igt> [--] <sökvägar>..." #: builtin/reset.c:27 -msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" +msgid "git reset --patch [<treeish>] [--] [<paths>...]" msgstr "git reset --patch [<träd-igt>] [--] [<sökvägar>...]" #: builtin/reset.c:33 diff --git a/po/vi.po b/po/vi.po index dd2d2a7..ebc079c 100644 --- a/po/vi.po +++ b/po/vi.po @@ -43,8 +43,8 @@ msgstr "" "hoặc là dùng lệnh \"git commit -a\"." #: archive.c:10 -msgid "git archive [options] <tree-ish> [<path>...]" -msgstr "git archive [các-tùy-chọn] <tree-ish> [<đường-dẫn>...]" +msgid "git archive [options] <treeish> [<path>...]" +msgstr "git archive [các-tùy-chọn] <treeish> [<đường-dẫn>...]" #: archive.c:11 msgid "git archive --list" @@ -52,9 +52,9 @@ msgstr "git archive --list" #: archive.c:12 msgid "" -"git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [<path>...]" +"git archive --remote <repo> [--exec <cmd>] [options] <treeish> [<path>...]" msgstr "" -"git archive --remote <kho> [--exec <lệnh>] [các-tùy-chọn] <tree-ish> [<đường-" +"git archive --remote <kho> [--exec <lệnh>] [các-tùy-chọn] <treeish> [<đường-" "dẫn>...]" #: archive.c:13 @@ -6450,21 +6450,21 @@ msgid "if any <file> is not in the index, treat this as an error" msgstr "nếu <tập tin> bất kỳ không ở trong bảng mục lục, xử lý nó như một lỗi" #: builtin/ls-files.c:509 -msgid "tree-ish" -msgstr "tree-ish" +msgid "treeish" +msgstr "treeish" #: builtin/ls-files.c:510 -msgid "pretend that paths removed since <tree-ish> are still present" +msgid "pretend that paths removed since <treeish> are still present" msgstr "" -"giả định rằng các đường dẫn đã bị gỡ bỏ kể từ <tree-ish> nay vẫn hiện diện" +"giả định rằng các đường dẫn đã bị gỡ bỏ kể từ <treeish> nay vẫn hiện diện" #: builtin/ls-files.c:512 msgid "show debugging data" msgstr "hiển thị dữ liệu gỡ lỗi" #: builtin/ls-tree.c:27 -msgid "git ls-tree [<options>] <tree-ish> [<path>...]" -msgstr "git ls-tree [<các-tùy-chọn>] <tree-ish> [<đường-dẫn>...]" +msgid "git ls-tree [<options>] <treeish> [<path>...]" +msgstr "git ls-tree [<các-tùy-chọn>] <treeish> [<đường-dẫn>...]" #: builtin/ls-tree.c:125 msgid "only show trees" @@ -7912,12 +7912,11 @@ msgstr "--delete không hợp lý nếu không có bất kỳ tham chiếu (refs msgid "" "git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] " "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" -"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])" +"index-output=<file>] (--empty | <treeish1> [<treeish2> [<treeish3>]])" msgstr "" "git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<tiền-" "tố>] [-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] " -"[--index-output=<tập-tin>] (--empty | <tree-ish1> [<tree-ish2> [<tree-" -"ish3>]])" +"[--index-output=<tập-tin>] (--empty | <treeish1> [<treeish2> [<treeish3>]])" #: builtin/read-tree.c:109 msgid "write resulting index to <file>" @@ -8529,12 +8528,12 @@ msgstr "" "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" #: builtin/reset.c:26 -msgid "git reset [-q] <tree-ish> [--] <paths>..." -msgstr "git reset [-q] <tree-ish> [--] <đường-dẫn>..." +msgid "git reset [-q] <treeish> [--] <paths>..." +msgstr "git reset [-q] <treeish> [--] <đường-dẫn>..." #: builtin/reset.c:27 -msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" -msgstr "git reset --patch [<tree-ish>] [--] [<các-đường-dẫn>...]" +msgid "git reset --patch [<treeish>] [--] [<paths>...]" +msgstr "git reset --patch [<treeish>] [--] [<các-đường-dẫn>...]" #: builtin/reset.c:33 msgid "mixed" diff --git a/po/zh_CN.po b/po/zh_CN.po index b7b46f1..497d847 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -43,7 +43,7 @@ msgstr "" "或使用 'git commit -a'。" #: archive.c:10 -msgid "git archive [options] <tree-ish> [<path>...]" +msgid "git archive [options] <treeish> [<path>...]" msgstr "git archive [选项] <树或提交> [<路径>...]" #: archive.c:11 @@ -52,7 +52,7 @@ msgstr "git archive --list" #: archive.c:12 msgid "" -"git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [<path>...]" +"git archive --remote <repo> [--exec <cmd>] [options] <treeish> [<path>...]" msgstr "" "git archive --remote <版本库> [--exec <命令>] [选项] <树或提交> [<路径>...]" @@ -6338,11 +6338,11 @@ msgid "if any <file> is not in the index, treat this as an error" msgstr "如果任何 <文件> 都不在索引区，视为错误" #: builtin/ls-files.c:509 -msgid "tree-ish" +msgid "treeish" msgstr "树或提交" #: builtin/ls-files.c:510 -msgid "pretend that paths removed since <tree-ish> are still present" +msgid "pretend that paths removed since <treeish> are still present" msgstr "假装自从 <树或提交> 之后删除的路径仍然存在" #: builtin/ls-files.c:512 @@ -6350,7 +6350,7 @@ msgid "show debugging data" msgstr "显示调试数据" #: builtin/ls-tree.c:27 -msgid "git ls-tree [<options>] <tree-ish> [<path>...]" +msgid "git ls-tree [<options>] <treeish> [<path>...]" msgstr "git ls-tree [<选项>] <树或提交> [<路径>...]" #: builtin/ls-tree.c:125 @@ -7740,7 +7740,7 @@ msgstr "--delete 未接任何引用没有意义" msgid "" "git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] " "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" -"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])" +"index-output=<file>] (--empty | <treeish1> [<treeish2> [<treeish3>]])" msgstr "" "git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<前缀>] [-" "u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" @@ -8350,11 +8350,11 @@ msgid "" msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]" #: builtin/reset.c:26 -msgid "git reset [-q] <tree-ish> [--] <paths>..." +msgid "git reset [-q] <treeish> [--] <paths>..." msgstr "git reset [-q] <树或提交> [--] <路径>..." #: builtin/reset.c:27 -msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" +msgid "git reset --patch [<treeish>] [--] [<paths>...]" msgstr "git reset --patch [<树或提交>] [--] [<路径>...]" #: builtin/reset.c:33 diff --git a/t/t1512-rev-parse-disambiguation.sh b/t/t1512-rev-parse-disambiguation.sh index 4a155c8..840bb6e 100755 --- a/t/t1512-rev-parse-disambiguation.sh +++ b/t/t1512-rev-parse-disambiguation.sh @@ -45,12 +45,12 @@ test_expect_success 'warn ambiguity when no candidate matches type hint' ' grep "short SHA1 000000000 is ambiguous" actual ' -test_expect_success 'disambiguate tree-ish' ' - # feed tree-ish in an unambiguous way +test_expect_success 'disambiguate treeish' ' + # feed treeish in an unambiguous way git rev-parse --verify 0000000000cdc:a0blgqsjc && # ambiguous at the object name level, but there is only one - # such tree-ish (the other is a blob) + # such treeish (the other is a blob) git rev-parse --verify 000000000:a0blgqsjc ' @@ -159,8 +159,8 @@ test_expect_failure 'two semi-ambiguous commit-ish' ' git log 0000000000... ' -test_expect_failure 'three semi-ambiguous tree-ish' ' - # Likewise for tree-ish. HEAD, v1.0.0 and HEAD^{tree} share +test_expect_failure 'three semi-ambiguous treeish' ' + # Likewise for treeish. HEAD, v1.0.0 and HEAD^{tree} share # the prefix but peeling them to tree yields the same thing git rev-parse --verify 0000000000^{tree} ' diff --git a/t/t2010-checkout-ambiguous.sh b/t/t2010-checkout-ambiguous.sh index 7cc0a35..9a4736c 100755 --- a/t/t2010-checkout-ambiguous.sh +++ b/t/t2010-checkout-ambiguous.sh @@ -41,7 +41,7 @@ test_expect_success 'check ambiguity' ' test_must_fail git checkout world all ' -test_expect_success 'disambiguate checking out from a tree-ish' ' +test_expect_success 'disambiguate checking out from a treeish' ' echo bye > world && git checkout world -- world && git diff --exit-code --quiet diff --git a/t/t4100/t-apply-3.patch b/t/t4100/t-apply-3.patch index 90cdbaa..c0242f1 100644 --- a/t/t4100/t-apply-3.patch +++ b/t/t4100/t-apply-3.patch @@ -12,8 +12,8 @@ diff --git a/Documentation/git-ls-tree.txt b/Documentation/git-ls-tree.txt SYNOPSIS -------- --'git-ls-tree' [-r] [-z] <tree-ish> [paths...] -+'git-ls-tree' [-d] [-r] [-z] <tree-ish> [paths...] +-'git-ls-tree' [-r] [-z] <treeish> [paths...] ++'git-ls-tree' [-d] [-r] [-z] <treeish> [paths...] DESCRIPTION ----------- @@ -24,7 +24,7 @@ diff --git a/Documentation/git-ls-tree.txt b/Documentation/git-ls-tree.txt OPTIONS ------- - <tree-ish>:: + <treeish>:: Id of a tree. +-d:: @@ -485,7 +485,7 @@ dissimilarity index 82% +} + +static const char *ls_tree_usage = -+ "git-ls-tree [-d] [-r] [-z] <tree-ish> [path...]"; ++ "git-ls-tree [-d] [-r] [-z] <treeish> [path...]"; + +int main(int argc, char **argv) +{ diff --git a/t/t4100/t-apply-7.patch b/t/t4100/t-apply-7.patch index 07c6589..83ac01e 100644 --- a/t/t4100/t-apply-7.patch +++ b/t/t4100/t-apply-7.patch @@ -11,8 +11,8 @@ diff a/Documentation/git-ls-tree.txt b/Documentation/git-ls-tree.txt SYNOPSIS -------- --'git-ls-tree' [-r] [-z] <tree-ish> [paths...] -+'git-ls-tree' [-d] [-r] [-z] <tree-ish> [paths...] +-'git-ls-tree' [-r] [-z] <treeish> [paths...] ++'git-ls-tree' [-d] [-r] [-z] <treeish> [paths...] DESCRIPTION ----------- @@ -23,7 +23,7 @@ diff a/Documentation/git-ls-tree.txt b/Documentation/git-ls-tree.txt OPTIONS ------- - <tree-ish>:: + <treeish>:: Id of a tree. +-d:: @@ -415,7 +415,7 @@ diff a/ls-tree.c b/ls-tree.c -static const char *ls_tree_usage = "git-ls-tree [-r] [-z] <key> [paths...]"; +static const char *ls_tree_usage = -+ "git-ls-tree [-d] [-r] [-z] <tree-ish> [path...]"; ++ "git-ls-tree [-d] [-r] [-z] <treeish> [path...]"; int main(int argc, char **argv) { diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh index ac6f3b6..4e1f2b8 100755 --- a/t/t9300-fast-import.sh +++ b/t/t9300-fast-import.sh @@ -2931,7 +2931,7 @@ test_expect_success 'S: ls with garbage after sha1 must fail' ' ls ${sha1}x hello.c EOF cat err && - test_i18ngrep "space after tree-ish" err + test_i18ngrep "space after treeish" err ' test_done diff --git a/t/t9500-gitweb-standalone-no-errors.sh b/t/t9500-gitweb-standalone-no-errors.sh index 6fca193..7c8cd90 100755 --- a/t/t9500-gitweb-standalone-no-errors.sh +++ b/t/t9500-gitweb-standalone-no-errors.sh @@ -131,7 +131,7 @@ test_expect_success \ # ---------------------------------------------------------------------- -# commitdiff testing (implicit, one implicit tree-ish) +# commitdiff testing (implicit, one implicit treeish) test_expect_success \ 'commitdiff(0): root' \ diff --git a/t/t9501-gitweb-standalone-http-status.sh b/t/t9501-gitweb-standalone-http-status.sh index d3a5bac..54fe370 100755 --- a/t/t9501-gitweb-standalone-http-status.sh +++ b/t/t9501-gitweb-standalone-http-status.sh @@ -84,25 +84,25 @@ test_debug 'cat gitweb.headers' # ---------------------------------------------------------------------- # snapshot hash ids -test_expect_success 'snapshots: good tree-ish id' ' +test_expect_success 'snapshots: good treeish id' ' gitweb_run "p=.git;a=snapshot;h=master;sf=tgz" && grep "Status: 200 OK" gitweb.output ' test_debug 'cat gitweb.headers' -test_expect_success 'snapshots: bad tree-ish id' ' +test_expect_success 'snapshots: bad treeish id' ' gitweb_run "p=.git;a=snapshot;h=frizzumFrazzum;sf=tgz" && grep "404 - Object does not exist" gitweb.output ' test_debug 'cat gitweb.output' -test_expect_success 'snapshots: bad tree-ish id (tagged object)' ' +test_expect_success 'snapshots: bad treeish id (tagged object)' ' echo object > tag-object && git add tag-object && test_tick && git commit -m "Object to be tagged" && git tag tagged-object `git hash-object tag-object` && gitweb_run "p=.git;a=snapshot;h=tagged-object;sf=tgz" && - grep "400 - Object is not a tree-ish" gitweb.output + grep "400 - Object is not a treeish" gitweb.output ' test_debug 'cat gitweb.output' -- 1.8.4 ^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH v2 4/7] use 'committish' instead of 'commit-ish' 2013-09-02 5:34 [PATCH v2 0/7] documentation cleanups for <rev>^{<type>} Richard Hansen ` (2 preceding siblings ...) 2013-09-02 5:34 ` [PATCH v2 3/7] use 'treeish' instead of 'tree-ish' Richard Hansen @ 2013-09-02 5:34 ` Richard Hansen 2013-09-02 5:34 ` [PATCH v2 5/7] glossary: more precise definition of treeish (a.k.a. tree-ish) Richard Hansen ` (2 subsequent siblings) 6 siblings, 0 replies; 18+ messages in thread From: Richard Hansen @ 2013-09-02 5:34 UTC (permalink / raw) To: git, gitster; +Cc: Richard Hansen Replace all instances of 'commit-ish' with 'committish': * to standardize on a single spelling (the documentation contained a mix of 'committish' and 'commit-ish') * to be consistent with variable names (hyphens are not usually allowed in variable names) * to be consistent with 'treeish' * some search engines don't handle hyphens gracefully Signed-off-by: Richard Hansen <rhansen@bbn.com> --- Documentation/git-rebase.txt | 2 +- Documentation/git-rev-parse.txt | 2 +- Documentation/git.txt | 4 ++-- builtin/revert.c | 4 ++-- contrib/examples/git-reset.sh | 2 +- contrib/examples/git-revert.sh | 4 ++-- po/de.po | 4 ++-- po/fr.po | 4 ++-- po/git.pot | 4 ++-- po/sv.po | 4 ++-- po/vi.po | 8 ++++---- po/zh_CN.po | 4 ++-- remote.c | 2 +- t/t1512-rev-parse-disambiguation.sh | 16 ++++++++-------- 14 files changed, 32 insertions(+), 32 deletions(-) diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 6b2e1c8..f8ac62d 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -174,7 +174,7 @@ would result in the removal of commits F and G: This is useful if F and G were flawed in some way, or should not be part of topicA. Note that the argument to --onto and the <upstream> -parameter can be any valid commit-ish. +parameter can be any valid committish. In case of conflict, 'git rebase' will stop at the first problematic commit and leave conflict markers in the tree. You can use 'git diff' to locate diff --git a/Documentation/git-rev-parse.txt b/Documentation/git-rev-parse.txt index d068a65..56f643d 100644 --- a/Documentation/git-rev-parse.txt +++ b/Documentation/git-rev-parse.txt @@ -100,7 +100,7 @@ If you want to make sure that the output actually names an object in your object database and/or can be used as a specific type of object you require, you can add "^{type}" peeling operator to the parameter. For example, `git rev-parse "$VAR^{commit}"` will make sure `$VAR` -names an existing object that is a commit-ish (i.e. a commit, or an +names an existing object that is a committish (i.e. a commit, or an annotated tag that points at a commit). To make sure that `$VAR` names an existing object of any type, `git rev-parse "$VAR^{object}"` can be used. diff --git a/Documentation/git.txt b/Documentation/git.txt index c07915b..9d9ae26 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -606,9 +606,9 @@ Identifier Terminology operate on a <tree> object but automatically dereferences <commit> and <tag> objects that point at a <tree>. -<commit-ish>:: +<committish>:: Indicates a commit or tag object name. A - command that takes a <commit-ish> argument ultimately wants to + command that takes a <committish> argument ultimately wants to operate on a <commit> object but automatically dereferences <tag> objects that point at a <commit>. diff --git a/builtin/revert.c b/builtin/revert.c index 1d2648b..9339816 100644 --- a/builtin/revert.c +++ b/builtin/revert.c @@ -19,13 +19,13 @@ */ static const char * const revert_usage[] = { - N_("git revert [options] <commit-ish>..."), + N_("git revert [options] <committish>..."), N_("git revert <subcommand>"), NULL }; static const char * const cherry_pick_usage[] = { - N_("git cherry-pick [options] <commit-ish>..."), + N_("git cherry-pick [options] <committish>..."), N_("git cherry-pick <subcommand>"), NULL }; diff --git a/contrib/examples/git-reset.sh b/contrib/examples/git-reset.sh index bafeb52..ac06274 100755 --- a/contrib/examples/git-reset.sh +++ b/contrib/examples/git-reset.sh @@ -2,7 +2,7 @@ # # Copyright (c) 2005, 2006 Linus Torvalds and Junio C Hamano # -USAGE='[--mixed | --soft | --hard] [<commit-ish>] [ [--] <paths>...]' +USAGE='[--mixed | --soft | --hard] [<committish>] [ [--] <paths>...]' SUBDIRECTORY_OK=Yes . git-sh-setup set_reflog_action "reset $*" diff --git a/contrib/examples/git-revert.sh b/contrib/examples/git-revert.sh index 6bf155c..6f1dd66 100755 --- a/contrib/examples/git-revert.sh +++ b/contrib/examples/git-revert.sh @@ -9,12 +9,12 @@ case "$0" in test -t 0 && edit=-e replay= me=revert - USAGE='[--edit | --no-edit] [-n] <commit-ish>' ;; + USAGE='[--edit | --no-edit] [-n] <committish>' ;; *-cherry-pick* ) replay=t edit= me=cherry-pick - USAGE='[--edit] [-n] [-r] [-x] <commit-ish>' ;; + USAGE='[--edit] [-n] [-r] [-x] <committish>' ;; * ) echo >&2 "What are you talking about?" exit 1 ;; diff --git a/po/de.po b/po/de.po index 00519b2..4cdb2aa 100644 --- a/po/de.po +++ b/po/de.po @@ -8742,7 +8742,7 @@ msgstr "" "erster Verwendung aus." #: builtin/revert.c:22 -msgid "git revert [options] <commit-ish>..." +msgid "git revert [options] <committish>..." msgstr "git revert [Optionen] <Commit-Angabe>..." #: builtin/revert.c:23 @@ -8750,7 +8750,7 @@ msgid "git revert <subcommand>" msgstr "git revert <Unterkommando>" #: builtin/revert.c:28 -msgid "git cherry-pick [options] <commit-ish>..." +msgid "git cherry-pick [options] <committish>..." msgstr "git cherry-pick [Optionen] <Commit-Angabe>..." #: builtin/revert.c:29 diff --git a/po/fr.po b/po/fr.po index 8d74171..60046ee 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8032,7 +8032,7 @@ msgid "" msgstr "" #: builtin/revert.c:22 -msgid "git revert [options] <commit-ish>..." +msgid "git revert [options] <committish>..." msgstr "" #: builtin/revert.c:23 @@ -8040,7 +8040,7 @@ msgid "git revert <subcommand>" msgstr "" #: builtin/revert.c:28 -msgid "git cherry-pick [options] <commit-ish>..." +msgid "git cherry-pick [options] <committish>..." msgstr "" #: builtin/revert.c:29 diff --git a/po/git.pot b/po/git.pot index 928268f..d101f1b 100644 --- a/po/git.pot +++ b/po/git.pot @@ -8146,7 +8146,7 @@ msgid "" msgstr "" #: builtin/revert.c:22 -msgid "git revert [options] <commit-ish>..." +msgid "git revert [options] <committish>..." msgstr "" #: builtin/revert.c:23 @@ -8154,7 +8154,7 @@ msgid "git revert <subcommand>" msgstr "" #: builtin/revert.c:28 -msgid "git cherry-pick [options] <commit-ish>..." +msgid "git cherry-pick [options] <committish>..." msgstr "" #: builtin/revert.c:29 diff --git a/po/sv.po b/po/sv.po index cdee340..e118303 100644 --- a/po/sv.po +++ b/po/sv.po @@ -8528,7 +8528,7 @@ msgstr "" "varianten." #: builtin/revert.c:22 -msgid "git revert [options] <commit-ish>..." +msgid "git revert [options] <committish>..." msgstr "git revert [flaggor] <incheckning-igt>..." #: builtin/revert.c:23 @@ -8536,7 +8536,7 @@ msgid "git revert <subcommand>" msgstr "git revert <underkommando>" #: builtin/revert.c:28 -msgid "git cherry-pick [options] <commit-ish>..." +msgid "git cherry-pick [options] <committish>..." msgstr "git cherry-pick [flaggor] <incheckning-igt>..." #: builtin/revert.c:29 diff --git a/po/vi.po b/po/vi.po index ebc079c..263873c 100644 --- a/po/vi.po +++ b/po/vi.po @@ -8673,16 +8673,16 @@ msgstr "" "Chạy lệnh \"git rev-parse --parseopt -h\" để có thêm thông tin về cách dùng." #: builtin/revert.c:22 -msgid "git revert [options] <commit-ish>..." -msgstr "git revert [các-tùy-chọn] <commit-ish>..." +msgid "git revert [options] <committish>..." +msgstr "git revert [các-tùy-chọn] <committish>..." #: builtin/revert.c:23 msgid "git revert <subcommand>" msgstr "git revert <lệnh-con>" #: builtin/revert.c:28 -msgid "git cherry-pick [options] <commit-ish>..." -msgstr "git cherry-pick [các-tùy-chọn] <commit-ish>..." +msgid "git cherry-pick [options] <committish>..." +msgstr "git cherry-pick [các-tùy-chọn] <committish>..." #: builtin/revert.c:29 msgid "git cherry-pick <subcommand>" diff --git a/po/zh_CN.po b/po/zh_CN.po index 497d847..66e2e60 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -8496,7 +8496,7 @@ msgstr "" "初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。" #: builtin/revert.c:22 -msgid "git revert [options] <commit-ish>..." +msgid "git revert [options] <committish>..." msgstr "git revert [选项] <提交号>..." #: builtin/revert.c:23 @@ -8504,7 +8504,7 @@ msgid "git revert <subcommand>" msgstr "git revert <子命令>" #: builtin/revert.c:28 -msgid "git cherry-pick [options] <commit-ish>..." +msgid "git cherry-pick [options] <committish>..." msgstr "git cherry-pick [选项] <提交号>..." #: builtin/revert.c:29 diff --git a/remote.c b/remote.c index efcba93..9099cb3 100644 --- a/remote.c +++ b/remote.c @@ -1663,7 +1663,7 @@ int ref_newer(const unsigned char *new_sha1, const unsigned char *old_sha1) int found = 0; /* - * Both new and old must be commit-ish and new is descendant of + * Both new and old must be committish and new is descendant of * old. Otherwise we require --force. */ o = deref_tag(parse_object(old_sha1), NULL, 0); diff --git a/t/t1512-rev-parse-disambiguation.sh b/t/t1512-rev-parse-disambiguation.sh index 840bb6e..4b311c7 100755 --- a/t/t1512-rev-parse-disambiguation.sh +++ b/t/t1512-rev-parse-disambiguation.sh @@ -86,8 +86,8 @@ test_expect_success 'first commit' ' git commit -m a2onsxbvj ' -test_expect_success 'disambiguate commit-ish' ' - # feed commit-ish in an unambiguous way +test_expect_success 'disambiguate committish' ' + # feed committish in an unambiguous way git rev-parse --verify 0000000000e4f^{commit} && # ambiguous at the object name level, but there is only one @@ -104,7 +104,7 @@ test_expect_success 'disambiguate commit' ' test $(git rev-parse $commit^) = $(git rev-parse 0000000000e4f) ' -test_expect_success 'log name1..name2 takes only commit-ishes on both ends' ' +test_expect_success 'log name1..name2 takes only committishes on both ends' ' # These are underspecified from the prefix-length point of view # to disambiguate the commit with other objects, but there is only # one commit that has 00000* prefix at this point. @@ -116,19 +116,19 @@ test_expect_success 'log name1..name2 takes only commit-ishes on both ends' ' git log 000000000... ' -test_expect_success 'rev-parse name1..name2 takes only commit-ishes on both ends' ' +test_expect_success 'rev-parse name1..name2 takes only committishes on both ends' ' # Likewise. git rev-parse 000000000..000000000 && git rev-parse ..000000000 && git rev-parse 000000000.. ' -test_expect_success 'git log takes only commit-ish' ' +test_expect_success 'git log takes only committish' ' # Likewise. git log 000000000 ' -test_expect_success 'git reset takes only commit-ish' ' +test_expect_success 'git reset takes only committish' ' # Likewise. git reset 000000000 ' @@ -138,7 +138,7 @@ test_expect_success 'first tag' ' git tag -a -m j7cp83um v1.0.0 ' -test_expect_failure 'two semi-ambiguous commit-ish' ' +test_expect_failure 'two semi-ambiguous committish' ' # At this point, we have a tag 0000000000f8f that points # at a commit 0000000000e4f, and a tree and a blob that # share 0000000000 prefix with these tag and commit. @@ -249,7 +249,7 @@ test_expect_success 'parse describe name not ignoring ambiguity' ' test_must_fail git rev-parse --verify v1.0.0-1-g000000000 ' -test_expect_success 'ambiguous commit-ish' ' +test_expect_success 'ambiguous committish' ' # Now there are many commits that begin with the # common prefix, none of these should pick one at # random. They all should result in ambiguity errors. -- 1.8.4 ^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH v2 5/7] glossary: more precise definition of treeish (a.k.a. tree-ish) 2013-09-02 5:34 [PATCH v2 0/7] documentation cleanups for <rev>^{<type>} Richard Hansen ` (3 preceding siblings ...) 2013-09-02 5:34 ` [PATCH v2 4/7] use 'committish' instead of 'commit-ish' Richard Hansen @ 2013-09-02 5:34 ` Richard Hansen 2013-09-02 5:34 ` [PATCH v2 6/7] revisions.txt: fix and clarify <rev>^{<type>} Richard Hansen 2013-09-02 5:34 ` [PATCH v2 7/7] glossary: fix and clarify the definition of 'ref' Richard Hansen 6 siblings, 0 replies; 18+ messages in thread From: Richard Hansen @ 2013-09-02 5:34 UTC (permalink / raw) To: git, gitster; +Cc: Richard Hansen A treeish isn't a ref. Also, mention dereferencing, and that a commit dereferences to a tree, to support gitrevisions(7) and rev-parse's error messages. Signed-off-by: Richard Hansen <rhansen@bbn.com> --- Documentation/glossary-content.txt | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt index 257a7fe..a2edcc3 100644 --- a/Documentation/glossary-content.txt +++ b/Documentation/glossary-content.txt @@ -499,9 +499,18 @@ should not be combined with other pathspec. <<def_tree,tree>> is equivalent to a <<def_directory,directory>>. [[def_treeish]]treeish (also tree-ish):: - A <<def_ref,ref>> pointing to either a <<def_commit_object,commit - object>>, a <<def_tree_object,tree object>>, or a <<def_tag_object,tag - object>> pointing to a tag or commit or tree object. + A <<def_tree_object,tree object>> or an <<def_object,object>> + that can be recursively dereferenced to a tree object. + Dereferencing a <<def_commit_object,commit object>> yields the + tree object corresponding to the <<def_revision,revision>>'s + top <<def_directory,directory>>. + The following are all treeishes: + a <<def_committish,committish>>, + a tree object, + a <<def_tag_object,tag object>> that points to a tree object, + a tag object that points to a tag object that points to a tree + object, + etc. [[def_unmerged_index]]unmerged index:: An <<def_index,index>> which contains unmerged -- 1.8.4 ^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH v2 6/7] revisions.txt: fix and clarify <rev>^{<type>} 2013-09-02 5:34 [PATCH v2 0/7] documentation cleanups for <rev>^{<type>} Richard Hansen ` (4 preceding siblings ...) 2013-09-02 5:34 ` [PATCH v2 5/7] glossary: more precise definition of treeish (a.k.a. tree-ish) Richard Hansen @ 2013-09-02 5:34 ` Richard Hansen 2013-09-02 5:34 ` [PATCH v2 7/7] glossary: fix and clarify the definition of 'ref' Richard Hansen 6 siblings, 0 replies; 18+ messages in thread From: Richard Hansen @ 2013-09-02 5:34 UTC (permalink / raw) To: git, gitster; +Cc: Richard Hansen If possible, <rev> will be dereferenced even if it is not a tag type (e.g., commit dereferenced to a tree). Signed-off-by: Richard Hansen <rhansen@bbn.com> --- Documentation/revisions.txt | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/Documentation/revisions.txt b/Documentation/revisions.txt index 569b563..1f1e79b 100644 --- a/Documentation/revisions.txt +++ b/Documentation/revisions.txt @@ -111,10 +111,14 @@ some output processing may assume ref names in UTF-8. '<rev>{caret}\{<type>\}', e.g. 'v0.99.8{caret}\{commit\}':: A suffix '{caret}' followed by an object type name enclosed in - brace pair means the object - could be a tag, and dereference the tag recursively until an - object of that type is found or the object cannot be - dereferenced anymore (in which case, barf). '<rev>{caret}0' + brace pair means dereference the object at '<rev>' recursively until + an object of type '<type>' is found or the object cannot be + dereferenced anymore (in which case, barf). + For example, if '<rev>' is a committish, '<rev>{caret}\{commit\}' + describes the corresponding commit object. + Similarly, if '<rev>' is a treeish, '<rev>{caret}\{tree\}' describes + the corresponding tree object. + '<rev>{caret}0' is a short-hand for '<rev>{caret}\{commit\}'. + 'rev{caret}\{object\}' can be used to make sure 'rev' names an -- 1.8.4 ^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH v2 7/7] glossary: fix and clarify the definition of 'ref' 2013-09-02 5:34 [PATCH v2 0/7] documentation cleanups for <rev>^{<type>} Richard Hansen ` (5 preceding siblings ...) 2013-09-02 5:34 ` [PATCH v2 6/7] revisions.txt: fix and clarify <rev>^{<type>} Richard Hansen @ 2013-09-02 5:34 ` Richard Hansen 6 siblings, 0 replies; 18+ messages in thread From: Richard Hansen @ 2013-09-02 5:34 UTC (permalink / raw) To: git, gitster; +Cc: Richard Hansen Signed-off-by: Richard Hansen <rhansen@bbn.com> --- Documentation/glossary-content.txt | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt index a2edcc3..44d524b 100644 --- a/Documentation/glossary-content.txt +++ b/Documentation/glossary-content.txt @@ -395,10 +395,20 @@ should not be combined with other pathspec. to the result. [[def_ref]]ref:: - A 40-byte hex representation of a <<def_SHA1,SHA-1>> or a name that - denotes a particular <<def_object,object>>. They may be stored in - a file under `$GIT_DIR/refs/` directory, or - in the `$GIT_DIR/packed-refs` file. + A name that begins with `refs/` (e.g. `refs/heads/master`) + that points to an <<def_object_name,object name>> or another + ref (the latter is called a <<def_symref,symbolic ref>>). + For convenience, a ref can sometimes be abbreviated when used + as an argument to a Git command; see linkgit:gitrevisions[7] + for details. + Refs are stored in the <<def_repository,repository>>. ++ +The ref namespace is hierarchical. +Different subhierarchies are used for different purposes (e.g. the +`refs/heads/` hierarchy is used to represent local branches). ++ +There are a few special-purpose refs that do not begin with `refs/`. +The most notable example is `HEAD`. [[def_reflog]]reflog:: A reflog shows the local "history" of a ref. In other words, -- 1.8.4 ^ permalink raw reply related [flat|nested] 18+ messages in thread
end of thread, other threads:[~2013-09-04 22:27 UTC | newest]
Thread overview: 18+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-09-02 5:34 [PATCH v2 0/7] documentation cleanups for <rev>^{<type>} Richard Hansen
2013-09-02 5:34 ` [PATCH v2 1/7] glossary: mention 'treeish' as an alternative to 'tree-ish' Richard Hansen
2013-09-03 22:46 ` Junio C Hamano
2013-09-04 19:04 ` [PATCH v3 0/7] documentation cleanups for <rev>^{<type>} Richard Hansen
2013-09-04 19:04 ` [PATCH v3 1/7] glossary: mention 'treeish' as an alternative to 'tree-ish' Richard Hansen
2013-09-04 19:04 ` [PATCH v3 2/7] glossary: define commit-ish (a.k.a. committish) Richard Hansen
2013-09-04 19:04 ` [PATCH v3 3/7] use 'tree-ish' instead of 'treeish' Richard Hansen
2013-09-04 19:04 ` [PATCH v3 4/7] use 'commit-ish' instead of 'committish' Richard Hansen
2013-09-04 19:04 ` [PATCH v3 5/7] glossary: more precise definition of tree-ish (a.k.a. treeish) Richard Hansen
2013-09-04 19:04 ` [PATCH v3 6/7] revisions.txt: fix and clarify <rev>^{<type>} Richard Hansen
2013-09-04 19:04 ` [PATCH v3 7/7] glossary: fix and clarify the definition of 'ref' Richard Hansen
2013-09-04 22:27 ` [PATCH v3 0/7] documentation cleanups for <rev>^{<type>} Junio C Hamano
2013-09-02 5:34 ` [PATCH v2 2/7] glossary: define committish (a.k.a. commit-ish) Richard Hansen
2013-09-02 5:34 ` [PATCH v2 3/7] use 'treeish' instead of 'tree-ish' Richard Hansen
2013-09-02 5:34 ` [PATCH v2 4/7] use 'committish' instead of 'commit-ish' Richard Hansen
2013-09-02 5:34 ` [PATCH v2 5/7] glossary: more precise definition of treeish (a.k.a. tree-ish) Richard Hansen
2013-09-02 5:34 ` [PATCH v2 6/7] revisions.txt: fix and clarify <rev>^{<type>} Richard Hansen
2013-09-02 5:34 ` [PATCH v2 7/7] glossary: fix and clarify the definition of 'ref' Richard Hansen
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).