From fc7642a096b99295a636ebde03e4b951a7da9c5a Mon Sep 17 00:00:00 2001 From: Thomas Rast Date: Mon, 10 Jan 2011 13:57:43 +0100 Subject: [PATCH 1/3] Documentation/git-archive: spell --worktree-attributes correctly The --worktree-attributes option was correctly documented in ba053ea (archive: do not read .gitattributes in working directory, 2009-04-18). However, later in 9b4c8b0 (archive documentation: attributes are taken from the tree by default, 2010-02-10) the misspelling "--work-tree-attributes" was used to refer to it. Fix this. Noticed-by: Jeffrey Phillips Freeman Signed-off-by: Thomas Rast Signed-off-by: Junio C Hamano --- Documentation/git-archive.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/git-archive.txt b/Documentation/git-archive.txt index 8d3e66626f..bc0eaef298 100644 --- a/Documentation/git-archive.txt +++ b/Documentation/git-archive.txt @@ -116,7 +116,7 @@ Note that attributes are by default taken from the `.gitattributes` files in the tree that is being archived. If you want to tweak the way the output is generated after the fact (e.g. you committed without adding an appropriate export-ignore in its `.gitattributes`), adjust the checked out -`.gitattributes` file as necessary and use `--work-tree-attributes` +`.gitattributes` file as necessary and use `--worktree-attributes` option. Alternatively you can keep necessary attributes that should apply while archiving any tree in your `$GIT_DIR/info/attributes` file. From 920a5d436b0309072de598a44b493ba0793b074c Mon Sep 17 00:00:00 2001 From: Thomas Rast Date: Mon, 10 Jan 2011 13:42:23 +0100 Subject: [PATCH 2/3] Documentation/githooks: post-rewrite-copy-notes never existed The documentation for the post-rewrite hook contains a paragraph from its early development, where the automatic notes copying facilities were not part of the series and thus this had to be a hook. Later versions of the series implemented notes copying as a core feature. Thus mentioning post-rewrite-copy-notes was never correct. As the other hooks do not have a "there is no default hook, but..." sentence unless they ship a sample hook in either templates or contrib, we simply remove the whole paragraph. Signed-off-by: Thomas Rast Signed-off-by: Junio C Hamano --- Documentation/githooks.txt | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Documentation/githooks.txt b/Documentation/githooks.txt index 7183aa9abb..28edefa202 100644 --- a/Documentation/githooks.txt +++ b/Documentation/githooks.txt @@ -350,10 +350,6 @@ rebase:: The commits are guaranteed to be listed in the order that they were processed by rebase. -There is no default 'post-rewrite' hook, but see the -`post-receive-copy-notes` script in `contrib/hooks` for an example -that copies your git-notes to the rewritten commits. - GIT --- From 7fad99e14af6da89efe0d078e19ac8b7c02a3b5d Mon Sep 17 00:00:00 2001 From: Ramsay Jones Date: Mon, 10 Jan 2011 23:21:26 +0000 Subject: [PATCH 3/3] t9157-*.sh: Make the svn version check more precise These tests require an svn version 1.5 or newer to run correctly. In particular, all 1.4.x versions and earlier are too old, so fix up the case label regex to cover this range exactly. [Fix provided by Anders Kaseorg ] Signed-off-by: Ramsay Jones Signed-off-by: Junio C Hamano --- t/t9157-git-svn-fetch-merge.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t9157-git-svn-fetch-merge.sh b/t/t9157-git-svn-fetch-merge.sh index accf61eb03..991d2aa1be 100755 --- a/t/t9157-git-svn-fetch-merge.sh +++ b/t/t9157-git-svn-fetch-merge.sh @@ -8,7 +8,7 @@ test_description='git svn merge detection' svn_ver="$(svn --version --quiet)" case $svn_ver in -[0-1].[0-4].[0-6]) +0.* | 1.[0-4].*) skip_all="skipping git-svn test - SVN too old ($svn_ver)" test_done ;;