Skip to content

Commit 010b260

Browse files
committed
Update draft release notes to 1.7.11
A handful of topics have been merged to maintenance releases, and the first half of 6th batch graduates to 'master'. Signed-off-by: Junio C Hamano <[email protected]>
1 parent cd58b71 commit 010b260

File tree

1 file changed

+11
-53
lines changed

1 file changed

+11
-53
lines changed

Documentation/RelNotes/1.7.11.txt

Lines changed: 11 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,17 @@ Unless otherwise noted, all the fixes since v1.7.10 in the maintenance
8686
releases are contained in this release (see release notes to them for
8787
details).
8888

89+
* The i18n of error message "git stash save" was not properly done.
90+
(merge ed3c400 rl/maint-stash-i18n-save-error later to maint).
91+
92+
* The report from "git fetch" said "new branch" even for a non branch
93+
ref.
94+
(merge 0997ada mb/fetch-call-a-non-branch-a-ref later to maint).
95+
96+
* The "diff --no-index" codepath used limited-length buffers, risking
97+
pathnames getting truncated. Update it to use the strbuf API.
98+
(merge 875b91b jm/maint-strncpy-diff-no-index later to maint).
99+
89100
* The parser in "fast-import" did not diagnose ":9" style references
90101
that is not followed by required SP/LF as an error.
91102
(merge 06454cb pw/fast-import-dataref-parsing later to maint).
@@ -113,56 +124,3 @@ details).
113124
* Giving "--continue" to a conflicted "rebase -i" session skipped a
114125
commit that only results in changes to submodules.
115126
(merge a6754cd jk/rebase-i-submodule-conflict-only later to maint).
116-
117-
* When PATH contains an unreadable directory, alias expansion code
118-
did not kick in, and failed with an error that said "git-subcmd"
119-
was not found.
120-
(merge 38f865c jk/run-command-eacces later to maint).
121-
122-
* The 'push to upstream' implementation was broken in some corner
123-
cases. "git push $there" without refspec, when the current branch
124-
is set to push to a remote different from $there, used to push to
125-
$there using the upstream information to a remote unreleated to
126-
$there.
127-
(merge 135dade jc/push-upstream-sanity later to maint).
128-
129-
* "git clean -d -f" (not "-d -f -f") is supposed to protect nested
130-
working trees of independent git repositories that exist in the
131-
current project working tree from getting removed, but the
132-
protection applied only to such working trees that are at the
133-
top-level of the current project by mistake.
134-
(merge ae2f203 jc/maint-clean-nested-worktree-in-subdir later to maint).
135-
136-
* Rename detection logic used to match two empty files as renames
137-
during merge-recursive, leading unnatural mismerges.
138-
(merge 4f7cb99 jk/diff-no-rename-empty later to maint).
139-
140-
* An age-old corner case bug in combine diff (only triggered with -U0
141-
and the hunk at the beginning of the file needs to be shown) has
142-
been fixed.
143-
(merge e5e9b56 rs/combine-diff-zero-context-at-the-beginning later to maint).
144-
145-
* When "git commit --template F" errors out because the user did not
146-
touch the message, it claimed that it aborts due to "empty
147-
message", which was utterly wrong.
148-
(merge 1f08c2c jc/commit-unedited-template later to maint).
149-
150-
* "git add -p" is not designed to deal with unmerged paths but did
151-
not exclude them and tried to apply funny patches only to fail.
152-
(merge 4066bd6 jk/add-p-skip-conflicts later to maint).
153-
154-
* "git commit --author=$name" did not tell the name that was being
155-
recorded in the resulting commit to hooks, even though it does do
156-
so when the end user overrode the authorship via the
157-
"GIT_AUTHOR_NAME" environment variable.
158-
(merge 7dfe8ad jc/commit-hook-authorship later to maint).
159-
160-
* The regexp configured with diff.wordregex was incorrectly reused
161-
across files.
162-
(merge 6440d34 tr/maint-word-diff-regex-sticky later to maint).
163-
164-
* Running "notes merge --commit" failed to perform correctly when run
165-
from any directory inside $GIT_DIR/. When "notes merge" stops with
166-
conflicts, $GIT_DIR/NOTES_MERGE_WORKTREE is the place a user edits
167-
to resolve it.
168-
(merge dabba59 jh/notes-merge-in-git-dir-worktree later to maint).

0 commit comments

Comments
 (0)