1f66975deb · matheusbsbs/matheus-bagliano

@@ -124,6 +124,14 @@ UI, Workflows & Features

124 more readable by using a blank line as a strong hint that the

125 contents before and after it belong to a logically separate unit.

126

127 + * A new configuration variable core.hooksPath allows customizing

128 + where the hook directory is.

129 +

130 + * An earlier addition of "sanitize_submodule_env" with 14111fc4 (git:

131 + submodule honor -c credential.* from command line, 2016-02-29)

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

136 Performance, Internal Implementation, Development Support etc.

137

@@ -165,12 +173,6 @@ Performance, Internal Implementation, Development Support etc.

173 have been moved to t/helper/ subdirectory to reduce clutter at the

174 top level of the tree.

175

168 - Note that this can break your tests if you check out revisions

169 - across the merge boundary of this topic, e0b58519 (Merge branch

170 - 'nd/test-helpers', 2016-04-29), as bin-wrappers/test-* are not

171 - rebuilt to point the underlying executables. For now, "make

172 - distclean" is your friend.

173 -

176 * Unify internal logic between "git tag -v" and "git verify-tag"

177 commands by making one directly call into the other.

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

@@ -188,6 +190,21 @@ Performance, Internal Implementation, Development Support etc.

190

191 * Move from unsigned char[20] to struct object_id continues.

192

193 + * Update of "git submodule" to move pieces of logic to C continues.

194 +

195 + * The code for warning_errno/die_errno has been refactored and a new

196 + error_errno() reporting helper is introduced.

197 + (merge 1da045f nd/error-errno later to maint).

198 +

199 + * Running tests with '-x' option to trace the individual command

200 + executions is a useful way to debug test scripts, but some tests

201 + that capture the standard error stream and check what the command

202 + said can be broken with the trace output mixed in. When running

203 + our tests under "bash", however, we can redirect the trace output

204 + to another file descriptor to keep the standard error of programs

205 + being tested intact.

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

207 +

208

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

210

@@ -379,6 +396,51 @@ notes for details).

396 "git stash".

397 (merge 6694856 jc/commit-tree-ignore-commit-gpgsign later to maint).

398

399 + * "http.cookieFile" configuration variable clearly wants a pathname,

400 + but we forgot to treat it as such by e.g. applying tilde expansion.

401 + (merge e5a39ad bn/http-cookiefile-config later to maint).

402 +

403 + * Consolidate description of tilde-expansion that is done to

404 + configuration variables that take pathname to a single place.

405 + (merge dca83ab jc/config-pathname-type later to maint).

406 +

407 + * Correct faulty recommendation to use "git submodule deinit ." when

408 + de-initialising all submodules, which would result in a strange

409 + error message in a pathological corner case.

410 + (merge f6a5279 sb/submodule-deinit-all later to maint).

411 +

412 + * Many 'linkgit:<git documentation page>' references were broken,

413 + which are all fixed with this.

414 + (merge 1cca17d jc/linkgit-fix later to maint).

415 +

416 + * "git rerere" can get confused by conflict markers deliberately left

417 + by the inner merge step, because they are indistinguishable from

418 + the real conflict markers left by the outermost merge which are

419 + what the end user and "rerere" need to look at. This was fixed by

420 + making the conflict markers left by the inner merges a bit longer.

421 + (merge 0f9fd5c jc/ll-merge-internal later to maint).

422 +

423 + * CI test was taught to build documentation pages.

424 + (merge b98712b ls/travis-build-doc later to maint).

425 +

426 + * "git fsck" learned to catch NUL byte in a commit object as

427 + potential error and warn.

428 + (merge 6d2d780 jc/fsck-nul-in-commit later to maint).

429 +

430 + * Portability enhancement for "rebase -i" to help platforms whose

431 + shell does not like "for i in <empty>" (which is not POSIX-kosher).

432 + (merge 8e98b35 jk/rebase-interative-eval-fix later to maint).

433 +

434 + * On Windows, .git and optionally any files whose name starts with a

435 + dot are now marked as hidden, with a core.hideDotFiles knob to

436 + customize this behaviour.

437 + (merge ebf31e7 js/windows-dotgit later to maint).

438 +

439 + * Documentation for "git merge --verify-signatures" has been updated

440 + to clarify that the signature of only the commit at the tip is

441 + verified. Also the phrasing used for signature and key validity is

442 + adjusted to align with that used by OpenPGP.

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

444

445 * Other minor clean-ups and documentation updates

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

@@ -393,3 +455,13 @@ notes for details).

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).

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

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

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

461 + (merge f212dcc bn/config-doc-tt-varnames later to maint).

462 + (merge f54bea4 nd/remote-plural-ours-plus-theirs later to maint).

463 + (merge 2bb0518 ak/t4151-ls-files-could-be-empty later to maint).

464 + (merge 4df4313 jc/test-seq later to maint).

465 + (merge a75a308 tb/t5601-sed-fix later to maint).

466 + (merge 6c1fbe1 va/i18n-remote-comment-to-align later to maint).

467 + (merge dee2303 va/mailinfo-doc-typofix later to maint).

Thirteenth batch for 2.9