3313b78c14 · matheusbsbs/matheus-bagliano

@@ -75,13 +75,11 @@ Performance, Internal Implementation, Development Support etc.

75 code with "git interpret-trailer".

76

77 * The default Travis-CI configuration specifies newer P4 and GitLFS.

78 - (merge 5f703e8f02 ls/travis-update-p4-and-lfs later to maint).

78

79 * The "fast hash" that had disastrous performance issues in some

80 corner cases has been retired from the internal diff.

81

82 * The character width table has been updated to match Unicode 9.0

84 - (merge 9e6e9aefdf bb/unicode-9.0 later to maint).

83

84 * Update the procedure to generate "tags" for developer support.

85 (merge 046e4c1c09 jk/make-tags-find-sources-tweak later to maint).

@@ -115,7 +113,6 @@ notes for details).

113 standard I/O streams are connected to a TTY, but isatty() that

114 comes with Windows incorrectly returned true if it is used on NUL

115 (i.e. an equivalent to /dev/null). This has been fixed.

118 - (merge cbb3f3c9b1 js/mingw-isatty later to maint).

116

117 * "git svn" did not work well with path components that are "0", and

118 some configuration variable it uses were not documented.

@@ -123,70 +120,56 @@ notes for details).

120

121 * "git rev-parse --symbolic" failed with a more recent notation like

122 "HEAD^-1" and "HEAD^!".

126 - (merge a2e7b04c44 jk/rev-parse-symbolic-parents-fix later to maint).

123

124 * An empty directory in a working tree that can simply be nuked used

125 to interfere while merging or cherry-picking a change to create a

126 submodule directory there, which has been fixed..

131 - (merge 5423d2e700 dt/empty-submodule-in-merge later to maint).

127

128 * The code in "git push" to compute if any commit being pushed in the

129 superproject binds a commit in a submodule that hasn't been pushed

130 out was overly inefficient, making it unusable even for a small

131 project that does not have any submodule but have a reasonable

132 number of refs.

138 - (merge 250ab24ab3 hv/submodule-not-yet-pushed-fix later to maint).

133

134 * "git push --dry-run --recurse-submodule=on-demand" wasn't

135 "--dry-run" in the submodules.

142 - (merge 0301c821c5 bw/push-dry-run later to maint).

136

137 * The output from "git worktree list" was made in readdir() order,

138 and was unstable.

146 - (merge 4df1d4d466 nd/worktree-list-fixup later to maint).

139

140 * mergetool.<tool>.trustExitCode configuration variable did not apply

141 to built-in tools, but now it does.

150 - (merge 2967284456 da/mergetool-trust-exit-code later to maint).

142

143 * "git p4" LFS support was broken when LFS stores an empty blob.

153 - (merge d5eb3cf5e7 ls/p4-empty-file-on-lfs later to maint).

144

145 * A corner case in merge-recursive regression that crept in

146 during 2.10 development cycle has been fixed.

157 - (merge 1c25d2d8ed jc/renormalize-merge-kill-safer-crlf later to maint).

147

148 * Transport with dumb http can be fooled into following foreign URLs

149 that the end user does not intend to, especially with the server

150 side redirects and http-alternates mechanism, which can lead to

151 security issues. Tighten the redirection and make it more obvious

152 to the end user when it happens.

164 - (merge cb4d2d35c4 jk/http-walker-limit-redirect-2.9 later to maint).

153

154 * Update the error messages from the dumb-http client when it fails

155 to obtain loose objects; we used to give sensible error message

156 only upon 404 but we now forbid unexpected redirects that needs to

157 be reported with something sensible.

170 - (merge 3680f16f9d jk/http-walker-limit-redirect later to maint).

158

159 * When diff.renames configuration is on (and with Git 2.9 and later,

160 it is enabled by default, which made it worse), "git stash"

161 misbehaved if a file is removed and another file with a very

162 similar content is added.

176 - (merge 9d4e28ead5 jk/stash-disable-renames-internally later to maint).

163

164 * "git diff --no-index" did not take "--no-abbrev" option.

179 - (merge 43d1948b7b jb/diff-no-index-no-abbrev later to maint).

165

166 * "git difftool --dir-diff" had a minor regression when started from

167 a subdirectory, which has been fixed.

183 - (merge 853e10c197 da/difftool-dir-diff-fix later to maint).

168

169 * "git commit --allow-empty --only" (no pathspec) with dirty index

170 ought to be an acceptable way to create a new commit that does not

171 change any paths, but it was forbidden, perhaps because nobody

172 needed it so far.

189 - (merge beb635ca9c ak/commit-only-allow-empty later to maint).

173

174 * Git 2.11 had a minor regression in "merge --ff-only" that competed

175 with another process that simultanously attempted to update the

@@ -196,26 +179,21 @@ notes for details).

179

180 * A pathname that begins with "//" or "\\" on Windows is special but

181 path normalization logic was unaware of it.

199 - (merge 7814fbe3f1 js/normalize-path-copy-ceil later to maint).

182

183 * "git pull --rebase", when there is no new commits on our side since

184 we forked from the upstream, should be able to fast-forward without

185 invoking "git rebase", but it didn't.

204 - (merge 33b842a1e9 jc/pull-rebase-ff later to maint).

186

187 * The way to specify hotkeys to "xxdiff" that is used by "git

188 mergetool" has been modernized to match recent versions of xxdiff.

208 - (merge 6cf5f6cef7 da/mergetool-xxdiff-hotkey later to maint).

189

190 * Unlike "git am --abort", "git cherry-pick --abort" moved HEAD back

191 to where cherry-pick started while picking multiple changes, when

192 the cherry-pick stopped to ask for help from the user, and the user

193 did "git reset --hard" to a different commit in order to re-attempt

194 the operation.

215 - (merge ce73bb22d8 sb/sequencer-abort-safety later to maint).

195

196 * Code cleanup in shallow boundary computation.

218 - (merge 649b0c316a nd/shallow-fixup later to maint).

197

198 * A recent update to receive-pack to make it easier to drop garbage

199 objects made it clear that GIT_ALTERNATE_OBJECT_DIRECTORIES cannot

@@ -223,49 +201,39 @@ notes for details).

201 made it impossible to push into a repository at such a path. This

202 has been fixed by introducing a quoting mechanism used when

203 appending such a path to the colon-separated list.

226 - (merge 5e74824fac jk/quote-env-path-list-component later to maint).

204

205 * The function usage_msg_opt() has been updated to say "fatal:"

206 before the custom message programs give, when they want to die

207 with a message about wrong command line options followed by the

208 standard usage string.

232 - (merge 87433261a4 jk/parseopt-usage-msg-opt later to maint).

209

210 * "git index-pack --stdin" needs an access to an existing repository,

211 but "git index-pack file.pack" to generate an .idx file that

212 corresponds to a packfile does not.

237 - (merge 29401e1575 jk/index-pack-wo-repo-from-stdin later to maint).

213

214 * Fix for NDEBUG builds.

240 - (merge 08414938a2 jt/mailinfo-fold-in-body-headers later to maint).

215

216 * A lazy "git push" without refspec did not internally use a fully

217 specified refspec to perform 'current', 'simple', or 'upstream'

218 push, causing unnecessary "ambiguous ref" errors.

245 - (merge b284495e93 jc/push-default-explicit later to maint).

219

220 * "git p4" misbehaved when swapping a directory and a symbolic link.

248 - (merge df8a9e86db ld/p4-compare-dir-vs-symlink later to maint).

221

222 * Even though an fix was attempted in Git 2.9.3 days, but running

223 "git difftool --dir-diff" from a subdirectory never worked. This

224 has been fixed.

253 - (merge ce6926974e jk/difftool-in-subdir later to maint).

225

226 * "git p4" that tracks multile p4 paths imported a single changelist

227 that touches files in these multiple paths as one commit, followed

228 by many empty commits. This has been fixed.

258 - (merge 9943e5b979 gv/p4-multi-path-commit-fix later to maint).

229

230 * A potential but unlikely buffer overflow in Windows port has been

231 fixed.

262 - (merge c46458e82f mk/mingw-winansi-ttyname-termination-fix later to maint).

232

233 * When the http server gives an incomplete response to a smart-http

234 rpc call, it could lead to client waiting for a full response that

235 will never come. Teach the client side to notice this condition

236 and abort the transfer.

268 - (merge f8edeaa05d dt/smart-http-detect-server-going-away later to maint).

237

238 * Compression setting for producing packfiles were spread across

239 three codepaths, one of which did not honor any configuration.

@@ -285,16 +253,4 @@ notes for details).

253 (merge c06fa62dfc nd/config-misc-fixes later to maint).

254

255 * Other minor doc, test and build updates and code cleanups.

288 - (merge fa6ca11105 nd/qsort-in-merge-recursive later to maint).

289 - (merge fa3142c919 ak/lazy-prereq-mktemp later to maint).

290 - (merge 9c48b4fb23 ls/t0021-fixup later to maint).

291 - (merge 584f99c87b sb/unpack-trees-grammofix later to maint).

292 - (merge 54471fdcc3 jk/readme-gmane-is-no-more later to maint).

293 - (merge 9e189f1a5c sb/t3600-cleanup later to maint).

294 - (merge e2c20be57c lr/doc-fix-cet later to maint).

295 - (merge 47437fd3bd kh/tutorial-grammofix later to maint).

256 (merge f2627d9b19 sb/submodule-config-cleanup later to maint).

297 - (merge 7eeda8b821 ls/filter-process later to maint).

298 - (merge 6cc823c5c1 jt/fetch-no-redundant-tag-fetch-map later to maint).

299 - (merge 235ec24352 mm/push-social-engineering-attack-doc later to maint).

300 - (merge f1350d0c12 mm/gc-safety-doc later to maint).

RelNotes: drop merge-later comments for maint