27b0ea4038 · matheusbsbs/matheus-bagliano

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

97 * "git status" learned to suggest "merge --abort" during a conflicted

98 merge, just like it already suggests "rebase --abort" during a

99 conflicted rebase.

100 - (merge b0a61ab mm/status-suggest-merge-abort later to maint).

100

101 * "git jump" script (in contrib/) has been updated a bit.

102 (merge a91e692 jk/git-jump later to maint).

@@ -110,6 +109,13 @@ UI, Workflows & Features

109 paint the arrow in the same color as "HEAD", not in the color for

110 commits.

111

112 + * "git format-patch" learned format.from configuration variable to

113 + specify the default settings for its "--from" option.

114 +

115 + * "git am -3" calls "git merge-recursive" when it needs to fall back

116 + to a three-way merge; this call has been turned into an internal

117 + subroutine call instead of spawning a separate subprocess.

118 +

119

120 Performance, Internal Implementation, Development Support etc.

121

@@ -185,7 +191,6 @@ Performance, Internal Implementation, Development Support etc.

191

192 * The .c/.h sources are marked as such in our .gitattributes file so

193 that "git diff -W" and friends would work better.

188 - (merge e82675a rs/help-c-source-with-gitattributes later to maint).

194

195 * Code clean-up to avoid using a variable string that compilers may

196 feel untrustable as printf-style format given to write_file()

@@ -198,7 +203,6 @@ Performance, Internal Implementation, Development Support etc.

203 library did not check all the functions from pthread libraries;

204 recent FreeBSD has some functions in libc but not others, and we

205 mistakenly thought linking with libc is enough when it is not.

201 - (merge a9b02de ew/autoconf-pthread later to maint).

206

207 * When "git fsck" reports a broken link (e.g. a tree object contains

208 a blob that does not exist), both containing object and the object

@@ -207,7 +211,6 @@ Performance, Internal Implementation, Development Support etc.

211 the containing object from existing refs (e.g. "HEAD~24^2:file.txt").

212

213 * Allow http daemon tests in Travis CI tests.

210 - (merge d9d1426 ls/travis-enable-httpd-tests later to maint).

214

215 * Makefile assumed that -lrt is always available on platforms that

216 want to use clock_gettime() and CLOCK_MONOTONIC, which is not a

@@ -241,7 +244,6 @@ Performance, Internal Implementation, Development Support etc.

244 to decide the set of supported options dynamically, which makes the

245 code error-prone and hard to read. This has been corrected by tweaking

246 the API to allocate and return a new copy of "struct option" array.

244 - (merge 023ff39 jk/parse-options-concat later to maint).

247

248 * "git fetch" exchanges batched have/ack messages between the sender

249 and the receiver, initially doubling every time and then falling

@@ -457,7 +459,6 @@ notes for details).

459

460 * The use of strbuf in "git rm" to build filename to remove was a bit

461 suboptimal, which has been fixed.

460 - (merge deb8e15 rs/rm-strbuf-optim later to maint).

462

463 * An age old bug that caused "git diff --ignore-space-at-eol"

464 misbehave has been fixed.

@@ -483,19 +484,16 @@ notes for details).

484 * "git commit --help" said "--no-verify" is only about skipping the

485 pre-commit hook, and failed to say that it also skipped the

486 commit-msg hook.

486 - (merge def480f os/no-verify-skips-commit-msg-too later to maint).

487

488 * "git merge" in Git v2.9 was taught to forbid merging an unrelated

489 lines of history by default, but that is exactly the kind of thing

490 the "--rejoin" mode of "git subtree" (in contrib/) wants to do.

491 "git subtree" has been taught to use the "--allow-unrelated-histories"

492 option to override the default.

493 - (merge 0f12c7d da/subtree-2.9-regression later to maint).

493

494 * The build procedure for "git persistent-https" helper (in contrib/)

495 has been updated so that it can be built with more recent versions

496 of Go.

498 - (merge accb613 pm/build-persistent-https-with-recent-go later to maint).

497

498 * There is an optimization used in "git diff $treeA $treeB" to borrow

499 an already checked-out copy in the working tree when it is known to

@@ -506,16 +504,13 @@ notes for details).

504 conversion (including the clean filter), which defeats the whole

505 point of the optimization. The optimization has been disabled when

506 the conversion is necessary.

509 - (merge 06dec43 jk/diff-do-not-reuse-wtf-needs-cleaning later to maint).

507

508 * "git -c grep.patternType=extended log --basic-regexp" misbehaved

509 because the internal API to access the grep machinery was not

510 designed well.

514 - (merge 8465541 jc/grep-commandline-vs-configuration later to maint).

511

512 * Windows port was failing some tests in t4130, due to the lack of

513 inum in the returned values by its lstat(2) emulation.

518 - (merge 54956df js/t4130-rename-without-ino later to maint).

514

515 * The reflog output format is documented better, and a new format

516 --date=unix to report the seconds-since-epoch (without timezone)

@@ -529,16 +524,13 @@ notes for details).

524

525 * The characters in the label shown for tags/refs for commits in

526 "gitweb" output are now properly escaped for proper HTML output.

532 - (merge 77947bb ab/gitweb-link-html-escape later to maint).

527

528 * FreeBSD can lie when asked mtime of a directory, which made the

529 untracked cache code to fall back to a slow-path, which in turn

530 caused tests in t7063 to fail because it wanted to verify the

531 behaviour of the fast-path.

538 - (merge 6b7728d nd/fbsd-lazy-mtime later to maint).

532

533 * Squelch compiler warnings for netmalloc (in compat/) library.

541 - (merge c6c9e18 js/nedmalloc-gcc6-warnings later to maint).

534

535 * A small memory leak in the command line parsing of "git blame"

536 has been plugged.

@@ -546,10 +538,19 @@ notes for details).

538 * The API documentation for hashmap was unclear if hashmap_entry

539 can be safely discarded without any other consideration. State

540 that it is safe to do so.

549 - (merge 54ba5a1 jc/hashmap-doc-init later to maint).

541 +

542 + * Not-so-recent rewrite of "git am" that started making internal

543 + calls into the commit machinery had an unintended regression, in

544 + that no matter how many seconds it took to apply many patches, the

545 + resulting committer timestamp for the resulting commits were all

546 + the same.

547 + (merge 4d9c7e6 jk/reset-ident-time-per-commit later to maint).

548 +

549 + * "git push --force-with-lease" already had enough logic to allow

550 + ensuring that such a push results in creation of a ref (i.e. the

551 + receiving end did not have another push from sideways that would be

552 + discarded by our force-pushing), but didn't expose this possibility

553 + to the users. It does so now.

554 + (merge 9eed4f3 jk/push-force-with-lease-creation later to maint).

555

556 * Other minor clean-ups and documentation updates

552 - (merge 9d1ca1d jk/t4205-cleanup later to maint).

553 - (merge 5f072e0 cp/completion-clone-recurse-submodules later to maint).

554 - (merge bc57b9c rs/use-strbuf-addstr later to maint).

555 - (merge 52db4b0 jh/clean-smudge-f-doc later to maint).

Twelfth batch for 2.10