69d4380b47 · matheusbsbs/matheus-bagliano

@@ -85,20 +85,34 @@ UI, Workflows & Features

85

86 * "git send-email" now uses a more readable timestamps when

87 formulating a message ID.

88 - (merge f916ab0 ew/send-email-readable-message-id later to maint).

88

89 * "git rerere" can encounter two or more files with the same conflict

90 signature that have to be resolved in different ways, but there was

91 no way to record these separate resolutions.

92 (merge 890fca8 jc/rerere-multi later to maint).

93

94 + * "git p4" learned to record P4 jobs in Git commit that imports from

95 + the history in Perforce.

96 +

97 + * "git describe --contains" often made a hard-to-justify choice of

98 + tag to give name to a given commit, because it tried to come up

99 + with a name with smallest number of hops from a tag, causing an old

100 + commit whose close descendant that is recently tagged were not

101 + described with respect to an old tag but with a newer tag. It did

102 + not help that its computation of "hop" count was further tweaked to

103 + penalize being on a side branch of a merge. The logic has been

104 + updated to favor using the tag with the oldest tagger date, which

105 + is a lot easier to explain to the end users: "We describe a commit

106 + in terms of the (chronologically) oldest tag that contains the

107 + commit."

108 + (merge 7550424 js/name-rev-use-oldest-ref later to maint).

109 +

110

111 Performance, Internal Implementation, Development Support etc.

112

113 * The embedded args argv-array in the child process is used to build

114 the command line to run pack-objects instead of using a separate

115 array of strings.

101 - (merge 65a3629 mp/upload-pack-use-embedded-args later to maint).

116

117 * A test for tags has been restructured so that more parts of it can

118 easily be run on a platform without a working GnuPG.

@@ -107,7 +121,6 @@ Performance, Internal Implementation, Development Support etc.

121 repository (among other things), are now uniformly available to Git

122 subcommand implementations, and Git avoids attempting to touch

123 references when we are not in a repository.

110 - (merge 11e6b3f jk/startup-info later to maint).

124

125 * The command line argument parser for "receive-pack" has been

126 rewritten to use parse-options.

@@ -117,20 +130,16 @@ Performance, Internal Implementation, Development Support etc.

130 parallel.

131

132 * Rename bunch of tests on "git clone" for better organization.

120 - (merge 8fbb03a sb/clone-t57-t56 later to maint).

133

134 * The tests that involve running httpd leaked the system-wide

135 configuration in /etc/gitconfig to the tested environment.

124 - (merge 1fad503 jk/test-httpd-config-nosystem later to maint).

136

137 * Build updates for MSVC.

127 - (merge 0ef60af ss/msvc later to maint).

138

139 * The repository set-up sequence has been streamlined (the biggest

140 change is that there is no longer git_config_early()), so that we

141 do not attempt to look into refs/* when we know we do not have a

142 Git repository.

133 - (merge 274db84 jk/check-repository-format later to maint).

143

144 * Code restructuring around the "refs" area to prepare for pluggable

145 refs backends.

@@ -149,6 +158,9 @@ Performance, Internal Implementation, Development Support etc.

158 commands by making one directly call into the other.

159 (merge bef234b st/verify-tag later to maint).

160

161 + * "merge-recursive" strategy incorrectly checked if a path that is

162 + involved in its internal merge exists in the working tree.

163 +

164

165 Also contains various documentation updates and code clean-ups.

166

@@ -163,98 +175,78 @@ notes for details).

175 * "git config --get-urlmatch", unlike other variants of the "git

176 config --get" family, did not signal error with its exit status

177 when there was no matching configuration.

166 - (merge 24990b2 jk/config-get-urlmatch later to maint).

178

179 * The "--local-env-vars" and "--resolve-git-dir" options of "git

180 rev-parse" failed to work outside a repository when the command's

181 option parsing was rewritten in 1.8.5 era.

171 - (merge fc7d47f jk/rev-parse-local-env-vars later to maint).

182

183 * "git index-pack --keep[=<msg>] pack-$name.pack" simply did not work.

174 - (merge 0e94242 jc/maint-index-pack-keep later to maint).

184

185 * Fetching of history by naming a commit object name directly didn't

186 work across remote-curl transport.

178 - (merge 754ecb1 gf/fetch-pack-direct-object-fetch later to maint).

187

188 * A small memory leak in an error codepath has been plugged in xdiff

189 code.

182 - (merge 87f1625 rj/xdiff-prepare-plug-leak-on-error-codepath later to maint).

190

191 * strbuf_getwholeline() did not NUL-terminate the buffer on certain

192 corner cases in its error codepath.

186 - (merge b709043 jk/getwholeline-getdelim-empty later to maint).

193

194 * "git mergetool" did not work well with conflicts that both sides

195 deleted.

190 - (merge a298604 da/mergetool-delete-delete-conflict later to maint).

196

197 * "git send-email" had trouble parsing alias file in mailrc format

198 when lines in it had trailing whitespaces on them.

194 - (merge a277d1e jk/send-email-rtrim-mailrc-alias later to maint).

199

200 * When "git merge --squash" stopped due to conflict, the concluding

201 "git commit" failed to read in the SQUASH_MSG that shows the log

202 messages from all the squashed commits.

199 - (merge b64c1e0 ss/commit-squash-msg later to maint).

203

204 * "git merge FETCH_HEAD" dereferenced NULL pointer when merging

205 nothing into an unborn history (which is arguably unusual usage,

206 which perhaps was the reason why nobody noticed it).

204 - (merge b84e65d jv/merge-nothing-into-void later to maint).

207

208 * When "git worktree" feature is in use, "git branch -d" allowed

209 deletion of a branch that is checked out in another worktree,

210 which was wrong.

209 - (merge f292244 ky/branch-d-worktree later to maint).

211

212 * When "git worktree" feature is in use, "git branch -m" renamed a

213 branch that is checked out in another worktree without adjusting

214 the HEAD symbolic ref for the worktree.

214 - (merge 18eb3a9 ky/branch-m-worktree later to maint).

215

216 * "git diff -M" used to work better when two originally identical

217 files A and B got renamed to X/A and X/B by pairing A to X/A and B

218 to X/B, but this was broken in the 2.0 timeframe.

219 - (merge ca4e3ca sg/diff-multiple-identical-renames later to maint).

219

220 * "git send-pack --all <there>" was broken when its command line

221 option parsing was written in the 2.6 timeframe.

223 - (merge c677756 sk/send-pack-all-fix later to maint).

222

223 * "git format-patch --help" showed `-s` and `--no-patch` as if these

224 are valid options to the command. We already hide `--patch` option

225 from the documentation, because format-patch is about showing the

226 diff, and the documentation now hides these options as well.

229 - (merge b73a1bc es/format-patch-doc-hide-no-patch later to maint).

227

228 * When running "git blame $path" with unnormalized data in the index

229 for the path, the data in the working tree was blamed, even though

230 "git add" would not have changed what is already in the index, due

231 to "safe crlf" that disables the line-end conversion. It has been

232 corrected.

236 - (merge a08feb8 tb/blame-force-read-cache-to-workaround-safe-crlf later to maint).

233

234 * A change back in version 2.7 to "git branch" broke display of a

235 symbolic ref in a non-standard place in the refs/ hierarchy (we

236 expect symbolic refs to appear in refs/remotes/*/HEAD to point at

237 the primary branch the remote has, and as .git/HEAD to point at the

238 branch we locally checked out).

243 - (merge 95c38fb jk/branch-shortening-funny-symrefs later to maint).

239

240 * A partial rewrite of "git submodule" in the 2.7 timeframe changed

241 the way the gitdir: pointer in the submodules point at the real

242 repository location to use absolute paths by accident. This has

243 been corrected.

249 - (merge 1f15ba1 sb/submodule-helper-clone-regression-fix later to maint).

244

245 * "git commit" misbehaved in a few minor ways when an empty message

246 is given via -m '', all of which has been corrected.

253 - (merge 27014cb ad/commit-have-m-option later to maint).

247

248 * Support for CRAM-MD5 authentication method in "git imap-send" did

249 not work well.

257 - (merge eb94ee7 ky/imap-send later to maint).

250

251 * Upcoming OpenSSL 1.1.0 will break compilation b updating a few APIs

252 we use in imap-send, which has been adjusted for the change.

@@ -262,11 +254,9 @@ notes for details).

254

255 * The socks5:// proxy support added back in 2.6.4 days was not aware

256 that socks5h:// proxies behave differently.

265 - (merge 87f8a0b jc/http-socks5h later to maint).

257

258 * "git config" had a codepath that tried to pass a NULL to

259 printf("%s"), which nobody seems to have noticed.

269 - (merge 1cae428 jk/do-not-printf-NULL later to maint).

260

261 * On Cygwin, object creation uses the "create a temporary and then

262 rename it to the final name" pattern, not "create a temporary,

@@ -277,7 +267,6 @@ notes for details).

267 already enabled for the MinGW and plain Windows builds. It also

268 has been used in Cygwin packaged versions of Git for quite a while.

269 See http://thread.gmane.org/gmane.comp.version-control.git/291853

280 - (merge e53a64b ad/cygwin-wants-rename later to maint).

270

271 * "merge-octopus" strategy did not ensure that the index is clean

272 when merge begins.

@@ -320,23 +309,18 @@ notes for details).

309 consuming paging store when not needed.

310 (merge d5425d1 js/win32-mmap later to maint).

311

312 + * A question by "git send-email" to ask the identity of the sender

313 + has been updated.

314 + (merge 0d6b21e jd/send-email-to-whom later to maint).

315 +

316 + * UI consistency improvements for "git mergetool".

317 + (merge cce076e nf/mergetool-prompt later to maint).

318 +

319 * Other minor clean-ups and documentation updates

324 - (merge aed7480 mm/lockfile-error-message later to maint).

325 - (merge bfee614 jc/index-pack later to maint).

326 - (merge f870899 ss/exc-flag-is-a-collection-of-bits later to maint).

327 - (merge dde7891 pb/t7502-drop-dup later to maint).

328 - (merge 3bd1b51 cc/doc-recommend-performance-trace-to-file later to maint).

329 - (merge 7d5e9c9 jk/credential-cache-comment-exit later to maint).

330 - (merge 16a86d4 nd/apply-doc later to maint).

331 - (merge c3f6b85 pb/opt-cmdmode-doc later to maint).

332 - (merge 30211fb oa/doc-diff-check later to maint).

333 - (merge 01d98e8 ak/use-hashmap-iter-first-in-submodule-config later to maint).

320 (merge 8b5a3e9 kn/for-each-tag-branch later to maint).

321 (merge 9c60d9f sb/misc-cleanups later to maint).

322 (merge 7a6a44c cc/apply later to maint).

337 - (merge 8e9b208 js/mingw-tests-2.8 later to maint).

338 - (merge d55de70 jc/makefile-redirection-stderr later to maint).

339 - (merge 4232b21 ep/trace-doc-sample-fix later to maint).

340 - (merge ef8c95e ew/send-email-drop-data-dumper later to maint).

341 - (merge 24041d6 jc/xstrfmt-null-with-prec-0 later to maint).

342 - (merge 7bec7f5 jk/use-write-script-more later to maint).

323 + (merge 6594883 nd/remove-unused later to maint).

324 + (merge 0ff7410 sg/test-lib-simplify-expr-away later to maint).

325 + (merge 060e776 jk/fix-attribute-macro-in-2.5 later to maint).

326 + (merge d16df0c rt/string-list-lookup-cleanup later to maint).

Ninth batch for 2.9