92f74a6192 · matheusbsbs/matheus-bagliano

@@ -77,7 +77,6 @@ UI, Workflows & Features

77 unlike in the e-mail header. "git send-email" has been updated to

78 ignore anything after '>' when picking addresses, to allow non-address

79 cruft like " # stable 4.4" after the address.

80 - (merge 9d3343961b jh/send-email-one-cc later to maint).

80

81 * When "git submodule init" decides that the submodule in the working

82 tree is its upstream, it now gives a warning as it is not a very

@@ -113,6 +112,18 @@ UI, Workflows & Features

112 repository and was quite messy due to its "chicken-and-egg" nature.

113 The code has been restructured.

114

115 + * The command line prompt (in contrib/) learned a new 'tag' style

116 + that can be specified with GIT_PS1_DESCRIBE_STYLE, to describe a

117 + detached HEAD with "git describe --tags".

118 +

119 + * The configuration file learned a new "includeIf.<condition>.path"

120 + that includes the contents of the given path only when the

121 + condition holds. This allows you to say "include this work-related

122 + bit only in the repositories under my ~/work/ directory".

123 +

124 + * Recent update to "rebase -i" started showing a message that is not

125 + a warning with "warning:" prefix by mistake. This has been fixed.

126 +

127

128 Performance, Internal Implementation, Development Support etc.

129

@@ -141,11 +152,9 @@ Performance, Internal Implementation, Development Support etc.

152

153 * A test that creates a confusing branch whose name is HEAD has been

154 corrected not to do so.

144 - (merge f0252ca23c jk/t6300-cleanup later to maint).

155

156 * The code that parses header fields in the commit object has been

157 updated for (micro)performance and code hygiene.

148 - (merge b072504ce1 rs/commit-parsing-optim later to maint).

158

159 * An helper function to make it easier to append the result from

160 real_path() to a strbuf has been added.

@@ -216,7 +225,6 @@ notes for details).

225 * "git show-branch" expected there were only very short branch names

226 in the repository and used a fixed-length buffer to hold them

227 without checking for overflow.

219 - (merge d3cc5f4c44 jk/show-branch-lift-name-len-limit later to maint).

228

229 * A caller of tempfile API that uses stdio interface to write to

230 files may ignore errors while writing, which is detected when

@@ -225,17 +233,14 @@ notes for details).

233 be long gone and was overwritten by an irrelevant value.

234 close_tempfile() now resets errno to EIO to make errno at least

235 predictable.

228 - (merge 7e8c9355b7 jk/tempfile-ferror-fclose-confusion later to maint).

236

237 * "git remote rm X", when a branch has remote X configured as the

238 value of its branch.*.remote, tried to remove branch.*.remote and

239 branch.*.merge and failed if either is unset.

233 - (merge 20690b2139 rl/remote-allow-missing-branch-name-merge later to maint).

240

241 * A "gc.log" file left by a backgrounded "gc --auto" disables further

242 automatic gc; it has been taught to run at least once a day (by

243 default) by ignoring a stale "gc.log" file that is too old.

238 - (merge a831c06a2b dt/gc-ignore-old-gc-logs later to maint).

244

245 * The code to parse "git -c VAR=VAL cmd" and set configuration

246 variable for the duration of cmd had two small bugs, which have

@@ -250,11 +255,9 @@ notes for details).

255 report a request for a ref that was not advertised as invalid.

256 This is generally not a problem (because "git fetch" will stop

257 before making such a request), but is the right thing to do.

253 - (merge bdb31eada7 jt/upload-pack-error-report later to maint).

258

259 * A leak in a codepath to read from a packed object in (rare) cases

260 has been plugged.

257 - (merge 886ddf4777 rs/sha1-file-plug-fallback-base-leak later to maint).

261

262 * When a redirected http transport gets an error during the

263 redirected request, we ignored the error we got from the server,

@@ -272,7 +275,6 @@ notes for details).

275

276 * There is no need for Python only to give a few messages to the

277 standard error stream, but we somehow did.

275 - (merge b8686c661d ss/remote-bzr-hg-placeholder-wo-python later to maint).

278

279 * The code to parse "git log -L..." command line was buggy when there

280 are many ranges specified with -L; overrun of the allocated buffer

@@ -286,7 +288,6 @@ notes for details).

288 made an incorrect short-cut when asked only to populate the size

289 field for paths that need to go through convert_to_git() (e.g. CRLF

290 conversion).

289 - (merge 12426e114b jc/diff-populate-filespec-size-only-fix later to maint).

291

292 * A few tests were run conditionally under (rare) conditions where

293 they cannot be run (like running cvs tests under 'root' account).

@@ -318,7 +319,6 @@ notes for details).

319

320 * "Dumb http" transport used to misparse a nonsense http-alternates

321 response, which has been fixed.

321 - (merge d61434ae81 jk/http-walker-buffer-underflow-fix later to maint).

322

323 * "git add -p <pathspec>" unnecessarily expanded the pathspec to a

324 list of individual files that matches the pathspec by running "git

@@ -332,11 +332,17 @@ notes for details).

332

333 * "git status --porcelain" is supposed to give a stable output, but a

334 few strings were left as translatable by mistake.

335 - (merge b9e2bc560a mg/status-porcelain-no-i18n later to maint).

335 +

336 + * Code to read submodule.<name>.ignore config did not state the

337 + variable name correctly when giving an error message diagnosing

338 + misconfiguration.

339 + (merge 5ea304896e sb/submodule-config-parse-ignore-fix later to maint).

340

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

338 - (merge b803ae4427 ps/docs-diffcore later to maint).

339 - (merge bcd886d897 ew/markdown-url-in-readme later to maint).

340 - (merge b2d593a779 rj/remove-unused-mktemp later to maint).

341 - (merge 3255e512a8 jk/ewah-use-right-type-in-sizeof later to maint).

342 (merge dfa3ad3238 rs/blame-code-cleanup later to maint).

343 + (merge ffddfc6328 jk/rev-parse-cleanup later to maint).

344 + (merge f20754802a jk/pack-name-cleanups later to maint).

345 + (merge d4aae459cd sb/wt-status-cleanup later to maint).

346 + (merge 2c7ee986c7 ab/doc-no-option-notation-fix later to maint).

347 + (merge e4e016f65d ab/push-default-doc-fix later to maint).

348 + (merge baced9e4e5 nd/commit-hook-doc-fix later to maint).

Sixth batch for 2.13