Skip to content

Commit 0bb2ee1

Browse files
committed
RelNotes: the second batch of topics graduated to 'master'
Signed-off-by: Junio C Hamano <[email protected]>
1 parent 3c52400 commit 0bb2ee1

File tree

1 file changed

+41
-0
lines changed

1 file changed

+41
-0
lines changed

Documentation/RelNotes/1.7.11.txt

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,16 @@ UI, Workflows & Features
88

99
* A third-party tool "git subtree" is distributed in contrib/
1010

11+
* Even with "-q"uiet option, "checkout" used to report setting up
12+
tracking. Also "branch" learned the "-q"uiet option to squelch
13+
informational message.
14+
15+
* The smart-http backend used to always override GIT_COMMITTER_*
16+
variables with REMOTE_USER and REMOTE_ADDR, but these variables are
17+
now preserved when set.
18+
19+
* A 'snapshot' request to "gitweb" honors If-Modified-Since: header,
20+
based on the commit date.
1121

1222
Foreign Interface
1323

@@ -17,9 +27,15 @@ Performance
1727

1828
Internal Implementation (please report possible regressions)
1929

30+
* Minor memory leak during unpack_trees (hence "merge" and "checkout"
31+
to check out another branch) has been plugged.
32+
2033
* More lower-level commands learned to use the streaming API to read
2134
from the object store without keeping everything in core.
2235

36+
* Because "sh" on the user's PATH may be utterly broken on some
37+
systems, run-command API now uses SHELL_PATH, not /bin/sh, when
38+
spawning an external command.
2339

2440
Also contains minor documentation updates and code clean-ups.
2541

@@ -31,6 +47,31 @@ Unless otherwise noted, all the fixes since v1.7.10 in the maintenance
3147
releases are contained in this release (see release notes to them for
3248
details).
3349

50+
* "git clean -d -f" (not "-d -f -f") is supposed to protect nested
51+
working trees of independent git repositories that exist in the
52+
current project working tree from getting removed, but the
53+
protection applied only to such working trees that are at the
54+
top-level of the current project by mistake.
55+
(merge ae2f203 jc/maint-clean-nested-worktree-in-subdir later to maint).
56+
57+
* Rename detection logic used to match two empty files as renames
58+
during merge-recursive, leading unnatural mismerges.
59+
(merge 4f7cb99 jk/diff-no-rename-empty later to maint).
60+
61+
* An age-old corner case bug in combine diff (only triggered with -U0
62+
and the hunk at the beginning of the file needs to be shown) has
63+
been fixed.
64+
(merge e5e9b56 rs/combine-diff-zero-context-at-the-beginning later to maint).
65+
66+
* When "git commit --template F" errors out because the user did not
67+
touch the message, it claimed that it aborts due to "empty
68+
message", which was utterly wrong.
69+
(merge 1f08c2c jc/commit-unedited-template later to maint).
70+
71+
* "git add -p" is not designed to deal with unmerged paths but did
72+
not exclude them and tried to apply funny patches only to fail.
73+
(merge 4066bd6 jk/add-p-skip-conflicts later to maint).
74+
3475
* "git commit --author=$name" did not tell the name that was being
3576
recorded in the resulting commit to hooks, even though it does do
3677
so when the end user overrode the authorship via the

0 commit comments

Comments
 (0)