525677102b · 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 (Jun 2017, #07; Sat, 24)

4 -X-master-at: e629a7d28a405e48fae6b064a781a10e885159fc

5 -X-next-at: dfeb3b8721fab9939e46c1aea15c813423fe1de3

3 +Subject: What's cooking in git.git (Jun 2017, #08; Wed, 28)

4 +X-master-at: e0aaa1b6532cfce93d87af9bc813fb2e7a7ce9d7

5 +X-next-at: 1cf373c61ae85f2e2e7e489e31d4b7eebf850f1f

6

7 -What's cooking in git.git (Jun 2017, #07; Sat, 24)

7 +What's cooking in git.git (Jun 2017, #08; Wed, 28)

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

9

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

@@ -12,9 +12,6 @@ Here are the topics that have been cooking. Commits prefixed with

12 '+' are in 'next'. The ones marked with '.' do not appear in any of

13 the integration branches, but I am still holding onto them.

14

15 -A new maintenance release v2.13.2 has been tagged with various fixes

16 -that have been already in the 'master' branch.

17 -

15 You can find the changes described here in the integration branches

16 of the repositories listed at

17

@@ -23,208 +20,137 @@ of the repositories listed at

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

21 [Graduated to "master"]

22

26 -* ab/free-and-null (2017-06-16) 6 commits

27 - (merged to 'next' on 2017-06-21 at a1825fabd8)

28 - + *.[ch] refactoring: make use of the FREE_AND_NULL() macro

29 - + coccinelle: make use of the "expression" FREE_AND_NULL() rule

30 - + coccinelle: add a rule to make "expression" code use FREE_AND_NULL()

31 - + coccinelle: make use of the "type" FREE_AND_NULL() rule

32 - + coccinelle: add a rule to make "type" code use FREE_AND_NULL()

33 - + git-compat-util: add a FREE_AND_NULL() wrapper around free(ptr); ptr = NULL

34 -

35 - A common pattern to free a piece of memory and assign NULL to the

36 - pointer that used to point at it has been replaced with a new

37 - FREE_AND_NULL() macro.

38 -

39 -

40 -* ab/pcre-v2 (2017-06-21) 1 commit

41 - (merged to 'next' on 2017-06-21 at fb6320213c)

42 - + grep: fix erroneously copy/pasted variable in check/assert pattern

23 +* dt/raise-core-packed-git-limit (2017-06-21) 1 commit

24 + (merged to 'next' on 2017-06-22 at bc1a90f077)

25 + + docs: update 64-bit core.packedGitLimit default

26

44 - Hotfix for a topic already in 'master'.

27 + Doc update for a topic already in 'master'.

28

29

47 -* ab/wildmatch-glob-slash-test (2017-06-15) 1 commit

48 - (merged to 'next' on 2017-06-21 at 8f4a056f5f)

49 - + wildmatch test: cover a blind spot in "/" matching

30 +* jk/add-p-commentchar-fix (2017-06-21) 2 commits

31 + (merged to 'next' on 2017-06-22 at 5a1d464e6d)

32 + + add--interactive: quote commentChar regex

33 + + add--interactive: handle EOF in prompt_yesno

34

51 - A new test to show the interaction between the pattern [^a-z]

52 - (which matches '/') and a slash in a path has been added. The

53 - pattern should not match the slash with "pathmatch", but should

54 - with "wildmatch".

35 + "git add -p" were updated in 2.12 timeframe to cope with custom

36 + core.commentchar but the implementation was buggy and a

37 + metacharacter like $ and * did not work.

38

39

57 -* ah/doc-gitattributes-empty-index (2017-06-15) 1 commit

58 - (merged to 'next' on 2017-06-21 at f1dc92557b)

59 - + doc: do not use `rm .git/index` when normalizing line endings

40 +* ks/t7508-indent-fix (2017-06-21) 1 commit

41 + (merged to 'next' on 2017-06-22 at d12526967b)

42 + + t7508: fix a broken indentation

43

61 - An example in documentation that does not work in multi worktree

62 - configuration has been corrected.

44 + Cosmetic update to a test.

45

46

65 -* bw/config-h (2017-06-15) 6 commits

66 - (merged to 'next' on 2017-06-21 at 15c5f34034)

67 - + config: don't implicitly use gitdir or commondir

68 - + config: respect commondir

69 - + setup: teach discover_git_directory to respect the commondir

70 - + config: don't include config.h by default

71 - + config: remove git_config_iter

72 - + config: create config.h

73 - (this branch is used by bw/repo-object; uses js/alias-early-config.)

47 +* lb/status-stash-count (2017-06-18) 3 commits

48 + (merged to 'next' on 2017-06-22 at 86bc2f2213)

49 + + glossary: define 'stash entry'

50 + + status: add optional stash count information

51 + + stash: update documentation to use 'stash entry'

52

75 - Fix configuration codepath to pay proper attention to commondir

76 - that is used in multi-worktree situation, and isolate config API

77 - into its own header file.

53 + "git status" learned to optionally give how many stash entries the

54 + user has in its output.

55

56

80 -* bw/ls-files-sans-the-index (2017-06-13) 17 commits

81 - (merged to 'next' on 2017-06-21 at 39ce64f6c7)

82 - + ls-files: factor out tag calculation

83 - + ls-files: factor out debug info into a function

84 - + ls-files: convert show_files to take an index

85 - + ls-files: convert show_ce_entry to take an index

86 - + ls-files: convert prune_cache to take an index

87 - + ls-files: convert ce_excluded to take an index

88 - + ls-files: convert show_ru_info to take an index

89 - + ls-files: convert show_other_files to take an index

90 - + ls-files: convert show_killed_files to take an index

91 - + ls-files: convert write_eolinfo to take an index

92 - + ls-files: convert overlay_tree_on_cache to take an index

93 - + tree: convert read_tree to take an index parameter

94 - + convert: convert renormalize_buffer to take an index

95 - + convert: convert convert_to_git to take an index

96 - + convert: convert convert_to_git_filter_fd to take an index

97 - + convert: convert crlf_to_git to take an index

98 - + convert: convert get_cached_convert_stats_ascii to take an index

99 - (this branch is used by bw/repo-object.)

57 +* mb/reword-autocomplete-message (2017-06-21) 1 commit

58 + (merged to 'next' on 2017-06-22 at 878888a743)

59 + + auto-correct: tweak phrasing

60

101 - Code clean-up.

61 + Message update.

62

63

104 -* da/mergetools-meld-output-opt-on-macos (2017-06-18) 1 commit

105 - (merged to 'next' on 2017-06-21 at de00cce3c0)

106 - + mergetools/meld: improve compatibiilty with Meld on macOS X

64 +* mh/packed-ref-store-prep (2017-06-18) 2 commits

65 + (merged to 'next' on 2017-06-22 at 3f7a4da1e8)

66 + + for_each_bisect_ref(): don't trim refnames

67 + + lock_packed_refs(): fix cache validity check

68 + (this branch is used by mh/packed-ref-store and mh/packed-ref-store-prep-extra.)

69

108 - "git mergetool" learned to work around a wrapper MacOS X adds

109 - around underlying meld.

70 + Bugfix for a topic that is (only) in 'master'.

71

72 +--------------------------------------------------

73 +[New Topics]

74

112 -* jk/diff-highlight-module (2017-06-15) 1 commit

113 - (merged to 'next' on 2017-06-21 at e418062ad2)

114 - + diff-highlight: split code into module

75 +* ab/strbuf-addftime-tzname-boolify (2017-06-24) 3 commits

76 + - REWORD ONLY SQUASH

77 + - strbuf: change an always NULL/"" strbuf_addftime() param to bool

78 + - strbuf.h comment: discuss strbuf_addftime() arguments in order

79

116 - The 'diff-highlight' program (in contrib/) has been restructured

117 - for easier reuse by an external project 'diff-so-fancy'.

80 + strbuf_addftime() is further getting tweaked.

81

82 + Waiting for a response.

83 + cf. <xmqqk2419rhg.fsf@gitster.mtv.corp.google.com>

84

120 -* jk/warn-add-gitlink (2017-06-15) 2 commits

121 - (merged to 'next' on 2017-06-21 at 7210ddbb2e)

122 - + t: move "git add submodule" into test blocks

123 - + add: warn when adding an embedded repository

85

125 - Using "git add d/i/r" when d/i/r is the top of the working tree of

126 - a separate repository would create a gitlink in the index, which

127 - would appear as a not-quite-initialized submodule to others. We

128 - learned to give warnings when this happens.

86 +* jc/pack-bitmap-unaligned (2017-06-26) 1 commit

87 + (merged to 'next' on 2017-06-28 at ad026b12a3)

88 + + pack-bitmap: don't perform unaligned memory access

89

90 + An unaligned 32-bit access in pack-bitmap code ahs been corrected.

91

131 -* js/alias-early-config (2017-06-15) 6 commits

132 - (merged to 'next' on 2017-06-21 at ca4995aac2)

133 - + alias: use the early config machinery to expand aliases

134 - + t7006: demonstrate a problem with aliases in subdirectories

135 - + t1308: relax the test verifying that empty alias values are disallowed

136 - + help: use early config when autocorrecting aliases

137 - + config: report correct line number upon error

138 - + discover_git_directory(): avoid setting invalid git_dir

139 - (this branch is used by bw/config-h and bw/repo-object.)

92 + Will merge to 'master'.

93

141 - The code to pick up and execute command alias definition from the

142 - configuration used to switch to the top of the working tree and

143 - then come back when the expanded alias was executed, which was

144 - unnecessarilyl complex. Attempt to simplify the logic by using the

145 - early-config mechanism that does not chdir around.

94

95 +* mt/p4-parse-G-output (2017-06-27) 1 commit

96 + . git-p4: parse marshal output "p4 -G" in p4 changes

97

148 -* rs/pretty-add-again (2017-06-15) 1 commit

149 - (merged to 'next' on 2017-06-21 at 5128ad3632)

150 - + pretty: recalculate duplicate short hashes

98 + Use "p4 -G" to make "p4 changes" output more Python-friendly

99 + to parse.

100

152 - The pretty-format specifiers like '%h', '%t', etc. had an

153 - optimization that no longer works correctly. In preparation/hope

154 - of getting it correctly implemented, first discard the optimization

155 - that is broken.

101 + Needs review/ack from git-p4 folks.

102

103

158 -* sg/doc-pretty-formats (2017-06-15) 1 commit

159 - (merged to 'next' on 2017-06-21 at 011df65cf5)

160 - + docs/pretty-formats: stress that %- removes all preceding line-feeds

161 -

162 - Doc update.

104 +* rs/apply-validate-input (2017-06-27) 3 commits

105 + (merged to 'next' on 2017-06-28 at 81e006b50e)

106 + + apply: check git diffs for mutually exclusive header lines

107 + + apply: check git diffs for invalid file modes

108 + + apply: check git diffs for missing old filenames

109

110 + Tighten error checks for invalid "git apply" input.

111

165 -* sn/reset-doc-typofix (2017-06-15) 1 commit

166 - (merged to 'next' on 2017-06-21 at 3e629ac2cb)

167 - + doc: git-reset: fix a trivial typo

112 + Will merge to 'master'.

113

169 - Doc update.

114

171 ---------------------------------------------------

172 -[New Topics]

115 +* vs/typofixes (2017-06-27) 1 commit

116 + (merged to 'next' on 2017-06-28 at 3d11e0b3fa)

117 + + Spelling fixes

118

174 -* ab/wildmatch (2017-06-23) 4 commits

175 - - SQUASH???

176 - - wildmatch: make use of the interface for precompiling wildmatch() patterns

177 - - wildmatch: add interface for precompiling wildmatch() patterns

178 - - wildmatch: remove unused wildopts parameter

119 + Many typofixes.

120

180 - Prepare the wildmatch API for future enhancements to allow a

181 - pattern that is repeatedly matched against many strings to be

182 - precompiled.

121 + Will merge to 'master'.

122

123

185 -* ah/doc-pretty-color-auto-prefix (2017-06-24) 1 commit

186 - - doc: clarify syntax for %C(auto,...) in pretty formats

124 +* aw/contrib-subtree-doc-asciidoctor (2017-06-27) 1 commit

125 + - subtree: honour USE_ASCIIDOCTOR when set

126

188 - Doc update.

127 + The Makefile rule in contrib/subtree for building documentation

128 + learned to honour USE_ASCIIDOCTOR just like the main documentation

129 + set does.

130

131 Will merge to 'next'.

132

133

193 -* cc/shared-index-permfix (2017-06-23) 3 commits

194 - - t1700: make sure split-index respects core.sharedrepository

195 - - t1301: move modebits() to test-lib-functions.sh

196 - - read-cache: use shared perms when writing shared index

134 +* js/fsck-name-object (2017-06-28) 1 commit

135 + - t1450: use egrep for regexp "alternation"

136

198 - The split index code did not honor core.sharedrepository setting

199 - correctly.

137 + Test fix.

138

201 - Expecting a reroll.

202 - cf. <xmqqwp82bb39.fsf@gitster.mtv.corp.google.com>

203 - The test looked flakey.

139 + Will merge to 'next'.

140

141

206 -* ex/deprecate-empty-pathspec-as-match-all (2017-06-23) 2 commits

207 - - pathspec: die on empty strings as pathspec

208 - - t0027: do not use an empty string as a pathspec element

142 +* jc/utf8-fprintf (2017-06-28) 1 commit

143 + - submodule--helper: do not call utf8_fprintf() unnecessarily

144

210 - The final step to make an empty string as a pathspec element

211 - illegal. We started this by first deprecating and warning a

212 - pathspec that has such an element in 2.11 (Nov 2016).

145 + Code cleanup.

146

214 - Hopefully we can merge this down to the 'master' by the end of the

215 - year? A deprecation warning period that is about 1 year does not

216 - sound too bad.

147 + Will merge to 'next'.

148

218 - Will merge to 'next.

149

150 +* rs/free-and-null (2017-06-28) 1 commit

151 + - coccinelle: polish FREE_AND_NULL rules

152

221 -* sb/pull-rebase-submodule (2017-06-23) 3 commits

222 - - pull: optionally rebase submodules (remote submodule changes only)

223 - - builtin/fetch: parse recurse-submodules-default at default options parsing

224 - - builtin/fetch: factor submodule recurse parsing out to submodule config

225 -

226 - "git pull --rebase --recurse-submodules" learns to rebase the

227 - branch in the submodules to an updated base.

153 + Code cleanup.

154

155 --------------------------------------------------

156 [Stalled]

@@ -254,87 +180,155 @@ of the repositories listed at

180 cf. <20170421145916.mknekgqzhxffu7di@sigill.intra.peff.net>

181 cf. <d0e81b1e-5869-299e-f462-4d43dc997bd1@ramsayjones.plus.com>

182

183 +

184 +* xz/send-email-batch-size (2017-05-23) 1 commit

185 + - send-email: --batch-size to work around some SMTP server limit

186 +

187 + "git send-email" learned to overcome some SMTP server limitation

188 + that does not allow many pieces of e-mails to be sent over a single

189 + session.

190 +

191 + Waiting for a response.

192 + cf. <CACBZZX5GYV50rjg9X602JHqFPaoofH9TwDf_-r_MDu8-rmNV6Q@mail.gmail.com>

193 + cf. <xmqqo9tfff2w.fsf@gitster.mtv.corp.google.com>

194 +

195 + """I thought your wish (which I found reasonable) was to record

196 + whatever information that would help us in the future in the log

197 + message? I was waiting for that to happen."""

198 +

199 +

200 +* sg/clone-refspec-from-command-line-config (2017-06-16) 2 commits

201 + - Documentation/clone: document ignored configuration variables

202 + - clone: respect additional configured fetch refspecs during initial fetch

203 + (this branch is used by sg/remote-no-string-refspecs.)

204 +

205 + "git clone -c var=val" is a way to set configuration variables in

206 + the resulting repository, but it is more useful to also make these

207 + variables take effect while the initial clone is happening,

208 + e.g. these configuration variables could be fetch refspecs.

209 +

210 + Waiting for a response.

211 + cf. <20170617112228.vugswym4o4owf6wj@sigill.intra.peff.net>

212 + cf. <xmqqmv8zhdap.fsf@gitster.mtv.corp.google.com>

213 +

214 +

215 +* js/rebase-i-final (2017-06-15) 10 commits

216 + - rebase -i: rearrange fixup/squash lines using the rebase--helper

217 + - t3415: test fixup with wrapped oneline

218 + - rebase -i: skip unnecessary picks using the rebase--helper

219 + - rebase -i: check for missing commits in the rebase--helper

220 + - t3404: relax rebase.missingCommitsCheck tests

221 + - rebase -i: also expand/collapse the SHA-1s via the rebase--helper

222 + - rebase -i: do not invent onelines when expanding/collapsing SHA-1s

223 + - rebase -i: remove useless indentation

224 + - rebase -i: generate the script via rebase--helper

225 + - t3415: verify that an empty instructionFormat is handled as before

226 +

227 + The final batch to "git rebase -i" updates to move more code from

228 + the shell script to C.

229 +

230 + Expecting a reroll.

231 + This is at its v5.

232 + cf. <cover.1497444257.git.johannes.schindelin@gmx.de>

233 +

234 --------------------------------------------------

235 [Cooking]

236

260 -* ab/die-errors-in-threaded (2017-06-21) 1 commit

261 - (merged to 'next' on 2017-06-24 at 135fc4b963)

262 - + die(): stop hiding errors due to overzealous recursion guard

263 -

264 - Traditionally, the default die() routine had a code to prevent it

265 - from getting called multiple times, which interacted badly when a

266 - threaded program used it (one downside is that the real error may

267 - be hidden and instead the only error message given to the user may

268 - end up being "die recursion detected", which is not very useful).

237 +* ab/wildmatch (2017-06-23) 1 commit

238 + - wildmatch: remove unused wildopts parameter

239

270 - Will merge to 'master'.

240 + Prepare the wildmatch API for future enhancements to allow a

241 + pattern that is repeatedly matched against many strings to be

242 + precompiled.

243

244

273 -* bw/repo-object (2017-06-23) 21 commits

274 - - ls-files: use repository object

275 - - repository: enable initialization of submodules

276 - - submodule: convert is_submodule_initialized to work on a repository

277 - - submodule: add repo_read_gitmodules

278 - - submodule-config: store the_submodule_cache in the_repository

279 - - repository: add index_state to struct repo

280 - - config: read config from a repository object

281 - - path: add repo_worktree_path and strbuf_repo_worktree_path

282 - - path: add repo_git_path and strbuf_repo_git_path

283 - - path: worktree_git_path() should not use file relocation

284 - - path: convert do_git_path to take a 'struct repository'

285 - - path: convert strbuf_git_common_path to take a 'struct repository'

286 - - path: always pass in commondir to update_common_dir

287 - - path: create path.h

288 - - environment: store worktree in the_repository

289 - - environment: place key repository state in the_repository

290 - - repository: introduce the repository object

291 - - environment: remove namespace_len variable

292 - - setup: add comment indicating a hack

293 - - setup: don't perform lazy initialization of repository state

294 - - Merge branches 'bw/ls-files-sans-the-index' and 'bw/config-h' into bw/repo-object

245 +* ah/doc-pretty-color-auto-prefix (2017-06-24) 1 commit

246 + (merged to 'next' on 2017-06-26 at d7489fc831)

247 + + doc: clarify syntax for %C(auto,...) in pretty formats

248

296 - Introduce a "repository" object to eventually make it easier to

297 - work in multiple repositories (the primary focus is to work with

298 - the superproject and its submodules) in a single process.

249 + Doc update.

250

300 - Will merge to 'next'.

251 + Will merge to 'master'.

252

253

303 -* dt/raise-core-packed-git-limit (2017-06-21) 1 commit

304 - (merged to 'next' on 2017-06-22 at bc1a90f077)

305 - + docs: update 64-bit core.packedGitLimit default

254 +* cc/shared-index-permfix (2017-06-25) 3 commits

255 + (merged to 'next' on 2017-06-26 at bb41584bf0)

256 + + t1700: make sure split-index respects core.sharedrepository

257 + + t1301: move modebits() to test-lib-functions.sh

258 + + read-cache: use shared perms when writing shared index

259

307 - Doc update for a topic already in 'master'.

260 + The split index code did not honor core.sharedrepository setting

261 + correctly.

262

263 Will merge to 'master'.

264

265

312 -* jk/add-p-commentchar-fix (2017-06-21) 2 commits

313 - (merged to 'next' on 2017-06-22 at 5a1d464e6d)

314 - + add--interactive: quote commentChar regex

315 - + add--interactive: handle EOF in prompt_yesno

266 +* ex/deprecate-empty-pathspec-as-match-all (2017-06-23) 2 commits

267 + (merged to 'next' on 2017-06-26 at d026281517)

268 + + pathspec: die on empty strings as pathspec

269 + + t0027: do not use an empty string as a pathspec element

270

317 - "git add -p" were updated in 2.12 timeframe to cope with custom

318 - core.commentchar but the implementation was buggy and a

319 - metacharacter like $ and * did not work.

271 + The final step to make an empty string as a pathspec element

272 + illegal. We started this by first deprecating and warning a

273 + pathspec that has such an element in 2.11 (Nov 2016).

274 +

275 + Hopefully we can merge this down to the 'master' by the end of the

276 + year? A deprecation warning period that is about 1 year does not

277 + sound too bad.

278

279 Will merge to 'master'.

280

281

324 -* ks/t7508-indent-fix (2017-06-21) 1 commit

325 - (merged to 'next' on 2017-06-22 at d12526967b)

326 - + t7508: fix a broken indentation

282 +* sb/pull-rebase-submodule (2017-06-27) 4 commits

283 + - builtin/fetch cleanup: always set default value for submodule recursing

284 + - pull: optionally rebase submodules (remote submodule changes only)

285 + - builtin/fetch: parse recurse-submodules-default at default options parsing

286 + - builtin/fetch: factor submodule recurse parsing out to submodule config

287 +

288 + "git pull --rebase --recurse-submodules" learns to rebase the

289 + branch in the submodules to an updated base.

290

328 - Cosmetic update to a test.

291 +

292 +* ab/die-errors-in-threaded (2017-06-21) 1 commit

293 + (merged to 'next' on 2017-06-24 at 135fc4b963)

294 + + die(): stop hiding errors due to overzealous recursion guard

295 +

296 + Traditionally, the default die() routine had a code to prevent it

297 + from getting called multiple times, which interacted badly when a

298 + threaded program used it (one downside is that the real error may

299 + be hidden and instead the only error message given to the user may

300 + end up being "die recursion detected", which is not very useful).

301

302 Will merge to 'master'.

303

304

333 -* mb/reword-autocomplete-message (2017-06-21) 1 commit

334 - (merged to 'next' on 2017-06-22 at 878888a743)

335 - + auto-correct: tweak phrasing

305 +* bw/repo-object (2017-06-23) 21 commits

306 + (merged to 'next' on 2017-06-26 at ed9c0b77c3)

307 + + ls-files: use repository object

308 + + repository: enable initialization of submodules

309 + + submodule: convert is_submodule_initialized to work on a repository

310 + + submodule: add repo_read_gitmodules

311 + + submodule-config: store the_submodule_cache in the_repository

312 + + repository: add index_state to struct repo

313 + + config: read config from a repository object

314 + + path: add repo_worktree_path and strbuf_repo_worktree_path

315 + + path: add repo_git_path and strbuf_repo_git_path

316 + + path: worktree_git_path() should not use file relocation

317 + + path: convert do_git_path to take a 'struct repository'

318 + + path: convert strbuf_git_common_path to take a 'struct repository'

319 + + path: always pass in commondir to update_common_dir

320 + + path: create path.h

321 + + environment: store worktree in the_repository

322 + + environment: place key repository state in the_repository

323 + + repository: introduce the repository object

324 + + environment: remove namespace_len variable

325 + + setup: add comment indicating a hack

326 + + setup: don't perform lazy initialization of repository state

327 + + Merge branches 'bw/ls-files-sans-the-index' and 'bw/config-h' into bw/repo-object

328

337 - Message update.

329 + Introduce a "repository" object to eventually make it easier to

330 + work in multiple repositories (the primary focus is to work with

331 + the superproject and its submodules) in a single process.

332

333 Will merge to 'master'.

334

@@ -363,32 +357,33 @@ of the repositories listed at

357

358

359 * rs/sha1-name-readdir-optim (2017-06-24) 4 commits

366 - - sha1_file: guard against invalid loose subdirectory numbers

367 - - sha1_file: let for_each_file_in_obj_subdir() handle subdir names

368 - - p4205: add perf test script for pretty log formats

369 - - sha1_name: cache readdir(3) results in find_short_object_filename()

360 + (merged to 'next' on 2017-06-26 at a70587f2b9)

361 + + sha1_file: guard against invalid loose subdirectory numbers

362 + + sha1_file: let for_each_file_in_obj_subdir() handle subdir names

363 + + p4205: add perf test script for pretty log formats

364 + + sha1_name: cache readdir(3) results in find_short_object_filename()

365

366 Optimize "what are the object names already taken in an alternate

367 object database?" query that is used to derive the length of prefix

368 an object name is uniquely abbreviated to.

369

375 - Will merge to 'next'.

370 + Will merge to 'master'.

371

372

378 -* jt/unify-object-info (2017-06-21) 8 commits

379 - - sha1_file: refactor has_sha1_file_with_flags

380 - - sha1_file: do not access pack if unneeded

381 - - sha1_file: improve sha1_object_info_extended

382 - - sha1_file: refactor read_object

383 - - sha1_file: move delta base cache code up

384 - - sha1_file: rename LOOKUP_REPLACE_OBJECT

385 - - sha1_file: rename LOOKUP_UNKNOWN_OBJECT

386 - - sha1_file: teach packed_object_info about typename

373 +* jt/unify-object-info (2017-06-26) 8 commits

374 + (merged to 'next' on 2017-06-26 at 540ea81983)

375 + + sha1_file: refactor has_sha1_file_with_flags

376 + + sha1_file: do not access pack if unneeded

377 + + sha1_file: teach sha1_object_info_extended more flags

378 + + sha1_file: refactor read_object

379 + + sha1_file: move delta base cache code up

380 + + sha1_file: rename LOOKUP_REPLACE_OBJECT

381 + + sha1_file: rename LOOKUP_UNKNOWN_OBJECT

382 + + sha1_file: teach packed_object_info about typename

383

384 Code clean-ups.

385

390 - Looked sensible to me. Any further comments?

391 - cf. <20170624124522.p2dnwdah75e4ngya@sigill.intra.peff.net>

386 + Will merge to 'master'.

387

388

389 * ks/status-initial-commit (2017-06-21) 1 commit

@@ -405,18 +400,6 @@ of the repositories listed at

400 Will merge to 'master'.

401

402

408 -* lb/status-stash-count (2017-06-18) 3 commits

409 - (merged to 'next' on 2017-06-22 at 86bc2f2213)

410 - + glossary: define 'stash entry'

411 - + status: add optional stash count information

412 - + stash: update documentation to use 'stash entry'

413 -

414 - "git status" learned to optionally give how many stash entries the

415 - user has in its output.

416 -

417 - Will merge to 'master'.

418 -

419 -

403 * mh/packed-ref-store (2017-06-23) 29 commits

404 - read_packed_refs(): die if `packed-refs` contains bogus data

405 - repack_without_refs(): don't lock or unlock the packed refs

@@ -447,20 +430,10 @@ of the repositories listed at

430 - packed_ref_store: new struct

431 - add_packed_ref(): teach function to overwrite existing refs

432 - t1408: add a test of stale packed refs covered by loose refs

450 - (this branch uses mh/packed-ref-store-prep; is tangled with mh/packed-ref-store-prep-extra.)

433

434 The "ref-store" code reorganization continues.

435

454 -

455 -* mh/packed-ref-store-prep (2017-06-18) 2 commits

456 - (merged to 'next' on 2017-06-22 at 3f7a4da1e8)

457 - + for_each_bisect_ref(): don't trim refnames

458 - + lock_packed_refs(): fix cache validity check

459 - (this branch is used by mh/packed-ref-store and mh/packed-ref-store-prep-extra.)

460 -

461 - Bugfix for a topic that is (only) in 'master'.

462 -

463 - Will merge to 'master'.

436 + Is this now ready for 'next'?

437

438

439 * sb/submodule-doc (2017-06-22) 1 commit

@@ -479,14 +452,16 @@ of the repositories listed at

452 "git branch" learned "-c/-C" to create and switch to a new branch

453 by copying an existing one.

454

482 - Has a bit of interaction with two other topics, so perhaps needs to

483 - wait for them to stabilize a bit more.

455 + Has a bit of interaction with mh/packed-ref-store and bw/config-h,

456 + so perhaps needs to wait for the former to stabilize a bit more

457 + and possibly rebasing on them.

458

459

486 -* ls/filter-process-delayed (2017-06-01) 5 commits

460 +* ls/filter-process-delayed (2017-06-27) 6 commits

461 - convert: add "status=delayed" to filter process protocol

462 - convert: move multiple file filter error handling to separate function

489 - - t0021: write "OUT" only on success

463 + - convert: put the flags field before the flag itself for consistent style

464 + - t0021: write "OUT <size>" only on success

465 - t0021: make debug log file name configurable

466 - t0021: keep filter log files on comparison

467

@@ -495,6 +470,7 @@ of the repositories listed at

470

471 Getting reviewed.

472 cf. <20170624142301.c5jl7xxf4ici3cug@sigill.intra.peff.net>

473 + cf. <xmqqzicu4lnq.fsf@gitster.mtv.corp.google.com>

474

475

476 * pw/rebase-i-regression-fix-tests (2017-06-23) 5 commits

@@ -512,22 +488,16 @@ of the repositories listed at

488 Will merge to 'master'.

489

490

515 -* ab/sha1dc (2017-06-07) 2 commits

491 +* ab/sha1dc (2017-06-27) 3 commits

492 - sha1collisiondetection: automatically enable when submodule is populated

493 - sha1dc: optionally use sha1collisiondetection as a submodule

494 + - sha1dc: correct endian detection for Solaris (and others?)

495

496 The "collission-detecting" implementation of SHA-1 hash we borrowed

497 from is replaced by directly binding the upstream project as our

521 - submodule.

498 + submodule. Glitches on minority platforms are still being worked out.

499

500 Will keep in 'pu'.

524 - cf. <xmqqefuab571.fsf@gitster.mtv.corp.google.com>

525 -

526 - The only nit I may have is that we may possibly want to turn this

527 - on in .travis.yml on MacOS before we move it forward (otherwise

528 - we'd be shipping bundled one and submodule one without doing any

529 - build on that platform)? Other than that, the topic seems ready to

530 - be merged down.

501

502

503 * bp/fsmonitor (2017-06-12) 6 commits

@@ -543,7 +513,13 @@ of the repositories listed at

513 No more comments or updates?

514

515

546 -* sb/diff-color-move (2017-06-23) 25 commits

516 +* sb/diff-color-move (2017-06-27) 31 commits

517 + - diff.c: detect blocks despite whitespace changes

518 + - diff.c: omit uninteresting moved lines

519 + - Documentation/diff: reword color moved

520 + - diff.c: better reporting on color.moved bogus configuration

521 + - diff.c: change the default for move coloring to zebra

522 + - diff.c: factor out shrinking of potential moved line blocks

523 - diff: document the new --color-moved setting

524 - diff.c: add dimming to moved line detection

525 - diff.c: color moved lines differently, plain mode

@@ -574,63 +550,14 @@ of the repositories listed at

550 the same as deleted lines elsewhere differently from genuinely new

551 lines.

552

577 -

578 -* xz/send-email-batch-size (2017-05-23) 1 commit

579 - - send-email: --batch-size to work around some SMTP server limit

580 -

581 - "git send-email" learned to overcome some SMTP server limitation

582 - that does not allow many pieces of e-mails to be sent over a single

583 - session.

584 -

585 - Waiting for response.

586 - cf. <CACBZZX5GYV50rjg9X602JHqFPaoofH9TwDf_-r_MDu8-rmNV6Q@mail.gmail.com>

587 - cf. <xmqqo9tfff2w.fsf@gitster.mtv.corp.google.com>

588 -

589 - """I thought your wish (which I found reasonable) was to record

590 - whatever information that would help us in the future in the log

591 - message? I was waiting for that to happen."""

592 -

593 -

594 -* sg/clone-refspec-from-command-line-config (2017-06-16) 2 commits

595 - - Documentation/clone: document ignored configuration variables

596 - - clone: respect additional configured fetch refspecs during initial fetch

597 - (this branch is used by sg/remote-no-string-refspecs.)

598 -

599 - "git clone -c var=val" is a way to set configuration variables in

600 - the resulting repository, but it is more useful to also make these

601 - variables take effect while the initial clone is happening,

602 - e.g. these configuration variables could be fetch refspecs.

603 -

604 - Waiting for a response.

605 - cf. <20170617112228.vugswym4o4owf6wj@sigill.intra.peff.net>

606 - cf. <xmqqmv8zhdap.fsf@gitster.mtv.corp.google.com>

607 -

608 -

609 -* js/rebase-i-final (2017-06-15) 10 commits

610 - - rebase -i: rearrange fixup/squash lines using the rebase--helper

611 - - t3415: test fixup with wrapped oneline

612 - - rebase -i: skip unnecessary picks using the rebase--helper

613 - - rebase -i: check for missing commits in the rebase--helper

614 - - t3404: relax rebase.missingCommitsCheck tests

615 - - rebase -i: also expand/collapse the SHA-1s via the rebase--helper

616 - - rebase -i: do not invent onelines when expanding/collapsing SHA-1s

617 - - rebase -i: remove useless indentation

618 - - rebase -i: generate the script via rebase--helper

619 - - t3415: verify that an empty instructionFormat is handled as before

620 -

621 - The final batch to "git rebase -i" updates to move more code from

622 - the shell script to C.

623 -

624 - Expecting a reroll.

625 - This is at its v5.

626 - cf. <cover.1497444257.git.johannes.schindelin@gmx.de>

553 + Expecting an evantual reroll.

554 + cf. <20170628005651.8110-1-sbeller@google.com>

555

556 --------------------------------------------------

557 [Discarded]

558

559 * mh/packed-ref-store-prep-extra (2017-06-18) 1 commit

560 . prefix_ref_iterator_advance(): relax the check of trim length

633 - (this branch uses mh/packed-ref-store-prep; is tangled with mh/packed-ref-store.)

561

562 Split out of mh/packed-ref-store-prep.

563

@@ -654,3 +581,14 @@ of the repositories listed at

581 of other worktrees as the root for reachability traversal, making

582 objects that are in use only in other worktrees to be subject to

583 garbage collection.

584 +

585 +

586 +* ab/free-and-null (2017-06-28) 2 commits

587 + (merged to 'next' on 2017-06-28 at 1cf373c61a)

588 + + Revert "coccinelle: add a rule to make "expression" code use FREE_AND_NULL()"

589 + (merged to 'next' on 2017-06-28 at 1785f88122)

590 + + coccinelle: add a rule to make "expression" code use FREE_AND_NULL()

591 +

592 + The coccinelle rule for free-and-null refactoring got simplified.

593 +

594 +

What's cooking (2017/06 #08)