3a0f269e7c · matheusbsbs/matheus-bagliano

@@ -97,7 +97,7 @@ UI, Workflows & Features

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

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

99 no way to record these separate resolutions.

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

100 + (merge d9d501b068 jc/rerere-multi later to maint).

101

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

103 the history in Perforce.

@@ -132,6 +132,25 @@ UI, Workflows & Features

132 turned out to be a convoluted no-op; implement what it wanted to do

133 correctly, and stop filtering settings given via "git -c var=val".

134

135 + * "git commit --dry-run" reported "No, no, you cannot commit." in one

136 + case where "git commit" would have allowed you to commit, and this

137 + improves it a little bit ("git commit --dry-run --short" still does

138 + not give you the correct answer, for example). This is a stop-gap

139 + measure in that "commit --short --dry-run" still gives an incorrect

140 + result.

141 +

142 + * The experimental "multiple worktree" feature gains more safety to

143 + forbid operations on a branch that is checked out or being actively

144 + worked on elsewhere, by noticing that e.g. it is being rebased.

145 +

146 + * "git format-patch" learned a new "--base" option to record what

147 + (public, well-known) commit the original series was built on in

148 + its output.

149 +

150 + * "git commit" learned to pay attention to "commit.verbose"

151 + configuration variable and act as if "--verbose" option was

152 + given from the command line.

153 +

154

155 Performance, Internal Implementation, Development Support etc.

156

@@ -183,7 +202,6 @@ Performance, Internal Implementation, Development Support etc.

202 * The test scripts for "git p4" (but not "git p4" implementation

203 itself) has been updated so that they would work even on a system

204 where the installed version of Python is python 3.

186 - (merge 1fb3fb4 ld/p4-test-py3 later to maint).

205

206 * As nobody maintains our in-tree git.spec.in and distros use their

207 own spec file, we stopped pretending that we support "make rpm".

@@ -205,6 +223,22 @@ Performance, Internal Implementation, Development Support etc.

223 being tested intact.

224 (merge d88785e jk/test-send-sh-x-trace-elsewhere later to maint).

225

226 + * t0040 had too many unnecessary repetitions in its test data. Teach

227 + test-parse-options program so that a caller can tell what it

228 + expects in its output, so that these repetitions can be cleaned up.

229 +

230 + * Add perf test for "rebase -i"

231 +

232 + * Common mistakes when writing gitlink: in our documentation are

233 + found by "make check-docs".

234 +

235 + * t9xxx series has been updated primarily for readability, while

236 + fixing small bugs in it. A few scripted Porcelains have also been

237 + updated to fix possible bugs around their use of "test -z" and

238 + "test -n".

239 +

240 + * CI test was taught to run git-svn tests.

241 +

242

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

244

@@ -294,7 +328,6 @@ notes for details).

328

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

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

297 - (merge 1245c74 ky/imap-send-openssl-1.1.0 later to maint).

331

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

333 that socks5h:// proxies behave differently.

@@ -324,7 +357,6 @@ notes for details).

357 * "git submodule" reports the paths of submodules the command

358 recurses into, but this was incorrect when the command was not run

359 from the root level of the superproject.

327 - (merge 2ab5660 sb/submodule-path-misc-bugs later to maint).

360

361 * The "user.useConfigOnly" configuration variable makes it an error

362 if users do not explicitly set user.name and user.email. However,

@@ -333,32 +365,25 @@ notes for details).

365 system setting was unusable. This was a suboptimal end-user

366 experience as we want the users to set user.name/user.email without

367 relying on the auto-detection at all.

336 - (merge d3c06c1 da/user-useconfigonly later to maint).

368

369 * "git mv old new" did not adjust the path for a submodule that lives

370 as a subdirectory inside old/ directory correctly.

340 - (merge a127331 sb/mv-submodule-fix later to maint).

371

372 * "git replace -e" did not honour "core.editor" configuration.

343 - (merge 36b1437 js/replace-edit-use-editor-configuration later to maint).

373

374 * "git push" from a corrupt repository that attempts to push a large

375 number of refs deadlocked; the thread to relay rejection notices

376 for these ref updates blocked on writing them to the main thread,

377 after the main thread at the receiving end notices that the push

378 failed and decides not to read these notices and return a failure.

350 - (merge f924b52a jk/push-client-deadlock-fix later to maint).

379

380 * mmap emulation on Windows has been optimized and work better without

381 consuming paging store when not needed.

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

382

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

384 has been updated.

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

385

386 * UI consistency improvements for "git mergetool".

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

387

388 * "git rebase -m" could be asked to rebase an entire branch starting

389 from the root, but failed by assuming that there always is a parent

@@ -366,24 +391,19 @@ notes for details).

391 (merge 79f4344 bw/rebase-merge-entire-branch later to maint).

392

393 * Fix a broken "p4 lfs" test.

369 - (merge 9e220fe ls/p4-lfs-test-fix-2.7.0 later to maint).

394

395 * Recent update to Git LFS broke "git p4" by changing the output from

396 its "lfs pointer" subcommand.

373 - (merge 82f2567 ls/p4-lfs later to maint).

397

398 * "git fetch" test t5510 was flaky while running a (forced) automagic

399 garbage collection.

377 - (merge bb05510 js/close-packs-before-gc later to maint).

400

401 * Documentation updates to help contributors setting up Travis CI

402 test for their patches.

381 - (merge 0e5d028 ls/travis-submitting-patches later to maint).

403

404 * Some multi-byte encoding can have a backslash byte as a later part

405 of one letter, which would confuse "highlight" filter used in

406 gitweb.

386 - (merge 029f372 sk/gitweb-highlight-encoding later to maint).

407

408 * "git commit-tree" plumbing command required the user to always sign

409 its result when the user sets the commit.gpgsign configuration

@@ -442,19 +462,20 @@ notes for details).

462 adjusted to align with that used by OpenPGP.

463 (merge 05a5869 kf/gpg-sig-verification-doc later to maint).

464

465 + * A couple of bugs around core.autocrlf have been fixed.

466 + (merge caa47ad tb/core-eol-fix later to maint).

467 +

468 + * Many commands normalize command line arguments from NFD to NFC

469 + variant of UTF-8 on OSX, but commands in the "diff" family did

470 + not, causing "git diff $path" to complain that no such path is

471 + known to Git. They have been taught to do the normalization.

472 + (merge 90a78b8 ar/diff-args-osx-precompose later to maint).

473 +

474 + * "git difftool" learned to handle unmerged paths correctly in

475 + dir-diff mode.

476 + (merge 366f9ce da/difftool later to maint).

477 +

478 * Other minor clean-ups and documentation updates

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

447 - (merge 99dab16 sb/misc-cleanups later to maint).

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

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

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

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

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

453 - (merge 376eb60 sb/config-exit-status-list later to maint).

454 - (merge 9cea46c ew/doc-split-pack-disables-bitmap later to maint).

455 - (merge fa72245 ew/normal-to-e later to maint).

456 - (merge 2e39a24 rn/glossary-typofix later to maint).

457 - (merge cadfbef sb/clean-test-fix later to maint).

479 (merge 832c0e5 lp/typofixes later to maint).

480 (merge f5ee54a sb/z-is-gnutar-ism later to maint).

481 (merge 2e3926b va/i18n-misc-updates later to maint).

Git 2.9-rc0