Merge branch 'maint'

* maint:
  Update draft release notes for 1.5.4.5
  Documentation: clarify use of .git{ignore,attributes} versus .git/info/*
  t/t3800-mktag.sh: use test_must_fail rather than '!'

Conflicts:

	t/t3800-mktag.sh

diff --git a/Documentation/RelNotes-1.5.4.5.txt b/Documentation/RelNotes-1.5.4.5.txt
index fe768d497ff2f8a5b9edb3d1a25483170fcdd554..56fcd27b5cf76517683775e11b0c7b9f07a18bae 100644 (file)
--- a/Documentation/RelNotes-1.5.4.5.txt
+++ b/Documentation/RelNotes-1.5.4.5.txt
@@ -4,6 +4,13 @@ GIT v1.5.4.5 Release Notes
 Fixes since v1.5.4.4
 --------------------
 
+ * "git fetch there" when the URL information came from the Cogito style
+   branches/there file did not update refs/heads/there (regression in
+   1.5.4).
+
+ * Bogus refspec configuration such as "remote.there.fetch = =" were not
+   detected as errors (regressionin 1.5.4).
+
  * You couldn't specify a custom editor whose path contains a whitespace
    via GIT_EDITOR (and core.editor).
 
@@ -46,8 +53,10 @@ Fixes since v1.5.4.4
  * "git rebase -m" triggered pre-commit verification, which made
    "rebase --continue" impossible.
 
+As usual, it also comes with many documentation fixes and clarifications.
+
 --
 exec >/var/tmp/1
 echo O=$(git describe maint)
-O=v1.5.4.4-25-ga6f7728
+O=v1.5.4.4-32-gb88605f
 git shortlog --no-merges $O..maint

diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt
index 84ec9623a26e2c36f7346a430a46a4a4915e0382..04ca63ca3d8b1c35c849750e66348e42a6b823a0 100644 (file)
--- a/Documentation/gitattributes.txt
+++ b/Documentation/gitattributes.txt
@@ -63,6 +63,13 @@ path in question, and its parent directories (the further the
 directory that contains `.gitattributes` is from the path in
 question, the lower its precedence).
 
+If you wish to affect only a single repository (i.e., to assign
+attributes to files that are particular to one user's workflow), then
+attributes should be placed in the `$GIT_DIR/info/attributes` file.
+Attributes which should be version-controlled and distributed to other
+repositories (i.e., attributes of interest to all users) should go into
+`.gitattributes` files.
+
 Sometimes you would need to override an setting of an attribute
 for a path to `unspecified` state.  This can be done by listing
 the name of the attribute prefixed with an exclamation point `!`.

diff --git a/Documentation/gitignore.txt b/Documentation/gitignore.txt
index e847b3ba63f3fae3d5497d6ede1ea0ee416a74de..613dca006fe2855a4600d7150e7281c9bde24238 100644 (file)
--- a/Documentation/gitignore.txt
+++ b/Documentation/gitignore.txt
@@ -38,6 +38,18 @@ precedence, the last matching pattern decides the outcome):
  * Patterns read from the file specified by the configuration
    variable 'core.excludesfile'.
 
+Which file to place a pattern in depends on how the pattern is meant to
+be used. Patterns which should be version-controlled and distributed to
+other repositories via clone (i.e., files that all developers will want
+to ignore) should go into a `.gitignore` file. Patterns which are
+specific to a particular repository but which do not need to be shared
+with other related repositories (e.g., auxiliary files that live inside
+the repository but are specific to one user's workflow) should go into
+the `$GIT_DIR/info/exclude` file.  Patterns which a user wants git to
+ignore in all situations (e.g., backup or temporary files generated by
+the user's editor of choice) generally go into a file specified by
+`core.excludesfile` in the user's `~/.gitconfig`.
+
 The underlying git plumbing tools, such as
 linkgit:git-ls-files[1] and linkgit:git-read-tree[1], read
 `gitignore` patterns specified by command-line options, or from

diff --git a/t/t3800-mktag.sh b/t/t3800-mktag.sh
index 278075823bbf4656ec08e844e79e6b25f0f2f292..bdc6e132cacbccc72a903c1aad1bbfe1364471ab 100755 (executable)
--- a/t/t3800-mktag.sh
+++ b/t/t3800-mktag.sh
@@ -14,7 +14,7 @@ test_description='git-mktag: tag object verify test'
 check_verify_failure () {
        expect="$2"
        test_expect_success "$1" '
-               ( ! git-mktag <tag.sig 2>message ) &&
+               ( test_must_fail git-mktag <tag.sig 2>message ) &&
                grep "$expect" message
        '
 }