Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-12-03 23:42:03 +0400
committerJunio C Hamano <gitster@pobox.com>2013-12-03 23:44:12 +0400
commitdaad3aa255ec5c08f95867feaaf8f4db03346e70 (patch)
tree2c2ea5ff1fdef51c5562e0f768cc678c9b76e759 /Documentation
parent34f4a75f1efb9804553802b8cf6b0f6dc6e5e6c4 (diff)
parenta155a5f075cdc09e584a58d68bdce0c80e6c4b5a (diff)
Sync with 1.8.5.1
* maint: Git 1.8.5.1 ref-iteration doc: add_submodule_odb() returns 0 for success
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/RelNotes/1.8.5.1.txt9
-rw-r--r--Documentation/git.txt3
-rw-r--r--Documentation/technical/api-ref-iteration.txt4
3 files changed, 13 insertions, 3 deletions
diff --git a/Documentation/RelNotes/1.8.5.1.txt b/Documentation/RelNotes/1.8.5.1.txt
new file mode 100644
index 0000000000..7236aaf232
--- /dev/null
+++ b/Documentation/RelNotes/1.8.5.1.txt
@@ -0,0 +1,9 @@
+Git v1.8.5.1 Release Notes
+==========================
+
+Fixes since v1.8.5
+------------------
+
+ * "git submodule init" copied "submodule.$name.update" settings from
+ .gitmodules to .git/config without making sure if the suggested
+ value was sensible.
diff --git a/Documentation/git.txt b/Documentation/git.txt
index 4545afbd9e..4448ce2704 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -43,9 +43,10 @@ unreleased) version of Git, that is available from 'master'
branch of the `git.git` repository.
Documentation for older releases are available here:
-* link:v1.8.5/git.html[documentation for release 1.8.5]
+* link:v1.8.5.1/git.html[documentation for release 1.8.5.1]
* release notes for
+ link:RelNotes/1.8.5.1.txt[1.8.5.1],
link:RelNotes/1.8.5.txt[1.8.5].
* link:v1.8.4.5/git.html[documentation for release 1.8.4.5]
diff --git a/Documentation/technical/api-ref-iteration.txt b/Documentation/technical/api-ref-iteration.txt
index aa1c50f181..02adfd45d3 100644
--- a/Documentation/technical/api-ref-iteration.txt
+++ b/Documentation/technical/api-ref-iteration.txt
@@ -50,10 +50,10 @@ submodules object database. You can do this by a code-snippet like
this:
const char *path = "path/to/submodule"
- if (!add_submodule_odb(path))
+ if (add_submodule_odb(path))
die("Error submodule '%s' not populated.", path);
-`add_submodule_odb()` will return an non-zero value on success. If you
+`add_submodule_odb()` will return zero on success. If you
do not do this you will get an error for each ref that it does not point
to a valid object.