Yet another batch for 2.9.3

Signed-off-by: Junio C Hamano <gitster@pobox.com>

Junio C Hamano committed Aug 10, 2016 at 11:56 UTC 8e4b75a97beaf88aa83ab2b18c07bd8ae4954f28
1 file changed +68
Documentation/RelNotes/2.9.3.txt
+68
@@ -89,4 +89,72 @@ Fixes since v2.9.2
89 switch the default the built-in path to /usr/local/bin/perl on not
90 too ancient FreeBSD releases.
91
92 + * "git status" learned to suggest "merge --abort" during a conflicted
93 + merge, just like it already suggests "rebase --abort" during a
94 + conflicted rebase.
95 +
96 + * The .c/.h sources are marked as such in our .gitattributes file so
97 + that "git diff -W" and friends would work better.
98 +
99 + * Existing autoconf generated test for the need to link with pthread
100 + library did not check all the functions from pthread libraries;
101 + recent FreeBSD has some functions in libc but not others, and we
102 + mistakenly thought linking with libc is enough when it is not.
103 +
104 + * Allow http daemon tests in Travis CI tests.
105 +
106 + * Users of the parse_options_concat() API function need to allocate
107 + extra slots in advance and fill them with OPT_END() when they want
108 + to decide the set of supported options dynamically, which makes the
109 + code error-prone and hard to read. This has been corrected by tweaking
110 + the API to allocate and return a new copy of "struct option" array.
111 +
112 + * The use of strbuf in "git rm" to build filename to remove was a bit
113 + suboptimal, which has been fixed.
114 +
115 + * "git commit --help" said "--no-verify" is only about skipping the
116 + pre-commit hook, and failed to say that it also skipped the
117 + commit-msg hook.
118 +
119 + * "git merge" in Git v2.9 was taught to forbid merging an unrelated
120 + lines of history by default, but that is exactly the kind of thing
121 + the "--rejoin" mode of "git subtree" (in contrib/) wants to do.
122 + "git subtree" has been taught to use the "--allow-unrelated-histories"
123 + option to override the default.
124 +
125 + * The build procedure for "git persistent-https" helper (in contrib/)
126 + has been updated so that it can be built with more recent versions
127 + of Go.
128 +
129 + * There is an optimization used in "git diff $treeA $treeB" to borrow
130 + an already checked-out copy in the working tree when it is known to
131 + be the same as the blob being compared, expecting that open/mmap of
132 + such a file is faster than reading it from the object store, which
133 + involves inflating and applying delta. This however kicked in even
134 + when the checked-out copy needs to go through the convert-to-git
135 + conversion (including the clean filter), which defeats the whole
136 + point of the optimization. The optimization has been disabled when
137 + the conversion is necessary.
138 +
139 + * "git -c grep.patternType=extended log --basic-regexp" misbehaved
140 + because the internal API to access the grep machinery was not
141 + designed well.
142 +
143 + * Windows port was failing some tests in t4130, due to the lack of
144 + inum in the returned values by its lstat(2) emulation.
145 +
146 + * The characters in the label shown for tags/refs for commits in
147 + "gitweb" output are now properly escaped for proper HTML output.
148 +
149 + * FreeBSD can lie when asked mtime of a directory, which made the
150 + untracked cache code to fall back to a slow-path, which in turn
151 + caused tests in t7063 to fail because it wanted to verify the
152 + behaviour of the fast-path.
153 +
154 + * Squelch compiler warnings for netmalloc (in compat/) library.
155 +
156 + * The API documentation for hashmap was unclear if hashmap_entry
157 + can be safely discarded without any other consideration. State
158 + that it is safe to do so.
159 +
160 Also contains minor documentation updates and code clean-ups.