3cb850a566 · matheusbsbs/matheus-bagliano

@@ -1,10 +1,10 @@

1 To: git@vger.kernel.org

2 Bcc: lwn@lwn.net

3 -Subject: What's cooking in git.git (Dec 2017, #03; Wed, 13)

4 -X-master-at: d9a3764af74ac215e06543c263ec21196d672b49

5 -X-next-at: 0bfd9d2efe08df63a501038b70f5b58d44a707da

3 +Subject: What's cooking in git.git (Dec 2017, #04; Tue, 19)

4 +X-master-at: 936d1b989416a95f593bf81ccae8ac62cd83f279

5 +X-next-at: cfbfd45ee6e49007fdeb00008904064ba98f65e0

6

7 -What's cooking in git.git (Dec 2017, #03; Wed, 13)

7 +What's cooking in git.git (Dec 2017, #04; Tue, 19)

8 --------------------------------------------------

9

10 Here are the topics that have been cooking. Commits prefixed with

@@ -20,299 +20,252 @@ of the repositories listed at

20 --------------------------------------------------

21 [Graduated to "master"]

22

23 -* ab/pcre2-grep (2017-11-24) 2 commits

24 - (merged to 'next' on 2017-12-05 at 88f1927207)

25 - + grep: fix segfault under -P + PCRE2 <=10.30 + (*NO_JIT)

26 - + test-lib: add LIBPCRE1 & LIBPCRE2 prerequisites

27 -

28 - "git grep" compiled with libpcre2 sometimes triggered a segfault,

29 - which is being fixed.

30 -

31 -

32 -* bc/hash-algo (2017-11-28) 5 commits

33 - (merged to 'next' on 2017-11-28 at 5c74632345)

34 - + repository: fix a sparse 'using integer as NULL pointer' warning

35 - (merged to 'next' on 2017-11-27 at 98cc9ef2a8)

36 - + Switch empty tree and blob lookups to use hash abstraction

37 - + Integrate hash algorithm support with repo setup

38 - + Add structure representing hash algorithm

39 - + setup: expose enumerated repo info

23 +* ar/unconfuse-three-dots (2017-12-06) 8 commits

24 + (merged to 'next' on 2017-12-13 at 33bd0b67c0)

25 + + t2020: test variations that matter

26 + + t4013: test new output from diff --abbrev --raw

27 + + diff: diff_aligned_abbrev: remove ellipsis after abbreviated SHA-1 value

28 + + t4013: prepare for upcoming "diff --raw --abbrev" output format change

29 + + checkout: describe_detached_head: remove ellipsis after committish

30 + + print_sha1_ellipsis: introduce helper

31 + + Documentation: user-manual: limit usage of ellipsis

32 + + Documentation: revisions: fix typo: "three dot" ---> "three-dot" (in line with "two-dot").

33

41 - An infrastructure to define what hash function is used in Git is

42 - introduced, and an effort to plumb that throughout various

43 - codepaths has been started.

34 + Ancient part of codebase still shows dots after an abbreviated

35 + object name just to show that it is not a full object name, but

36 + these ellipses are confusing to people who newly discovered Git

37 + who are used to seeing abbreviated object names and find them

38 + confusing with the range syntax.

39

40

46 -* ds/for-each-file-in-obj-micro-optim (2017-12-04) 1 commit

47 - (merged to 'next' on 2017-12-05 at 55ba487ccd)

48 - + sha1_file: use strbuf_add() instead of strbuf_addf()

41 +* bw/pathspec-match-submodule-boundary (2017-12-05) 1 commit

42 + (merged to 'next' on 2017-12-13 at e256d292a4)

43 + + pathspec: only match across submodule boundaries when requested

44

50 - The code to iterate over loose object files got optimized.

45 + An v2.12-era regression in pathspec match logic, which made it look

46 + into submodule tree even when it is not desired, has been fixed.

47

48

53 -* en/remove-stripspace (2017-12-05) 1 commit

54 - (merged to 'next' on 2017-12-06 at c926373a49)

55 - + strbuf: remove unused stripspace function alias

49 +* bw/submodule-config-cleanup (2017-12-06) 1 commit

50 + (merged to 'next' on 2017-12-13 at c952bf1b84)

51 + + diff-tree: read the index so attribute checks work in bare repositories

52

57 - An internal function that was left for backward compatibility has

58 - been removed, as there is no remaining callers.

53 + Recent update to the submodule configuration code broke "diff-tree"

54 + by accidentally stopping to read from the index upfront.

55

56

61 -* fk/sendmail-from-path (2017-11-28) 1 commit

62 - (merged to 'next' on 2017-12-05 at deb7a5f4a8)

63 - + git-send-email: honor $PATH for sendmail binary

57 +* en/merge-recursive-icase-removal (2017-11-27) 1 commit

58 + (merged to 'next' on 2017-12-13 at 85c6538a2a)

59 + + merge-recursive: ignore_case shouldn't reject intentional removals

60

65 - "git send-email" tries to see if the sendmail program is available

66 - in /usr/lib and /usr/sbin; extend the list of locations to be

67 - checked to also include directories on $PATH.

61 + The code internal to the recursive merge strategy was not fully

62 + prepared to see a path that is renamed to try overwriting another

63 + path that is only different in case on case insensitive systems.

64 + This does not matter in the current code, but will start to matter

65 + once the rename detection logic starts taking hints from nearby

66 + paths moving to some directory and moves a new path along with them.

67

68

70 -* jc/receive-pack-hook-doc (2017-11-24) 1 commit

71 - (merged to 'next' on 2017-12-05 at ffa14b1d48)

72 - + hooks doc: clarify when receive-pack invokes its hooks

69 +* en/rename-progress (2017-12-02) 5 commits

70 + (merged to 'next' on 2017-12-04 at 49b39d2297)

71 + + diffcore-rename: make diff-tree -l0 mean -l<large>

72 + (merged to 'next' on 2017-11-20 at 77a2e0ddd9)

73 + + sequencer: show rename progress during cherry picks

74 + + diff: remove silent clamp of renameLimit

75 + + progress: fix progress meters when dealing with lots of work

76 + + sequencer: warn when internal merge may be suboptimal due to renameLimit

77

74 - Doc update.

78 + Historically, the diff machinery for rename detection had a

79 + hardcoded limit of 32k paths; this is being lifted to allow users

80 + trade cycles with a (possibly) easier to read result.

81

82

77 -* jk/no-optional-locks (2017-11-27) 1 commit

78 - (merged to 'next' on 2017-12-06 at e642dde605)

79 - + git-status.txt: mention --no-optional-locks

83 +* gk/tracing-optimization (2017-12-06) 2 commits

84 + (merged to 'next' on 2017-12-13 at d6bfac03ad)

85 + + trace: improve performance while category is disabled

86 + + trace: remove trace key normalization

87

81 - Doc update for a feature available in Git v2.14 and upwards.

88 + The tracing infrastructure has been optimized for cases where no

89 + tracing is requested.

90

91

84 -* jk/progress-delay-fix (2017-12-04) 2 commits

85 - (merged to 'next' on 2017-12-05 at 8e62c2b18b)

86 - + progress: drop delay-threshold code

87 - + progress: set default delay threshold to 100%, not 0%

92 +* jt/diff-anchored-patience (2017-11-28) 1 commit

93 + (merged to 'next' on 2017-12-13 at 5f4843d7a0)

94 + + diff: support anchoring line(s)

95

89 - A regression in the progress eye-candy was fixed.

96 + "git diff" learned a variant of the "--patience" algorithm, to

97 + which the user can specify which 'unique' line to be used as

98 + anchoring points.

99

100

92 -* js/hashmap-update-sample (2017-12-05) 1 commit

93 - (merged to 'next' on 2017-12-06 at 40ceee9a18)

94 - + hashmap: adjust documentation to reflect reality

101 +* ls/editor-waiting-message (2017-12-07) 2 commits

102 + (merged to 'next' on 2017-12-13 at 494b5b41e3)

103 + + launch_editor(): indicate that Git waits for user input

104 + + refactor "dumb" terminal determination

105

96 - Code comment update.

106 + Git shows a message to tell the user that it is waiting for the

107 + user to finish editing when spawning an editor, in case the editor

108 + opens to a hidden window or somewhere obscure and the user gets

109 + lost.

110

111

99 -* ks/doc-checkout-previous (2017-11-28) 1 commit

100 - (merged to 'next' on 2017-12-05 at 02f17e3c55)

101 - + Doc/checkout: checking out using @{-N} can lead to detached state

112 +* ls/git-gui-no-double-utf8-author-name (2017-12-05) 2 commits

113 + (merged to 'next' on 2017-12-13 at be577d6e1b)

114 + + Merge branch 'ls/no-double-utf8-author-name' of ../git-gui into ls/git-gui-no-double-utf8-author-name

115 + + git-gui: prevent double UTF-8 conversion

116

103 - @{-N} in "git checkout @{-N}" may refer to a detached HEAD state,

104 - but the documentation was not clear about it, which has been fixed.

117 + Amending commits in git-gui broke the author name that is non-ascii

118 + due to incorrect enconding conversion.

119

120

107 -* pc/submodule-helper (2017-11-26) 1 commit

108 - (merged to 'next' on 2017-12-05 at fdf56787be)

109 - + submodule--helper.c: i18n: add a missing space in message

121 +* sb/clone-recursive-submodule-doc (2017-12-05) 1 commit

122 + (merged to 'next' on 2017-12-13 at abfed699db)

123 + + Documentation/git-clone: improve description for submodule recursing

124

111 - A message fix.

125 + Doc update.

126

127

114 -* ra/decorate-limit-refs (2017-11-22) 1 commit

115 - (merged to 'next' on 2017-12-05 at 02c66aa4e0)

116 - + log: add option to choose which refs to decorate

128 +* sg/setup-doc-update (2017-12-07) 1 commit

129 + (merged to 'next' on 2017-12-13 at 4355c6e0ef)

130 + + setup.c: fix comment about order of .git directory discovery

131

118 - The tagnames "git log --decorate" uses to annotate the commits can

119 - now be limited to subset of available refs with the two additional

120 - options, --decorate-refs[-exclude]=<pattern>.

132 + Comment update.

133

134

123 -* tg/t-readme-updates (2017-11-27) 2 commits

124 - (merged to 'next' on 2017-12-05 at c0b0e2d65b)

125 - + t/README: document test_cmp_rev

126 - + t/README: remove mention of adding copyright notices

135 +* tg/worktree-create-tracking (2017-12-06) 6 commits

136 + (merged to 'next' on 2017-12-13 at 830b68c660)

137 + + add worktree.guessRemote config option

138 + + worktree: add --guess-remote flag to add subcommand

139 + + worktree: make add <path> <branch> dwim

140 + + worktree: add --[no-]track option to the add subcommand

141 + + worktree: add can be created from any commit-ish

142 + + checkout: factor out functions to new lib file

143

128 - Developer doc updates.

144 + The way "git worktree add" determines what branch to create from

145 + where and checkout in the new worktree has been updated a bit.

146

147 --------------------------------------------------

148 [New Topics]

149

133 -* es/worktree-checkout-hook (2017-12-07) 1 commit

134 - - worktree: invoke post-checkout hook (unless --no-checkout)

150 +* ew/svn-crlf (2017-12-14) 2 commits

151 + - Merge branch 'svn-crlf' of git://bogomips.org/git-svn into ew/svn-crlf

152 + - git-svn: convert CRLF to LF in commit message to SVN

153

136 - "git worktree add" learned to run the post-checkout hook, just like

137 - "git checkout" does, after the initial checkout.

154 + "git svn" has been updated to strip CRs in the commit messages, as

155 + recent versions of Subversion rejects them.

156

157 Will merge to 'next'.

158

159

142 -* rs/am-builtin-leakfix (2017-12-07) 1 commit

143 - - am: release strbuf after use in split_mail_mbox()

144 -

145 - Leakfix.

160 +* tz/lib-git-svn-svnserve-tests (2017-12-14) 2 commits

161 + - t/lib-git-svn.sh: improve svnserve tests with parallel make test

162 + - t/lib-git-svn: cleanup inconsistent tab/space usage

163

164 Will merge to 'next'.

165

166

150 -* rs/fmt-merge-msg-string-leak-fix (2017-12-07) 1 commit

151 - - fmt-merge-msg: avoid leaking strbuf in shortlog()

167 +* bp/fsmonitor (2017-12-18) 1 commit

168 + - p7519: improve check for prerequisite WATCHMAN

169

153 - Leakfix.

170 + Test fix.

171

172 Will merge to 'next'.

173

174

158 -* rs/strbuf-read-once-reset-length (2017-12-07) 1 commit

159 - - strbuf: release memory on read error in strbuf_read_once()

175 +* js/enhanced-version-info (2017-12-14) 2 commits

176 + - version --build-options: report commit, too, if possible

177 + - version --build-options: also report host CPU

178

161 - Leakfix.

179 + "git version --build-options" learned to report the host CPU and

180 + the exact commit object name the binary was built from.

181

182 Will merge to 'next'.

183

184

166 -* db/doc-workflows-neuter-the-maintainer (2017-12-08) 1 commit

167 - - doc: reword gitworkflows.txt for neutrality

168 -

169 - Docfix.

170 -

171 - Will merge to 'next'.

172 -

173 -

174 -* es/clone-shared-worktree (2017-12-11) 1 commit

175 - - clone: support 'clone --shared' from a worktree

176 -

177 - "git clone --shared" to borrow from a (secondary) worktree did not

178 - work, even though "git clone --local" did. Both are now accepted.

179 -

180 - Will merge to 'next'.

181 -

182 -

183 -* jh/partial-clone-doc (2017-12-08) 1 commit

184 - - partial-clone: design doc

185 -

186 - Will merge to 'next'.

187 -

188 -

189 -* jk/cvsimport-quoting (2017-12-08) 1 commit

190 - - cvsimport: apply shell-quoting regex globally

191 -

192 - Typo/Logico fix.

193 -

194 - Will merge to 'next'.

195 -

196 -

197 -* jk/test-suite-tracing (2017-12-08) 4 commits

198 - - t/Makefile: introduce TEST_SHELL_PATH

199 - - test-lib: make "-x" work with "--verbose-log"

200 - - t5615: avoid re-using descriptor 4

201 - - test-lib: silence "-x" cleanup under bash

202 -

203 - Assorted fixes around running tests with "-x" tracing option.

204 -

205 -

206 -* jt/decorate-api (2017-12-08) 1 commit

207 - - decorate: clean up and document API

208 -

209 - A few structures and variables that are implementation details of

210 - the decorate API have been renamed and then the API got documented

211 - better.

212 -

213 - Will merge to 'next'.

214 -

215 -

216 -* ks/branch-cleanup (2017-12-07) 4 commits

217 - - builtin/branch: strip refs/heads/ using skip_prefix

218 - - branch: update warning message shown when copying a misnamed branch

219 - - branch: group related arguments of create_branch()

220 - - branch: improve documentation and naming of create_branch() parameters

185 +* jt/transport-hide-vtable (2017-12-14) 2 commits

186 + - transport: make transport vtable more private

187 + - clone, fetch: remove redundant transport check

188 + (this branch uses jt/transport-no-more-rsync.)

189

190 Code clean-up.

191

192 Will merge to 'next'.

193

194

227 -* rs/fmt-merge-msg-leakfix (2017-12-08) 1 commit

228 - - transport-helper: plug strbuf and string_list leaks

195 +* ks/rebase-error-messages (2017-12-19) 3 commits

196 + - rebase: rebasing can also be done when HEAD is detached

197 + - rebase: distinguish user input by quoting it

198 + - rebase: consistently use branch_name variable

199

230 - Leakfix.

200 + Error messages from "git rebase" have been somewhat cleaned up.

201

202 Will merge to 'next'.

203

204

235 -* tb/delimit-pretty-trailers-args-with-comma (2017-12-08) 1 commit

236 - - docs/pretty-formats: mention commas in %(trailers) syntax

205 +* nm/imap-send-quote-server-folder-name (2017-12-18) 1 commit

206 + - imap-send: URI encode server folder

207

238 - Doc updates.

208 + "git imap-send" did not correctly quote the folder name when

209 + making a request to the server, which has been corrected.

210

211 Will merge to 'next'.

212

213

243 -* bw/submodule-sans-cache-compat (2017-12-12) 3 commits

244 - - submodule: convert get_next_submodule to not rely on the_index

245 - - submodule: used correct index in is_staging_gitmodules_ok

246 - - submodule: convert stage_updated_gitmodules to take a struct index_state

247 -

248 - Code clean-up.

249 -

250 - Will merge to 'next'.

214 +* np/send-email-header-parsing (2017-12-15) 1 commit

215 + - send-email: extract email-parsing code into a subroutine

216

217 + Code refactoring.

218

253 -* hi/merge-verify-sig-config (2017-12-12) 2 commits

254 - - t: add tests for pull --verify-signatures

255 - - merge: add config option for verifySignatures

256 -

257 - "git merge" learned to pay attention to merge.verifySignatures

258 - configuration variable and pretend as if '--verify-signatures'

259 - option was given from the command line.

219 + Undecided.

220

261 - Will merge to 'next'.

221

222 +* sr/http-sslverify-config-doc (2017-12-18) 1 commit

223 + - config: document default value of http.sslVerify

224

264 -* ot/pretty (2017-12-12) 2 commits

265 - - format: create docs for pretty.h

266 - - format: create pretty.h file

267 -

268 - Code clean-up.

225 + Docfix.

226

227 Will merge to 'next'.

228

229

273 -* sb/test-helper-excludes (2017-12-12) 1 commit

274 - - t/helper: ignore everything but sources

230 +* jh/memihash-opt (2017-12-19) 1 commit

231 + - t/helper/test-lazy-name-hash: fix compilation

232

276 - Simplify the ignore rules for t/helper directory.

233 + Squelch compiler warning.

234

235 Will merge to 'next'.

236

237

281 -* sg/travis-fixes (2017-12-12) 4 commits

282 - - travis-ci: use 'set -x' in 'ci/*' scripts for extra tracing output

283 - - travis-ci: set GIT_TEST_HTTPD in 'ci/lib-travisci.sh'

284 - - travis-ci: move setting environment variables to 'ci/lib-travisci.sh'

285 - - travis-ci: introduce a $jobname variable for 'ci/*' scripts

238 +* ks/doc-previous-checkout (2017-12-19) 1 commit

239 + - Doc/check-ref-format: clarify information about @{-N} syntax

240

287 - Assorted updates for TravisCI integration.

241 + Doc update.

242

243 Will merge to 'next'.

244

245

292 -* bw/path-doc (2017-12-13) 1 commit

293 - - path: document path functions

246 +* rs/revision-keep-pending (2017-12-19) 1 commit

247 + - revision: introduce prepare_revision_walk_extended()

248

295 - Doc updates.

249 + Code clean-up.

250

251 Will merge to 'next'.

252

253

300 -* jt/transport-no-more-rsync (2017-12-12) 1 commit

301 - - transport: remove unused "push" in vtable

254 +* ws/curl-http-proxy-over-https (2017-12-19) 1 commit

255 + - http: support CURLPROXY_HTTPS

256

303 - Code clean-up.

257 + Git has been taught to support an https:// used for http.proxy when

258 + using recent versions of libcurl.

259

260 Will merge to 'next'.

261

262

308 -* rb/quick-install-doc (2017-12-12) 1 commit

309 - - install-doc-quick: allow specifying what ref to install

310 -

311 - The build procedure now allows not just the repositories but also

312 - the refs to be used to take pre-formatted manpages and html

313 - documents to install.

314 -

315 - Will merge to 'next'.

263 +* av/fsmonitor-updates (2017-12-19) 5 commits

264 + - fsmonitor: Remove debugging lines from t/t7519-status-fsmonitor.sh

265 + - fsmonitor: complete the last line of test-dump-fsmonitor output

266 + - fsmonitor: update helper tool, now that flags are filled later

267 + - fsmonitor: include dir.h for untracked_cache_invalidate_path()

268 + - dir.c: update comments to match argument name

269

270 --------------------------------------------------

271 [Stalled]

@@ -404,62 +357,227 @@ of the repositories listed at

357 --------------------------------------------------

358 [Cooking]

359

407 -* bw/pathspec-match-submodule-boundary (2017-12-05) 1 commit

408 - (merged to 'next' on 2017-12-13 at e256d292a4)

409 - + pathspec: only match across submodule boundaries when requested

360 +* es/worktree-checkout-hook (2017-12-07) 1 commit

361 + (merged to 'next' on 2017-12-14 at 907d958351)

362 + + worktree: invoke post-checkout hook (unless --no-checkout)

363

411 - An v2.12-era regression in pathspec match logic, which made it look

412 - into submodule tree even when it is not desired, has been fixed.

364 + "git worktree add" learned to run the post-checkout hook, just like

365 + "git checkout" does, after the initial checkout.

366

367 Will merge to 'master'.

368

369

417 -* ls/git-gui-no-double-utf8-author-name (2017-12-05) 2 commits

418 - (merged to 'next' on 2017-12-13 at be577d6e1b)

419 - + Merge branch 'ls/no-double-utf8-author-name' of ../git-gui into ls/git-gui-no-double-utf8-author-name

420 - + git-gui: prevent double UTF-8 conversion

370 +* rs/am-builtin-leakfix (2017-12-07) 1 commit

371 + (merged to 'next' on 2017-12-14 at 30bf70d2cb)

372 + + am: release strbuf after use in split_mail_mbox()

373

422 - Amending commits in git-gui broke the author name that is non-ascii

423 - due to incorrect enconding conversion.

374 + Leakfix.

375

376 Will merge to 'master'.

377

378

428 -* sb/clone-recursive-submodule-doc (2017-12-05) 1 commit

429 - (merged to 'next' on 2017-12-13 at abfed699db)

430 - + Documentation/git-clone: improve description for submodule recursing

379 +* rs/fmt-merge-msg-string-leak-fix (2017-12-07) 1 commit

380 + (merged to 'next' on 2017-12-14 at 26fa3fe23e)

381 + + fmt-merge-msg: avoid leaking strbuf in shortlog()

382

432 - Doc update.

383 + Leakfix.

384

385 Will merge to 'master'.

386

387

437 -* ab/sha1dc-build (2017-12-12) 4 commits

438 - - Makefile: use the sha1collisiondetection submodule by default

439 - - sha1dc_git.h: re-arrange an ifdef chain for a subsequent change

440 - - Makefile: under "make dist", include the sha1collisiondetection submodule

441 - - Makefile: don't error out under DC_SHA1_EXTERNAL if DC_SHA1_SUBMODULE=auto

388 +* rs/strbuf-read-once-reset-length (2017-12-07) 1 commit

389 + (merged to 'next' on 2017-12-14 at 6d12e08217)

390 + + strbuf: release memory on read error in strbuf_read_once()

391

392 + Leakfix.

393

444 -* bw/submodule-config-cleanup (2017-12-06) 1 commit

445 - (merged to 'next' on 2017-12-13 at c952bf1b84)

446 - + diff-tree: read the index so attribute checks work in bare repositories

394 + Will merge to 'master'.

395

448 - Recent update to the submodule configuration code broke "diff-tree"

449 - by accidentally stopping to read from the index upfront.

396 +

397 +* db/doc-workflows-neuter-the-maintainer (2017-12-08) 1 commit

398 + (merged to 'next' on 2017-12-14 at 740788d890)

399 + + doc: reword gitworkflows.txt for neutrality

400 +

401 + Docfix.

402

403 Will merge to 'master'.

404

405

454 -* sg/setup-doc-update (2017-12-07) 1 commit

455 - (merged to 'next' on 2017-12-13 at 4355c6e0ef)

456 - + setup.c: fix comment about order of .git directory discovery

406 +* es/clone-shared-worktree (2017-12-11) 1 commit

407 + (merged to 'next' on 2017-12-14 at 248ef92bda)

408 + + clone: support 'clone --shared' from a worktree

409

458 - Comment update.

410 + "git clone --shared" to borrow from a (secondary) worktree did not

411 + work, even though "git clone --local" did. Both are now accepted.

412

413 Will merge to 'master'.

414

415

416 +* jh/partial-clone-doc (2017-12-14) 1 commit

417 + - partial-clone: design doc

418 +

419 + Will merge to 'next'.

420 +

421 +

422 +* jk/cvsimport-quoting (2017-12-08) 1 commit

423 + (merged to 'next' on 2017-12-14 at ea99dc966c)

424 + + cvsimport: apply shell-quoting regex globally

425 +

426 + Typo/Logico fix.

427 +

428 + Will merge to 'master'.

429 +

430 +

431 +* jk/test-suite-tracing (2017-12-08) 4 commits

432 + - t/Makefile: introduce TEST_SHELL_PATH

433 + - test-lib: make "-x" work with "--verbose-log"

434 + - t5615: avoid re-using descriptor 4

435 + - test-lib: silence "-x" cleanup under bash

436 +

437 + Assorted fixes around running tests with "-x" tracing option.

438 +

439 + Will merge to 'next'.

440 +

441 +

442 +* jt/decorate-api (2017-12-08) 1 commit

443 + (merged to 'next' on 2017-12-14 at b14858df40)

444 + + decorate: clean up and document API

445 +

446 + A few structures and variables that are implementation details of

447 + the decorate API have been renamed and then the API got documented

448 + better.

449 +

450 + Will merge to 'master'.

451 +

452 +

453 +* ks/branch-cleanup (2017-12-07) 4 commits

454 + (merged to 'next' on 2017-12-14 at af0a906984)

455 + + builtin/branch: strip refs/heads/ using skip_prefix

456 + + branch: update warning message shown when copying a misnamed branch

457 + + branch: group related arguments of create_branch()

458 + + branch: improve documentation and naming of create_branch() parameters

459 +

460 + Code clean-up.

461 +

462 + Will merge to 'master'.

463 +

464 +

465 +* rs/fmt-merge-msg-leakfix (2017-12-08) 1 commit

466 + (merged to 'next' on 2017-12-14 at b87794d837)

467 + + transport-helper: plug strbuf and string_list leaks

468 +

469 + Leakfix.

470 +

471 + Will merge to 'master'.

472 +

473 +

474 +* tb/delimit-pretty-trailers-args-with-comma (2017-12-08) 1 commit

475 + (merged to 'next' on 2017-12-14 at 7bf4f561ad)

476 + + docs/pretty-formats: mention commas in %(trailers) syntax

477 +

478 + Doc updates.

479 +

480 + Will merge to 'master'.

481 +

482 +

483 +* bw/submodule-sans-cache-compat (2017-12-12) 3 commits

484 + (merged to 'next' on 2017-12-14 at 6893bdeed3)

485 + + submodule: convert get_next_submodule to not rely on the_index

486 + + submodule: used correct index in is_staging_gitmodules_ok

487 + + submodule: convert stage_updated_gitmodules to take a struct index_state

488 +

489 + Code clean-up.

490 +

491 + Will merge to 'master'.

492 +

493 +

494 +* hi/merge-verify-sig-config (2017-12-19) 3 commits

495 + - t5573, t7612: clean up after unexpected success of 'pull' and 'merge'

496 + (merged to 'next' on 2017-12-14 at cdc511dc36)

497 + + t: add tests for pull --verify-signatures

498 + + merge: add config option for verifySignatures

499 +

500 + "git merge" learned to pay attention to merge.verifySignatures

501 + configuration variable and pretend as if '--verify-signatures'

502 + option was given from the command line.

503 +

504 + Will merge to 'next'.

505 +

506 +

507 +* ot/pretty (2017-12-12) 2 commits

508 + (merged to 'next' on 2017-12-14 at d80fe80aed)

509 + + format: create docs for pretty.h

510 + + format: create pretty.h file

511 +

512 + Code clean-up.

513 +

514 + Will merge to 'master'.

515 +

516 +

517 +* sb/test-helper-excludes (2017-12-12) 1 commit

518 + (merged to 'next' on 2017-12-14 at 3bfbc1c65e)

519 + + t/helper: ignore everything but sources

520 +

521 + Simplify the ignore rules for t/helper directory.

522 +

523 + Will merge to 'master'.

524 +

525 +

526 +* sg/travis-fixes (2017-12-12) 4 commits

527 + (merged to 'next' on 2017-12-14 at c33f0c119a)

528 + + travis-ci: use 'set -x' in 'ci/*' scripts for extra tracing output

529 + + travis-ci: set GIT_TEST_HTTPD in 'ci/lib-travisci.sh'

530 + + travis-ci: move setting environment variables to 'ci/lib-travisci.sh'

531 + + travis-ci: introduce a $jobname variable for 'ci/*' scripts

532 +

533 + Assorted updates for TravisCI integration.

534 +

535 + Will merge to 'master'.

536 +

537 +

538 +* bw/path-doc (2017-12-13) 1 commit

539 + (merged to 'next' on 2017-12-19 at 2cddee77ca)

540 + + path: document path functions

541 +

542 + Doc updates.

543 +

544 + Will merge to 'master'.

545 +

546 +

547 +* jt/transport-no-more-rsync (2017-12-12) 1 commit

548 + (merged to 'next' on 2017-12-14 at 456913ad25)

549 + + transport: remove unused "push" in vtable

550 + (this branch is used by jt/transport-hide-vtable.)

551 +

552 + Code clean-up.

553 +

554 + Will merge to 'master'.

555 +

556 +

557 +* rb/quick-install-doc (2017-12-12) 1 commit

558 + (merged to 'next' on 2017-12-14 at 96c17a83fa)

559 + + install-doc-quick: allow specifying what ref to install

560 +

561 + The build procedure now allows not just the repositories but also

562 + the refs to be used to take pre-formatted manpages and html

563 + documents to install.

564 +

565 + Will merge to 'master'.

566 +

567 +

568 +* ab/sha1dc-build (2017-12-12) 4 commits

569 + - Makefile: use the sha1collisiondetection submodule by default

570 + - sha1dc_git.h: re-arrange an ifdef chain for a subsequent change

571 + - Makefile: under "make dist", include the sha1collisiondetection submodule

572 + - Makefile: don't error out under DC_SHA1_EXTERNAL if DC_SHA1_SUBMODULE=auto

573 +

574 + Push the submodule version of collision-detecting SHA-1 hash

575 + implementation a bit harder on builders.

576 +

577 + The earlier two may make sense, but leaning toward rejecting the last step.

578 + cf. <xmqqk1xw6c24.fsf@gitster.mtv.corp.google.com>

579 +

580 +

581 * ab/simplify-perl-makefile (2017-12-11) 1 commit

582 (merged to 'next' on 2017-12-13 at 1b791d2503)

583 + Makefile: replace perl/Makefile.PL with simple make rules

@@ -467,7 +585,8 @@ of the repositories listed at

585 The build procedure for perl/ part has been greatly simplified by

586 weaning ourselves off of MakeMaker.

587

470 - Will merge to 'master'.

588 + Needs fix-up.

589 + cf. <CACBZZX4ZqVm2HnAbKjdZV=95gq4s7b=gycH3x-sd+zJiWEgDfg@mail.gmail.com>

590

591

592 * cc/skip-to-optional-val (2017-12-11) 7 commits

@@ -482,21 +601,24 @@ of the repositories listed at

601 Introduce a helper to simplify code to parse a common pattern that

602 expects either "--key" or "--key=<something>".

603

604 + Will merge to 'next'.

605 +

606

607 * lb/rebase-i-short-command-names (2017-12-05) 9 commits

487 - - t3404: add test case for abbreviated commands

488 - - rebase -i: learn to abbreviate command names

489 - - rebase -i -x: add exec commands via the rebase--helper

490 - - rebase -i: update functions to use a flags parameter

491 - - rebase -i: replace reference to sha1 with oid

492 - - rebase -i: refactor transform_todo_ids

493 - - rebase -i: set commit to null in exec commands

494 - - Documentation: use preferred name for the 'todo list' script

495 - - Documentation: move rebase.* configs to new file

608 + (merged to 'next' on 2017-12-14 at 0637be0782)

609 + + t3404: add test case for abbreviated commands

610 + + rebase -i: learn to abbreviate command names

611 + + rebase -i -x: add exec commands via the rebase--helper

612 + + rebase -i: update functions to use a flags parameter

613 + + rebase -i: replace reference to sha1 with oid

614 + + rebase -i: refactor transform_todo_ids

615 + + rebase -i: set commit to null in exec commands

616 + + Documentation: use preferred name for the 'todo list' script

617 + + Documentation: move rebase.* configs to new file

618

619 Allow a single-letter command name in the "rebase -i" todo list.

620

499 - Will merge to 'next'.

621 + Will merge to 'master'.

622

623

624 * ra/prompt-eread-fix (2017-12-06) 2 commits

@@ -506,30 +628,7 @@ of the repositories listed at

628 Update the shell prompt script (in contrib/) to strip trailing CR

629 from strings read from various "state" files.

630

509 -

510 -* en/merge-recursive-icase-removal (2017-11-27) 1 commit

511 - (merged to 'next' on 2017-12-13 at 85c6538a2a)

512 - + merge-recursive: ignore_case shouldn't reject intentional removals

513 -

514 - The code internal to the recursive merge strategy was not fully

515 - prepared to see a path that is renamed to try overwriting another

516 - path that is only different in case on case insensitive systems.

517 - This does not matter in the current code, but will start to matter

518 - once the rename detection logic starts taking hints from nearby

519 - paths moving to some directory and moves a new path along with them.

520 -

521 - Will merge to 'master'.

522 -

523 -

524 -* gk/tracing-optimization (2017-12-06) 2 commits

525 - (merged to 'next' on 2017-12-13 at d6bfac03ad)

526 - + trace: improve performance while category is disabled

527 - + trace: remove trace key normalization

528 -

529 - The tracing infrastructure has been optimized for cases where no

530 - tracing is requested.

531 -

532 - Will merge to 'master'.

631 + Will merge to 'next'.

632

633

634 * tb/check-crlf-for-safe-crlf (2017-12-08) 2 commits

@@ -541,6 +640,8 @@ of the repositories listed at

640 The "safe crlf" check incorrectly triggered for contents that does

641 not use CRLF as line endings, which has been corrected.

642

643 + Will merge to 'master'.

644 +

645

646 * cc/require-tcl-tk-for-build (2017-11-29) 2 commits

647 - travis-ci: avoid new tcl/tk build requirement

@@ -572,17 +673,6 @@ of the repositories listed at

673 prefer _not_ squashing them myself.

674

675

575 -* jt/diff-anchored-patience (2017-11-28) 1 commit

576 - (merged to 'next' on 2017-12-13 at 5f4843d7a0)

577 - + diff: support anchoring line(s)

578 -

579 - "git diff" learned a variant of the "--patience" algorithm, to

580 - which the user can specify which 'unique' line to be used as

581 - anchoring points.

582 -

583 - Will merge to 'master'.

584 -

585 -

676 * en/rename-directory-detection (2017-12-13) 35 commits

677 - SQUASH???

678 - merge-recursive: ensure we write updates for directory-renamed file

@@ -640,21 +730,6 @@ of the repositories listed at

730 Will merge to 'master'.

731

732

643 -* tg/worktree-create-tracking (2017-12-06) 6 commits

644 - (merged to 'next' on 2017-12-13 at 830b68c660)

645 - + add worktree.guessRemote config option

646 - + worktree: add --guess-remote flag to add subcommand

647 - + worktree: make add <path> <branch> dwim

648 - + worktree: add --[no-]track option to the add subcommand

649 - + worktree: add can be created from any commit-ish

650 - + checkout: factor out functions to new lib file

651 -

652 - The way "git worktree add" determines what branch to create from

653 - where and checkout in the new worktree has been updated a bit.

654 -

655 - Will merge to 'master'.

656 -

657 -

733 * pw/sequencer-in-process-commit (2017-12-13) 10 commits

734 (merged to 'next' on 2017-12-13 at ec4d2b9c84)

735 + sequencer: improve config handling

@@ -676,7 +751,7 @@ of the repositories listed at

751 gives performance boost for a few tens of percents in some sample

752 scenarios.

753

679 - Will cook in 'next'.

754 + Will merge to 'master'.

755

756

757 * dj/runtime-prefix (2017-12-05) 4 commits

@@ -694,55 +769,6 @@ of the repositories listed at

769 ab/simplify-perl-makefile that heavily conflicts with this fares.

770

771

697 -* ls/editor-waiting-message (2017-12-07) 2 commits

698 - (merged to 'next' on 2017-12-13 at 494b5b41e3)

699 - + launch_editor(): indicate that Git waits for user input

700 - + refactor "dumb" terminal determination

701 -

702 - Git shows a message to tell the user that it is waiting for the

703 - user to finish editing when spawning an editor, in case the editor

704 - opens to a hidden window or somewhere obscure and the user gets

705 - lost.

706 -

707 - Will merge to 'master'.

708 -

709 -

710 -* en/rename-progress (2017-12-02) 5 commits

711 - (merged to 'next' on 2017-12-04 at 49b39d2297)

712 - + diffcore-rename: make diff-tree -l0 mean -l<large>

713 - (merged to 'next' on 2017-11-20 at 77a2e0ddd9)

714 - + sequencer: show rename progress during cherry picks

715 - + diff: remove silent clamp of renameLimit

716 - + progress: fix progress meters when dealing with lots of work

717 - + sequencer: warn when internal merge may be suboptimal due to renameLimit

718 -

719 - Historically, the diff machinery for rename detection had a

720 - hardcoded limit of 32k paths; this is being lifted to allow users

721 - trade cycles with a (possibly) easier to read result.

722 -

723 - Will merge to 'master'.

724 -

725 -

726 -* ar/unconfuse-three-dots (2017-12-06) 8 commits

727 - (merged to 'next' on 2017-12-13 at 33bd0b67c0)

728 - + t2020: test variations that matter

729 - + t4013: test new output from diff --abbrev --raw

730 - + diff: diff_aligned_abbrev: remove ellipsis after abbreviated SHA-1 value

731 - + t4013: prepare for upcoming "diff --raw --abbrev" output format change

732 - + checkout: describe_detached_head: remove ellipsis after committish

733 - + print_sha1_ellipsis: introduce helper

734 - + Documentation: user-manual: limit usage of ellipsis

735 - + Documentation: revisions: fix typo: "three dot" ---> "three-dot" (in line with "two-dot").

736 -

737 - Ancient part of codebase still shows dots after an abbreviated

738 - object name just to show that it is not a full object name, but

739 - these ellipses are confusing to people who newly discovered Git

740 - who are used to seeing abbreviated object names and find them

741 - confusing with the range syntax.

742 -

743 - Will merge to 'master'.

744 -

745 -

772 * jh/object-filtering (2017-12-05) 9 commits

773 (merged to 'next' on 2017-12-05 at 3a56b51085)

774 + rev-list: support --no-filter argument

@@ -761,6 +787,8 @@ of the repositories listed at

787 walking machinery has been taught a way to tell it to "filter" some

788 objects from enumeration.

789

790 + Will merge to 'master'.

791 +

792

793 * jh/fsck-promisors (2017-12-08) 10 commits

794 - gc: do not repack promisor packfiles

@@ -806,8 +834,7 @@ of the repositories listed at

834 introduced by the jh/fsck-promisors topic.

835

836

809 -* sb/describe-blob (2017-12-08) 8 commits

810 - - SQUASH???

837 +* sb/describe-blob (2017-12-19) 7 commits

838 - builtin/describe.c: describe a blob

839 - builtin/describe.c: factor out describe_commit

840 - builtin/describe.c: print debug statements earlier

@@ -819,6 +846,8 @@ of the repositories listed at

846 "git describe" was taught to dig trees deeper to find a

847 <commit-ish>:<path> that refers to a given blob object.

848

849 + Will merge to 'next'.

850 +

851

852 * pb/bisect-helper-2 (2017-10-28) 8 commits

853 - t6030: make various test to pass GETTEXT_POISON tests

What's cooking (2017/12 #04)