Merge branch 'jk/ident-split-fix'

diff --git a/Documentation/RelNotes/1.7.11.txt b/Documentation/RelNotes/1.7.11.txt
index 94c3615ef93c73a053c548634a2a509e2e3861de..3f4c63ab305f68cadae7134c03c03fbaaa7ea75c 100644 (file)
--- a/Documentation/RelNotes/1.7.11.txt
+++ b/Documentation/RelNotes/1.7.11.txt
@@ -120,6 +120,19 @@ Unless otherwise noted, all the fixes since v1.7.10 in the maintenance
 releases are contained in this release (see release notes to them for
 details).
 
+ * When a submodule repository uses alternate object store mechanism,
+   some commands that were started from the superproject did not
+   notice it and failed with "No such object" errors.  The subcommands
+   of "git submodule" command that properly recursed into the
+   submodule in a separate process were OK; only the ones that cheated
+   and peeked directly into the submodule's repository from the
+   primary process were affected.
+   (merge 5e73633 hv/submodule-alt-odb later to maint).
+
+ * The directory path used in "git diff --no-index", when it recurses
+   down, was broken with a recent update after v1.7.10.1 release.
+   (merge 176a335 bp/diff-no-index-strbuf-fix later to maint).
+
  * "git status --porcelain" ignored "--branch" option by mistake.  The
    output for "git status --branch -z" was also incorrect and did not
    terminate the record for the current branch name with NUL as asked.