7e1a7bb363 · 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 2014, #04; Tue, 17)

4 -X-master-at: cb682f8cfe63ecd0da08a526f404d295e51e3ab1

5 -X-next-at: f681aa8b2164b7263bd68f49cd3bebd6bf560b78

3 +Subject: What's cooking in git.git (Jun 2014, #05; Fri, 20)

4 +X-master-at: 786a89d3477c339676ed36d5d2d7507251344952

5 +X-next-at: e727dec93ab54c06c072aed01968580556da9191

6

7 -What's cooking in git.git (Jun 2014, #04; Tue, 17)

7 +What's cooking in git.git (Jun 2014, #05; Fri, 20)

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

9

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

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

12 '+' are in 'next'.

13

14 Many topics that have been cooking in 'next' during the previous

15 -cycle, totalling close to 300 individual patches, are in 'master'

16 -now. We have also accumulated some fixes we need to merge down to

17 -'maint' and cut a v2.0.1 sometime next week.

15 +cycle and also some new topics since this cycle opened, totalling

16 +slightly more than 300 individual patches are in 'master' now. We

17 +have also accumulated some fixes we need to merge down to 'maint'

18 +and cut a v2.0.1 sometime next week.

19

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

21 of the repositories listed at

@@ -24,528 +25,161 @@ of the repositories listed at

25 --------------------------------------------------

26 [Graduated to "master"]

27

27 -* mt/patch-id-stable (2014-06-10) 1 commit

28 - - patch-id: change default to stable

29 -

30 - Teaches "git patch-id" to compute the patch ID that does not change

31 - when the files in a single patch is reordered. As this new algorithm

32 - is backward incompatible, the last bit to flip it to be the default

33 - is left out of 'master' for now.

34 -

35 -

36 -* as/pretty-truncate (2014-05-21) 5 commits

37 - (merged to 'next' on 2014-06-10 at d8147a2)

38 - + pretty.c: format string with truncate respects logOutputEncoding

39 - + t4205, t6006: add tests that fail with i18n.logOutputEncoding set

40 - + t4205 (log-pretty-format): use `tformat` rather than `format`

41 - + t4041, t4205, t6006, t7102: don't hardcode tested encoding value

42 - + t4205 (log-pretty-formats): don't hardcode SHA-1 in expected outputs

43 -

44 - Originally merged to 'next' on 2014-05-23

45 -

46 -

47 -* bg/xcalloc-nmemb-then-size (2014-05-27) 12 commits

48 - (merged to 'next' on 2014-06-10 at eddb5bc)

49 - + transport-helper.c: rearrange xcalloc arguments

50 - + remote.c: rearrange xcalloc arguments

51 - + reflog-walk.c: rearrange xcalloc arguments

52 - + pack-revindex.c: rearrange xcalloc arguments

53 - + notes.c: rearrange xcalloc arguments

54 - + imap-send.c: rearrange xcalloc arguments

55 - + http-push.c: rearrange xcalloc arguments

56 - + diff.c: rearrange xcalloc arguments

57 - + config.c: rearrange xcalloc arguments

58 - + commit.c: rearrange xcalloc arguments

59 - + builtin/remote.c: rearrange xcalloc arguments

60 - + builtin/ls-remote.c: rearrange xcalloc arguments

61 -

62 - Originally merged to 'next' on 2014-06-06

63 -

64 - Like calloc(3), xcalloc() takes nmemb and then size.

65 -

66 -

67 -* cb/byte-order (2014-05-30) 3 commits

68 - (merged to 'next' on 2014-06-10 at 63db8ee)

69 - + compat/bswap.h: fix endianness detection

70 - + compat/bswap.h: restore preference __BIG_ENDIAN over BIG_ENDIAN

71 - + compat/bswap.h: detect endianness on more platforms that don't use BYTE_ORDER

72 -

73 - Originally merged to 'next' on 2014-05-30

74 -

75 - Compatibility enhancement for Solaris.

76 -

77 -

78 -* cc/replace-edit (2014-05-19) 10 commits

79 - (merged to 'next' on 2014-06-10 at ff69722)

80 - + Documentation: replace: describe new --edit option

81 - + replace: add --edit to usage string

82 - + replace: add tests for --edit

83 - + replace: die early if replace ref already exists

84 - + replace: refactor checking ref validity

85 - + replace: make sure --edit results in a different object

86 - + replace: add --edit option

87 - + replace: factor object resolution out of replace_object

88 - + replace: use OPT_CMDMODE to handle modes

89 - + replace: refactor command-mode determination

90 - (this branch is used by cc/replace-graft.)

91 -

92 - Originally merged to 'next' on 2014-05-19

93 -

94 - "git replace" learns a new "--edit" option.

95 -

96 -

97 -* dt/refs-check-refname-component-optim (2014-06-05) 1 commit

98 - (merged to 'next' on 2014-06-10 at 4560669)

99 - + refs.c: optimize check_refname_component()

100 - (this branch is used by dt/refs-check-refname-component-sse42.)

101 -

102 - Originally merged to 'next' on 2014-06-06

103 -

104 -

105 -* fc/remote-helper-refmap (2014-04-21) 8 commits

106 - (merged to 'next' on 2014-06-10 at 8cd8cf8)

107 - + transport-helper: remove unnecessary strbuf resets

108 - + transport-helper: add support to delete branches

109 - + fast-export: add support to delete refs

110 - + fast-import: add support to delete refs

111 - + transport-helper: add support to push symbolic refs

112 - + transport-helper: add support for old:new refspec

113 - + fast-export: add new --refspec option

114 - + fast-export: improve argument parsing

115 -

116 - Originally merged to 'next' on 2014-04-22

117 -

118 - Allow remote-helper/fast-import based transport to rename the refs

119 - while transferring the history.

120 -

121 -

122 -* ib/test-selectively-run (2014-06-06) 4 commits

123 - (merged to 'next' on 2014-06-10 at 1235570)

124 - + t0000-*.sh: fix the GIT_SKIP_TESTS sub-tests

125 - + test-lib: '--run' to run only specific tests

126 - + test-lib: tests skipped by GIT_SKIP_TESTS say so

127 - + test-lib: document short options in t/README

128 -

129 - Originally merged to 'next' on 2014-06-06

130 -

131 - Allow specifying only certain individual test pieces to be run

132 - using a range notation (e.g. "t1234-test.sh --run='1-4 6 8 9-'").

133 -

134 -

135 -* jk/argv-array-for-child-process (2014-05-15) 7 commits

136 - (merged to 'next' on 2014-06-10 at 07a167b)

137 - + argv-array: drop "detach" code

138 - + get_importer: use run-command's internal argv_array

139 - + get_exporter: use argv_array

140 - + get_helper: use run-command's internal argv_array

141 - + git_connect: use argv_array

142 - + run_column_filter: use argv_array

143 - + run-command: store an optional argv_array

144 -

145 - Originally merged to 'next' on 2014-05-21

146 -

147 -

148 -* jk/complete-merge-pull (2014-05-27) 2 commits

149 - (merged to 'next' on 2014-06-10 at d1524c5)

150 - + completion: add missing options for git-merge

151 - + completion: add a note that merge options are shared

152 -

153 - Originally merged to 'next' on 2014-06-06

154 -

155 - The completion code did not know about quite a few options that are

156 - common between "git merge" and "git pull", and a couple of options

157 - unique to "git merge".

158 -

159 -

160 -* jk/daemon-tolower (2014-05-23) 1 commit

161 - (merged to 'next' on 2014-06-10 at f3c549d)

162 - + daemon/config: factor out duplicate xstrdup_tolower

163 -

164 - Originally merged to 'next' on 2014-05-23

165 -

166 -

167 -* jk/diff-files-assume-unchanged (2014-05-15) 1 commit

168 - (merged to 'next' on 2014-06-10 at 984862b)

169 - + run_diff_files: do not look at uninitialized stat data

170 -

171 - Originally merged to 'next' on 2014-05-21

172 -

173 -

174 -* jk/diff-follow-must-take-one-pathspec (2014-05-20) 1 commit

175 - (merged to 'next' on 2014-06-10 at 0cd28d7)

176 - + move "--follow needs one pathspec" rule to diff_setup_done

177 -

178 - Originally merged to 'next' on 2014-05-23

179 -

180 -

181 -* jk/do-not-run-httpd-tests-as-root (2014-05-12) 1 commit

182 - (merged to 'next' on 2014-06-10 at 745b05c)

183 - + t/lib-httpd: require SANITY prereq

184 -

185 - Originally merged to 'next' on 2014-05-21

186 -

187 -

188 -* jk/error-resolve-conflict-advice (2014-06-03) 2 commits

189 - (merged to 'next' on 2014-06-10 at 713ebe0)

190 - + error_resolve_conflict: drop quotations around operation

191 - + error_resolve_conflict: rewrap advice message

192 -

193 - Originally merged to 'next' on 2014-06-06

194 -

195 -

196 -* jk/http-errors (2014-05-27) 8 commits

197 - (merged to 'next' on 2014-06-10 at 30e9212)

198 - + http: default text charset to iso-8859-1

199 - + remote-curl: reencode http error messages

200 - + strbuf: add strbuf_reencode helper

201 - + http: optionally extract charset parameter from content-type

202 - + http: extract type/subtype portion of content-type

203 - + t5550: test display of remote http error messages

204 - + t/lib-httpd: use write_script to copy CGI scripts

205 - + test-lib: preserve GIT_CURL_VERBOSE from the environment

206 -

207 - Originally merged to 'next' on 2014-06-06

208 -

209 - Propagate the error messages from the webserver better to the

210 - client coming over the HTTP transport.

211 -

212 -

213 -* jk/report-fail-to-read-objects-better (2014-05-15) 1 commit

214 - (merged to 'next' on 2014-06-10 at 299ea28)

215 - + open_sha1_file: report "most interesting" errno

216 -

217 - Originally merged to 'next' on 2014-05-21

218 -

219 -

220 -* jk/strbuf-tolower (2014-05-23) 1 commit

221 - (merged to 'next' on 2014-06-10 at 01e6983)

222 - + strbuf: add strbuf_tolower function

223 -

224 - Originally merged to 'next' on 2014-05-23

225 -

226 -

227 -* jl/remote-rm-prune (2014-05-27) 3 commits

228 - (merged to 'next' on 2014-06-10 at 13259ff)

229 - + remote prune: optimize "dangling symref" check/warning

230 - + remote: repack packed-refs once when deleting multiple refs

231 - + remote rm: delete remote configuration as the last

232 -

233 - Originally merged to 'next' on 2014-06-06

234 -

235 - "git remote rm" and "git remote prune" can involve removing many

236 - refs at once, which is not a very efficient thing to do when very

237 - many refs exist in the packed-refs file.

238 -

239 -

240 -* jl/status-added-submodule-is-never-ignored (2014-04-07) 2 commits

241 - (merged to 'next' on 2014-06-10 at fc63847)

242 - + commit -m: commit staged submodules regardless of ignore config

243 - + status/commit: show staged submodules regardless of ignore config

244 -

245 - Originally merged to 'next' on 2014-06-06

246 -

247 - submodule.*.ignore and diff.ignoresubmodules are used to ignore all

248 - submodule changes in "diff" output, but it can be confusing to

249 - apply these configuration values to status and commit.

250 -

251 - This is a backward-incompatible change, but should be so in a good

252 - way (aka bugfix).

253 -

254 -

255 -* jm/dedup-test-config (2014-06-05) 1 commit

256 - (merged to 'next' on 2014-06-10 at 8966f54)

257 - + t/t7810-grep.sh: remove duplicate test_config()

258 -

259 - Originally merged to 'next' on 2014-06-06

260 -

261 -

262 -* jm/doc-wording-tweaks (2014-05-28) 1 commit

263 - (merged to 'next' on 2014-06-10 at 5f2e094)

264 - + Documentation: wording fixes in the user manual and glossary

265 -

266 - Originally merged to 'next' on 2014-06-06

267 -

268 -

269 -* jm/format-patch-mail-sig (2014-05-27) 2 commits

270 - (merged to 'next' on 2014-06-10 at 310f59e)

271 - + format-patch: add "--signature-file=<file>" option

272 - + format-patch: make newline after signature conditional

273 -

274 - Originally merged to 'next' on 2014-06-06

275 -

276 -

277 -* jm/instaweb-apache-24 (2014-05-27) 1 commit

278 - (merged to 'next' on 2014-06-10 at ecf2048)

279 - + git-instaweb: add support for Apache 2.4

280 -

281 - Originally merged to 'next' on 2014-06-06

282 -

283 -

284 -* jm/t9138-style-fix (2014-05-27) 1 commit

285 - (merged to 'next' on 2014-06-10 at 034f13d)

286 - + t9138-git-svn-authors-prog.sh fixups

287 -

288 - Originally merged to 'next' on 2014-06-06

289 -

290 -

291 -* lt/log-auto-decorate (2014-05-30) 1 commit

292 - (merged to 'next' on 2014-06-10 at f149f4a)

293 - + git log: support "auto" decorations

294 -

295 - Originally merged to 'next' on 2014-06-06

296 -

297 -

298 -* nd/daemonize-gc (2014-05-27) 1 commit

299 - (merged to 'next' on 2014-06-10 at 6fae7b0)

300 - + gc --auto: do not lock refs in the background

301 -

302 - Originally merged to 'next' on 2014-06-06

303 -

304 - "git gc --auto" was recently changed to run in the background to

305 - give control back early to the end-user sitting in front of the

306 - terminal, but it forgot that housekeeping involving reflogs should

307 - be done without other processes competing for accesses to the refs.

308 -

309 -

310 -* ow/config-mailmap-pathname (2014-05-27) 1 commit

311 - (merged to 'next' on 2014-06-10 at aba4ca2)

312 - + config: respect '~' and '~user' in mailmap.file

313 -

314 - Originally merged to 'next' on 2014-06-06

315 -

316 - mailmap.file configuration names a pathname, hence should honor

317 - ~/path and ~user/path as its value.

318 -

319 -

320 -* rr/rebase-autostash-fix (2014-05-20) 2 commits

321 - (merged to 'next' on 2014-06-10 at afd0c29)

322 - + rebase -i: test "Nothing to do" case with autostash

323 - + rebase -i: handle "Nothing to do" case with autostash

324 -

325 - Originally merged to 'next' on 2014-05-21

326 -

327 -

328 -* rs/pack-objects-no-unnecessary-realloc (2014-06-02) 1 commit

329 - (merged to 'next' on 2014-06-10 at abae695)

330 - + pack-objects: use free()+xcalloc() instead of xrealloc()+memset()

331 -

332 - Originally merged to 'next' on 2014-06-06

333 -

334 - Avoid unnecessary copy of previous contents when extending the

335 - hashtable used in pack-objects.

336 -

28 +* jc/test-lazy-prereq (2014-06-13) 6 commits

29 + (merged to 'next' on 2014-06-10 at 4f774f7)

30 + + t3419: drop unnecessary NOT_EXPENSIVE pseudo-prerequisite

31 + + t3302: drop unnecessary NOT_EXPENSIVE pseudo-prerequisite

32 + + t3302: do not chdir around in the primary test process

33 + + t3302: coding style updates

34 + + test: turn USR_BIN_TIME into a lazy prerequisite

35 + + test: turn EXPENSIVE into a lazy prerequisite

36

338 -* rs/read-ref-at (2014-06-03) 1 commit

339 - (merged to 'next' on 2014-06-10 at f58f2fc)

340 - + refs.c: change read_ref_at to use the reflog iterators

37 + Test-script clean-up.

38

342 - Originally merged to 'next' on 2014-06-06

39

40 +* jc/revision-dash-count-parsing (2014-06-09) 1 commit

41 + (merged to 'next' on 2014-06-10 at 1aeca19)

42 + + revision: parse "git log -<count>" more carefully

43

345 -* sh/enable-preloadindex (2014-06-03) 1 commit

346 - (merged to 'next' on 2014-06-10 at 7cedf2d)

347 - + environment.c: enable core.preloadindex by default

44 + "git log -2master" is a common typo that shows two commits starting

45 + from whichever random branch that is not 'master' that happens to

46 + be checked out currently.

47

349 - Originally merged to 'next' on 2014-06-06

48

49 +* jm/api-strbuf-doc (2014-06-09) 1 commit

50 + (merged to 'next' on 2014-06-10 at 831aa30)

51 + + api-strbuf.txt minor typos

52

352 -* sk/test-cmp-bin (2014-06-04) 1 commit

353 - (merged to 'next' on 2014-06-10 at 020a475)

354 - + t5000, t5003: do not use test_cmp to compare binary files

53

356 - Originally merged to 'next' on 2014-06-06

54 +* mt/send-email-cover-to-cc (2014-06-10) 3 commits

55 + (merged to 'next' on 2014-06-10 at 6bb1465)

56 + + t9001: avoid non-portable '\n' with sed

57 + + test/send-email: to-cover, cc-cover tests

58 + + git-send-email: two new options: to-cover, cc-cover

59

60 + Originally merged to 'next' on 2014-06-10

61

359 -* sk/wincred (2014-05-14) 2 commits

360 - (merged to 'next' on 2014-06-10 at 8d03e5a)

361 - + wincred: avoid overwriting configured variables

362 - + wincred: add install target

62 + "git send-email" learns two new options.

63

364 - Originally merged to 'next' on 2014-05-21

64

65 +* rs/more-starts-with (2014-06-09) 1 commit

66 + (merged to 'next' on 2014-06-10 at efcd02e)

67 + + Use starts_with() for C strings instead of memcmp()

68

367 -* sk/windows-unc-path (2014-06-10) 1 commit

368 - (merged to 'next' on 2014-06-10 at 3598cc6)

369 - + Windows: allow using UNC path for git repository

370 - (this branch is used by sk/mingw-main, sk/mingw-uni-console and sk/mingw-unicode-spawn-args.)

69

372 - Originally merged to 'next' on 2014-05-21

70 +* tb/t5551-clone-notice-to-stderr (2014-06-09) 1 commit

71 + (merged to 'next' on 2014-06-10 at 374082c)

72 + + t5551: fix the 50,000 tag test

73

74

375 -* ta/string-list-init (2014-06-06) 1 commit

376 - (merged to 'next' on 2014-06-10 at bf209ff)

377 - + string-list: spell all values out that are given to a string_list initializer

75

379 - Originally merged to 'next' on 2014-06-06

76 +* jc/fetch-pull-refmap (2014-06-12) 10 commits

77 + (merged to 'next' on 2014-06-12 at 5428530)

78 + + docs: Explain the purpose of fetch's and pull's <refspec> parameter.

79 + (merged to 'next' on 2014-06-10 at 13c13ae)

80 + + fetch: allow explicit --refmap to override configuration

81 + + fetch doc: add a section on configured remote-tracking branches

82 + + fetch doc: remove "short-cut" section

83 + + fetch doc: update refspec format description

84 + + fetch doc: on pulling multiple refspecs

85 + + fetch doc: remove notes on outdated "mixed layout"

86 + + fetch doc: update note on '+' in front of the refspec

87 + + fetch doc: move FETCH_HEAD material lower and add an example

88 + + fetch doc: update introductory part for clarity

89

90 --------------------------------------------------

91 [New Topics]

92

384 -* fr/sequencer-fail-with-not-one-upon-no-ff (2014-06-09) 1 commit

385 - (merged to 'next' on 2014-06-16 at 29734cc)

386 - + sequencer: signal failed ff as an aborted, not a conflicted merge

93 +* dt/refs-check-refname-component-sse (2014-06-18) 1 commit

94 + (merged to 'next' on 2014-06-20 at d286027)

95 + + refs.c: SSE2 optimizations for check_refname_component

96

388 - Will merge to 'master'.

97 + Further micro-optimization of a leaf-function.

98

99

391 -* hv/submodule-config (2014-06-13) 6 commits

392 - - SQUASH compilation fix

393 - - do not die on error of parsing fetchrecursesubmodules option

394 - - use new config API for worktree configurations of submodules

395 - - extract functions for submodule config set and lookup

396 - - implement submodule config cache for lookup of submodule names

397 - - hashmap: add enum for hashmap free_entries option

398 -

399 -

400 -* mc/git-p4-prepare-p4-only (2014-06-13) 1 commit

401 - (merged to 'next' on 2014-06-16 at 3c05e19)

402 - + git-p4: fix submit in non --prepare-p4-only mode

100 +* tb/unicode-7.0-display-width (2014-06-18) 1 commit

101 + (merged to 'next' on 2014-06-20 at 111b246)

102 + + Update of unicode_width.h to Unicode Version 7.0

103

104 Will merge to 'master'.

105

106

407 -* sk/mingw-unicode-spawn-args (2014-06-16) 6 commits

408 - - Win32: Unicode arguments (incoming)

409 - - Win32: Unicode arguments (outgoing)

410 - - MinGW: disable CRT command line globbing

411 - - Win32: fix potential multi-threading issue

412 - - Win32: simplify internal mingw_spawn* APIs

413 - - Win32: let mingw_execve() return an int

414 - (this branch uses sk/mingw-main and sk/mingw-uni-console.)

415 -

416 -

417 -* sp/complete-ext-alias (2014-06-13) 1 commit

418 - (merged to 'next' on 2014-06-16 at 399679e)

419 - + completion: handle '!f() { ... }; f' and "!sh -c '...' -" aliases

107 +* ye/http-extract-charset (2014-06-17) 1 commit

108 + (merged to 'next' on 2014-06-20 at 9492bae)

109 + + http: fix charset detection of extract_content_type()

110

111 Will merge to 'master'.

112

113

424 -* bc/fix-rebase-merge-skip (2014-06-16) 1 commit

425 - - rebase--merge: fix --skip with two conflicts in a row

426 -

427 - "git rebase --skip" did not work well when it stopped due to a

428 - conflict twice in a row.

114 +* jk/skip-prefix (2014-06-20) 18 commits

115 + - http-push: refactor parsing of remote object names

116 + - imap-send: use skip_prefix instead of using magic numbers

117 + - use skip_prefix to avoid repeated calculations

118 + - git: avoid magic number with skip_prefix

119 + - fetch-pack: refactor parsing in get_ack

120 + - fast-import: refactor parsing of spaces

121 + - stat_opt: check extra strlen call

122 + - daemon: use skip_prefix to avoid magic numbers

123 + - fast-import: use skip_prefix for parsing input

124 + - use skip_prefix to avoid repeating strings

125 + - use skip_prefix to avoid magic numbers

126 + - transport-helper: avoid reading past end-of-string

127 + - fast-import: fix read of uninitialized argv memory

128 + - apply: use skip_prefix instead of raw addition

129 + - refactor skip_prefix to return a boolean

130 + - avoid using skip_prefix as a boolean

131 + - daemon: mark some strings as const

132 + - parse_diff_color_slot: drop ofs parameter

133

134 Will merge to 'next'.

135

136

433 -* jl/submodule-tests (2014-06-16) 16 commits

434 - - revert: add t3513 for submodule updates

435 - - stash: add t3906 for submodule updates

436 - - am: add t4255 for submodule updates

437 - - cherry-pick: add t3512 for submodule updates

438 - - pull: add t5572 for submodule updates

439 - - SQUASH???

440 - - rebase: add t3426 for submodule updates

441 - - merge: add t7613 for submodule updates

442 - - bisect: add t6041 for submodule updates

443 - - reset: add t7112 for submodule updates

444 - - read-tree: add t1013 for submodule updates

445 - - apply: add t4137 for submodule updates

446 - - checkout: call the new submodule update test framework

447 - - submodules: Add the lib-submodule-update.sh test library

448 - - SQUASH???

449 - - test-lib: add test_dir_is_empty()

450 -

451 - Expecting a reroll.

452 -

453 -

454 -* mc/doc-submodule-sync-recurse (2014-06-13) 1 commit

455 - - submodule: document "sync --recursive"

137 +* jk/xstrfmt (2014-06-19) 10 commits

138 + - unique_path: fix unlikely heap overflow

139 + - walker_fetch: fix minor memory leak

140 + - merge: use argv_array when spawning merge strategy

141 + - sequencer: use argv_array_pushf

142 + - setup_git_env: use git_pathdup instead of xmalloc + sprintf

143 + - use xstrfmt to replace xmalloc + strcpy/strcat

144 + - use xstrfmt to replace xmalloc + sprintf

145 + - use xstrdup instead of xmalloc + strcpy

146 + - use xstrfmt in favor of manual size calculations

147 + - strbuf: add xstrfmt helper

148

149 Will merge to 'next'.

150

151

460 -* pb/trim-trailing-spaces (2014-06-13) 1 commit

461 - - t0008: do not depend on 'echo' handling backslashes specially

152 +* jm/dedup-name-compare (2014-06-20) 2 commits

153 + - cleanup duplicate name_compare() functions

154 + - name-hash.c: replace cache_name_compare() with memcmp(3)

155

156 Will merge to 'next'.

157

158

466 -* po/error-message-style (2014-06-16) 1 commit

467 - - doc: state coding guideline for error message punctuation

159 +* kb/perf-trace (2014-06-17) 11 commits

160 + . git: add performance tracing for git's main() function to debug scripts

161 + . trace: add trace_performance facility to debug performance issues

162 + . trace: add high resolution timer function to debug performance issues

163 + . trace: add 'file:line' to all trace output

164 + . trace: move code around, in preparation to file:line output

165 + . trace: add current timestamp to all trace output

166 + . trace: add infrastructure to augment trace output with additional info

167 + . trace: factor out printing to the trace file

168 + . trace: remove redundant printf format attribute

169 + . trace: consistently name the format parameter

170 + . trace: move trace declarations from cache.h to new trace.h

171

469 - Expecting a reroll.

470 -

471 -

472 -* rs/blame-refactor (2014-06-13) 2 commits

473 - - blame: simplify prepare_lines()

474 - - blame: factor out get_next_line()

475 -

476 - Will merge to 'next'.

477 -

478 -

479 -* rs/ref-transaction (2014-06-17) 48 commits

480 - - refs.c: make write_ref_sha1 static

481 - - fetch.c: change s_update_ref to use a ref transaction

482 - - refs.c: propagate any errno==ENOTDIR from _commit back to the callers

483 - - refs.c: pass a skip list to name_conflict_fn

484 - - refs.c: call lock_ref_sha1_basic directly from commit

485 - - refs.c: move the check for valid refname to lock_ref_sha1_basic

486 - - refs.c: pass NULL as *flags to read_ref_full

487 - - refs.c: pass the ref log message to _create/delete/update instead of _commit

488 - - refs.c: make delete_ref use a transaction

489 - - refs.c: make prune_ref use a transaction to delete the ref

490 - - refs.c: remove lock_ref_sha1

491 - - refs.c: remove the update_ref_write function

492 - - refs.c: remove the update_ref_lock function

493 - - refs.c: make lock_ref_sha1 static

494 - - walker.c: use ref transaction for ref updates

495 - - fast-import.c: use a ref transaction when dumping tags

496 - - receive-pack.c: use a reference transaction for updating the refs

497 - - refs.c: change update_ref to use a transaction

498 - - branch.c: use ref transaction for all ref updates

499 - - fast-import.c: change update_branch to use ref transactions

500 - - sequencer.c: use ref transactions for all ref updates

501 - - commit.c: use ref transactions for updates

502 - - replace.c: use the ref transaction functions for updates

503 - - tag.c: use ref transactions when doing updates

504 - - refs.c: add transaction.status and track OPEN/CLOSED/ERROR

505 - - refs.c: make ref_transaction_begin take an err argument

506 - - refs.c: update ref_transaction_delete to check for error and return status

507 - - refs.c: change ref_transaction_create to do error checking and return status

508 - - refs.c: change ref_transaction_update() to do error checking and return status

509 - - refs.c: remove the onerr argument to ref_transaction_commit

510 - - update-ref: use err argument to get error from ref_transaction_commit

511 - - refs.c: make update_ref_write update a strbuf on failure

512 - - refs.c: add an err argument to delete_ref_loose

513 - - refs.c: make ref_update_reject_duplicates take a strbuf argument for errors

514 - - refs.c: log_ref_write should try to return meaningful errno

515 - - refs.c: make resolve_ref_unsafe set errno to something meaningful on error

516 - - refs.c: commit_packed_refs to return a meaningful errno on failure

517 - - refs.c: make remove_empty_directories alwasy set errno to something sane

518 - - refs.c: verify_lock should set errno to something meaningful

519 - - refs.c: make sure log_ref_setup returns a meaningful errno

520 - - refs.c: add an err argument to repack_without_refs

521 - - lockfile.c: make lock_file return a meaningful errno on failurei

522 - - lockfile.c: add a new public function unable_to_lock_message

523 - - refs.c: add a strbuf argument to ref_transaction_commit for error logging

524 - - refs.c: allow passing NULL to ref_transaction_free

525 - - refs.c: constify the sha arguments for ref_transaction_create|delete|update

526 - - refs.c: ref_transaction_commit should not free the transaction

527 - - refs.c: remove ref_transaction_rollback

528 -

529 -

530 -* ye/doc-http-proto (2014-06-16) 1 commit

531 - - http-protocol.txt: Basic Auth is defined in RFC 2617, not RFC 2616

532 -

533 - Will merge to 'next'.

534 -

535 -

536 -* jk/pretty-G-format-fixes (2014-06-17) 5 commits

537 - - pretty: avoid reading past end-of-string with "%G"

538 - - t7510: check %G* pretty-format output

539 - - t7510: test a commit signed by an unknown key

540 - - t7510: use consistent &&-chains in loop

541 - - t7510: stop referring to master in later tests

172 +--------------------------------------------------

173 +[Stalled]

174

175 +* mg/verify-commit (2014-06-10) 3 commits

176 + - verify-commit: scriptable commit signature verification

177 + - gpg-interface: provide access to the payload

178 + - pretty: free the gpg status buf

179

544 -* tb/unicode-7.0 (2014-06-17) 1 commit

545 - - Update of unicode_width.h to Unicode Version 7.0

180 + What is queued here is v1; v2 exists but I skipped it.

181 + Expecting a reroll.

182

547 ---------------------------------------------------

548 -[Stalled]

183

184 * cc/replace-graft (2014-06-09) 5 commits

185 - DONTMERGE: wise to wait for peff's commit->buffer length series

@@ -557,6 +191,8 @@ of the repositories listed at

191 "git replace" learned a "--graft" option to rewrite parents of a

192 commit.

193

194 + Expecting a reroll on top of jk/commit-buffer-length.

195 +

196

197 * ab/add-interactive-show-diff-func-name (2014-05-12) 2 commits

198 - SQUASH??? git-add--interactive: Preserve diff heading when splitting hunks

@@ -615,47 +251,6 @@ of the repositories listed at

251 but after that I do not recall seeing any updates.

252

253

618 -* jh/submodule-tests (2014-04-17) 1 commit

619 - - t7410: 210 tests for various 'git submodule update' scenarios

620 -

621 - More or less abandoned. Will drop.

622 -

623 -

624 -* nd/multiple-work-trees (2014-03-25) 28 commits

625 - - count-objects: report unused files in $GIT_DIR/repos/...

626 - - gc: support prune --repos

627 - - gc: style change -- no SP before closing bracket

628 - - prune: strategies for linked checkouts

629 - - checkout: detach if the branch is already checked out elsewhere

630 - - checkout: clean up half-prepared directories in --to mode

631 - - checkout: support checking out into a new working directory

632 - - use new wrapper write_file() for simple file writing

633 - - wrapper.c: wrapper to open a file, fprintf then close

634 - - setup.c: support multi-checkout repo setup

635 - - setup.c: detect $GIT_COMMON_DIR check_repository_format_gently()

636 - - setup.c: convert check_repository_format_gently to use strbuf

637 - - setup.c: detect $GIT_COMMON_DIR in is_git_directory()

638 - - setup.c: convert is_git_directory() to use strbuf

639 - - git-stash: avoid hardcoding $GIT_DIR/logs/....

640 - - *.sh: avoid hardcoding $GIT_DIR/hooks/...

641 - - git-sh-setup.sh: use rev-parse --git-path to get $GIT_DIR/objects

642 - - $GIT_COMMON_DIR: a new environment variable

643 - - commit: use SEQ_DIR instead of hardcoding "sequencer"

644 - - fast-import: use git_path() for accessing .git dir instead of get_git_dir()

645 - - reflog: avoid constructing .lock path with git_path

646 - - *.sh: respect $GIT_INDEX_FILE

647 - - git_path(): be aware of file relocation in $GIT_DIR

648 - - path.c: group git_path(), git_pathdup() and strbuf_git_path() together

649 - - path.c: rename vsnpath() to do_git_path()

650 - - git_snpath(): retire and replace with strbuf_git_path()

651 - - path.c: make get_pathname() call sites return const char *

652 - - path.c: make get_pathname() return strbuf instead of static buffer

653 -

654 - A replacement for contrib/workdir/git-new-workdir that does not

655 - rely on symbolic links and make sharing of objects and refs safer

656 - by making the borrowee and borrowers aware of each other.

657 -

658 -

254 * mh/lockfile (2014-04-15) 25 commits

255 - trim_last_path_elm(): replace last_path_elm()

256 - resolve_symlink(): take a strbuf parameter

@@ -705,8 +300,6 @@ of the repositories listed at

300 - merge-recursive: remove dead conditional in update_stages()

301 (this branch is used by tr/remerge-diff.)

302

708 - Will hold.

709 -

303

304 * tr/remerge-diff (2014-02-26) 5 commits

305 . log --remerge-diff: show what the conflict resolution changed

@@ -848,22 +441,215 @@ of the repositories listed at

441

442 Waiting for the final step to lift the hard-limit before sending it out.

443

444 +* jh/submodule-tests (2014-04-17) 1 commit

445 + - t7410: 210 tests for various 'git submodule update' scenarios

446 +

447 + More or less abandoned. Will drop.

448 +

449 +

450 +* nd/multiple-work-trees (2014-03-25) 28 commits

451 + . count-objects: report unused files in $GIT_DIR/repos/...

452 + . gc: support prune --repos

453 + . gc: style change -- no SP before closing bracket

454 + . prune: strategies for linked checkouts

455 + . checkout: detach if the branch is already checked out elsewhere

456 + . checkout: clean up half-prepared directories in --to mode

457 + . checkout: support checking out into a new working directory

458 + . use new wrapper write_file() for simple file writing

459 + . wrapper.c: wrapper to open a file, fprintf then close

460 + . setup.c: support multi-checkout repo setup

461 + . setup.c: detect $GIT_COMMON_DIR check_repository_format_gently()

462 + . setup.c: convert check_repository_format_gently to use strbuf

463 + . setup.c: detect $GIT_COMMON_DIR in is_git_directory()

464 + . setup.c: convert is_git_directory() to use strbuf

465 + . git-stash: avoid hardcoding $GIT_DIR/logs/....

466 + . *.sh: avoid hardcoding $GIT_DIR/hooks/...

467 + . git-sh-setup.sh: use rev-parse --git-path to get $GIT_DIR/objects

468 + . $GIT_COMMON_DIR: a new environment variable

469 + . commit: use SEQ_DIR instead of hardcoding "sequencer"

470 + . fast-import: use git_path() for accessing .git dir instead of get_git_dir()

471 + . reflog: avoid constructing .lock path with git_path

472 + . *.sh: respect $GIT_INDEX_FILE

473 + . git_path(): be aware of file relocation in $GIT_DIR

474 + . path.c: group git_path(), git_pathdup() and strbuf_git_path() together

475 + . path.c: rename vsnpath() to do_git_path()

476 + . git_snpath(): retire and replace with strbuf_git_path()

477 + . path.c: make get_pathname() call sites return const char *

478 + . path.c: make get_pathname() return strbuf instead of static buffer

479 +

480 + A replacement for contrib/workdir/git-new-workdir that does not

481 + rely on symbolic links and make sharing of objects and refs safer

482 + by making the borrowee and borrowers aware of each other.

483 +

484 +

485 --------------------------------------------------

486 [Cooking]

487

854 -* jc/fetch-pull-refmap (2014-06-12) 10 commits

855 - (merged to 'next' on 2014-06-12 at 5428530)

856 - + docs: Explain the purpose of fetch's and pull's <refspec> parameter.

857 - (merged to 'next' on 2014-06-10 at 13c13ae)

858 - + fetch: allow explicit --refmap to override configuration

859 - + fetch doc: add a section on configured remote-tracking branches

860 - + fetch doc: remove "short-cut" section

861 - + fetch doc: update refspec format description

862 - + fetch doc: on pulling multiple refspecs

863 - + fetch doc: remove notes on outdated "mixed layout"

864 - + fetch doc: update note on '+' in front of the refspec

865 - + fetch doc: move FETCH_HEAD material lower and add an example

866 - + fetch doc: update introductory part for clarity

488 +* fr/sequencer-fail-with-not-one-upon-no-ff (2014-06-09) 1 commit

489 + (merged to 'next' on 2014-06-16 at 29734cc)

490 + + sequencer: signal failed ff as an aborted, not a conflicted merge

491 +

492 + Will merge to 'master'.

493 +

494 +

495 +* hv/submodule-config (2014-06-13) 6 commits

496 + - SQUASH compilation fix

497 + - do not die on error of parsing fetchrecursesubmodules option

498 + - use new config API for worktree configurations of submodules

499 + - extract functions for submodule config set and lookup

500 + - implement submodule config cache for lookup of submodule names

501 + - hashmap: add enum for hashmap free_entries option

502 +

503 +

504 +* mc/git-p4-prepare-p4-only (2014-06-13) 1 commit

505 + (merged to 'next' on 2014-06-16 at 3c05e19)

506 + + git-p4: fix submit in non --prepare-p4-only mode

507 +

508 + Will merge to 'master'.

509 +

510 +

511 +* sk/mingw-unicode-spawn-args (2014-06-16) 6 commits

512 + - Win32: Unicode arguments (incoming)

513 + - Win32: Unicode arguments (outgoing)

514 + - MinGW: disable CRT command line globbing

515 + - Win32: fix potential multi-threading issue

516 + - Win32: simplify internal mingw_spawn* APIs

517 + - Win32: let mingw_execve() return an int

518 + (this branch uses sk/mingw-main and sk/mingw-uni-console.)

519 +

520 +

521 +* sp/complete-ext-alias (2014-06-13) 1 commit

522 + (merged to 'next' on 2014-06-16 at 399679e)

523 + + completion: handle '!f() { ... }; f' and "!sh -c '...' -" aliases

524 +

525 + Will merge to 'master'.

526 +

527 +

528 +* bc/fix-rebase-merge-skip (2014-06-16) 1 commit

529 + (merged to 'next' on 2014-06-20 at 01f81f5)

530 + + rebase--merge: fix --skip with two conflicts in a row

531 +

532 + "git rebase --skip" did not work well when it stopped due to a

533 + conflict twice in a row.

534 +

535 + Will merge to 'master'.

536 +

537 +

538 +* jl/submodule-tests (2014-06-20) 15 commits

539 + - revert: add t3513 for submodule updates

540 + - stash: add t3906 for submodule updates

541 + - am: add t4255 for submodule updates

542 + - cherry-pick: add t3512 for submodule updates

543 + - pull: add t5572 for submodule updates

544 + - rebase: add t3426 for submodule updates

545 + - merge: add t7613 for submodule updates

546 + - bisect: add t6041 for submodule updates

547 + - reset: add t7112 for submodule updates

548 + - read-tree: add t1013 for submodule updates

549 + - apply: add t4137 for submodule updates

550 + - checkout: call the new submodule update test framework

551 + - SQUASH???

552 + - submodules: Add the lib-submodule-update.sh test library

553 + - test-lib: add test_dir_is_empty()

554 +

555 +

556 +* mc/doc-submodule-sync-recurse (2014-06-13) 1 commit

557 + (merged to 'next' on 2014-06-20 at 04815e3)

558 + + submodule: document "sync --recursive"

559 +

560 + Will merge to 'master'.

561 +

562 +

563 +* pb/trim-trailing-spaces (2014-06-13) 1 commit

564 + (merged to 'next' on 2014-06-20 at 6985153)

565 + + t0008: do not depend on 'echo' handling backslashes specially

566 +

567 + Will merge to 'master'.

568 +

569 +

570 +* po/error-message-style (2014-06-16) 1 commit

571 + - doc: state coding guideline for error message punctuation

572 +

573 + Expecting a reroll.

574 +

575 +

576 +* rs/blame-refactor (2014-06-13) 2 commits

577 + (merged to 'next' on 2014-06-20 at ddaa722)

578 + + blame: simplify prepare_lines()

579 + + blame: factor out get_next_line()

580 +

581 + Will merge to 'master'.

582 +

583 +

584 +* rs/ref-transaction (2014-06-20) 48 commits

585 + - refs.c: make write_ref_sha1 static

586 + - fetch.c: change s_update_ref to use a ref transaction

587 + - refs.c: propagate any errno==ENOTDIR from _commit back to the callers

588 + - refs.c: pass a skip list to name_conflict_fn

589 + - refs.c: call lock_ref_sha1_basic directly from commit

590 + - refs.c: move the check for valid refname to lock_ref_sha1_basic

591 + - refs.c: pass NULL as *flags to read_ref_full

592 + - refs.c: pass the ref log message to _create/delete/update instead of _commit

593 + - refs.c: add an err argument to delete_ref_loose

594 + - refs.c: make delete_ref use a transaction

595 + - refs.c: make prune_ref use a transaction to delete the ref

596 + - refs.c: remove lock_ref_sha1

597 + - refs.c: remove the update_ref_write function

598 + - refs.c: remove the update_ref_lock function

599 + - refs.c: make lock_ref_sha1 static

600 + - walker.c: use ref transaction for ref updates

601 + - fast-import.c: use a ref transaction when dumping tags

602 + - receive-pack.c: use a reference transaction for updating the refs

603 + - refs.c: change update_ref to use a transaction

604 + - branch.c: use ref transaction for all ref updates

605 + - fast-import.c: change update_branch to use ref transactions

606 + - sequencer.c: use ref transactions for all ref updates

607 + - commit.c: use ref transactions for updates

608 + - replace.c: use the ref transaction functions for updates

609 + - tag.c: use ref transactions when doing updates

610 + - refs.c: add transaction.status and track OPEN/CLOSED/ERROR

611 + - refs.c: make ref_transaction_begin take an err argument

612 + - refs.c: update ref_transaction_delete to check for error and return status

613 + - refs.c: change ref_transaction_create to do error checking and return status

614 + - refs.c: change ref_transaction_update() to do error checking and return status

615 + - refs.c: remove the onerr argument to ref_transaction_commit

616 + - update-ref: use err argument to get error from ref_transaction_commit

617 + - refs.c: make update_ref_write update a strbuf on failure

618 + - refs.c: make ref_update_reject_duplicates take a strbuf argument for errors

619 + - refs.c: log_ref_write should try to return meaningful errno

620 + - refs.c: make resolve_ref_unsafe set errno to something meaningful on error

621 + - refs.c: commit_packed_refs to return a meaningful errno on failure

622 + - refs.c: make remove_empty_directories always set errno to something sane

623 + - refs.c: verify_lock should set errno to something meaningful

624 + - refs.c: make sure log_ref_setup returns a meaningful errno

625 + - refs.c: add an err argument to repack_without_refs

626 + - lockfile.c: make lock_file return a meaningful errno on failurei

627 + - lockfile.c: add a new public function unable_to_lock_message

628 + - refs.c: add a strbuf argument to ref_transaction_commit for error logging

629 + - refs.c: allow passing NULL to ref_transaction_free

630 + - refs.c: constify the sha arguments for ref_transaction_create|delete|update

631 + - refs.c: ref_transaction_commit should not free the transaction

632 + - refs.c: remove ref_transaction_rollback

633 +

634 + Updated in response to review comments from Michael.

635 +

636 + Seems to be getting ready for 'next'.

637 +

638 +

639 +* ye/doc-http-proto (2014-06-16) 1 commit

640 + (merged to 'next' on 2014-06-20 at 24f347d)

641 + + http-protocol.txt: Basic Auth is defined in RFC 2617, not RFC 2616

642 +

643 + Will merge to 'master'.

644 +

645 +

646 +* jk/pretty-G-format-fixes (2014-06-17) 5 commits

647 + (merged to 'next' on 2014-06-20 at f504bbc)

648 + + pretty: avoid reading past end-of-string with "%G"

649 + + t7510: check %G* pretty-format output

650 + + t7510: test a commit signed by an unknown key

651 + + t7510: use consistent &&-chains in loop

652 + + t7510: stop referring to master in later tests

653

654 Will merge to 'master'.

655

@@ -903,54 +689,39 @@ of the repositories listed at

689 - ewah: fix constness of ewah_read_mmap

690

691

906 -* ep/avoid-test-a-o (2014-06-10) 21 commits

907 - - git-submodule.sh: avoid "echo" path-like values

908 - - SQUASH: misconversion breakage fix

909 - - git-submodule.sh: avoid "test <cond> -a/-o <cond>"

910 - - t/test-lib-functions.sh: avoid "test <cond> -a/-o <cond>"

911 - - t/t9814-git-p4-rename.sh: avoid "test <cond> -a/-o <cond>"

912 - - t/t5538-push-shallow.sh: avoid "test <cond> -a/-o <cond>"

913 - - t/t5403-post-checkout-hook.sh: avoid "test <cond> -a/-o <cond>"

914 - - t/t5000-tar-tree.sh: avoid "test <cond> -a/-o <cond>"

915 - - t/t4102-apply-rename.sh: avoid "test <cond> -a/-o <cond>"

916 - - t/t0026-eol-config.sh: avoid "test <cond> -a/-o <cond>"

917 - - t/t0025-crlf-auto.sh: avoid "test <cond> -a/-o <cond>"

918 - - t/lib-httpd.sh: avoid "test <cond> -a/-o <cond>"

919 - - git-rebase--interactive.sh: avoid "test <cond> -a/-o <cond>"

920 - - git-mergetool.sh: avoid "test <cond> -a/-o <cond>"

921 - - git-bisect.sh: avoid "test <cond> -a/-o <cond>"

922 - - contrib/examples/git-resolve.sh: avoid "test <cond> -a/-o <cond>"

923 - - contrib/examples/git-repack.sh: avoid "test <cond> -a/-o <cond>"

924 - - contrib/examples/git-merge.sh: avoid "test <cond> -a/-o <cond>"

925 - - contrib/examples/git-commit.sh: avoid "test <cond> -a/-o <cond>"

926 - - contrib/examples/git-clone.sh: avoid "test <cond> -a/-o <cond>"

927 - - check_bindir: avoid "test <cond> -a/-o <cond>"

928 -

929 -

930 -* jc/revision-dash-count-parsing (2014-06-09) 1 commit

931 - (merged to 'next' on 2014-06-10 at 1aeca19)

932 - + revision: parse "git log -<count>" more carefully

933 -

934 - "git log -2master" is a common typo that shows two commits starting

935 - from whichever random branch that is not 'master' that happens to

936 - be checked out currently.

692 +* ep/avoid-test-a-o (2014-06-19) 20 commits

693 + (merged to 'next' on 2014-06-20 at c47322b)

694 + + git-submodule.sh: avoid "echo" path-like values

695 + + git-submodule.sh: avoid "test <cond> -a/-o <cond>"

696 + + t/test-lib-functions.sh: avoid "test <cond> -a/-o <cond>"

697 + + t/t9814-git-p4-rename.sh: avoid "test <cond> -a/-o <cond>"

698 + + t/t5538-push-shallow.sh: avoid "test <cond> -a/-o <cond>"

699 + + t/t5403-post-checkout-hook.sh: avoid "test <cond> -a/-o <cond>"

700 + + t/t5000-tar-tree.sh: avoid "test <cond> -a/-o <cond>"

701 + + t/t4102-apply-rename.sh: avoid "test <cond> -a/-o <cond>"

702 + + t/t0026-eol-config.sh: avoid "test <cond> -a/-o <cond>"

703 + + t/t0025-crlf-auto.sh: avoid "test <cond> -a/-o <cond>"

704 + + t/lib-httpd.sh: avoid "test <cond> -a/-o <cond>"

705 + + git-rebase--interactive.sh: avoid "test <cond> -a/-o <cond>"

706 + + git-mergetool.sh: avoid "test <cond> -a/-o <cond>"

707 + + git-bisect.sh: avoid "test <cond> -a/-o <cond>"

708 + + contrib/examples/git-resolve.sh: avoid "test <cond> -a/-o <cond>"

709 + + contrib/examples/git-repack.sh: avoid "test <cond> -a/-o <cond>"

710 + + contrib/examples/git-merge.sh: avoid "test <cond> -a/-o <cond>"

711 + + contrib/examples/git-commit.sh: avoid "test <cond> -a/-o <cond>"

712 + + contrib/examples/git-clone.sh: avoid "test <cond> -a/-o <cond>"

713 + + check_bindir: avoid "test <cond> -a/-o <cond>"

714 +

715 + Update tests and scripts to avoid "test ... -a ...", which is often

716 + more error-prone than "test ... && test ...".

717 +

718 + Squashed misconversion fix-up into git-submodule.sh updates.

719

720 Will merge to 'master'.

721

722

941 -* jc/test-lazy-prereq (2014-06-13) 7 commits

723 +* jc/test-lazy-prereq (2014-06-13) 1 commit

724 - tests: drop GIT_*_TIMING_TESTS environment variable support

943 - (merged to 'next' on 2014-06-10 at 4f774f7)

944 - + t3419: drop unnecessary NOT_EXPENSIVE pseudo-prerequisite

945 - + t3302: drop unnecessary NOT_EXPENSIVE pseudo-prerequisite

946 - + t3302: do not chdir around in the primary test process

947 - + t3302: coding style updates

948 - + test: turn USR_BIN_TIME into a lazy prerequisite

949 - + test: turn EXPENSIVE into a lazy prerequisite

950 -

951 - Test-script clean-up. The last step might be controversial.

952 -

953 - Will merge to 'master' except for the last one.

725

726

727 * jk/commit-buffer-length (2014-06-13) 18 commits

@@ -981,20 +752,6 @@ of the repositories listed at

752 Will merge to 'master'.

753

754

984 -* jm/api-strbuf-doc (2014-06-09) 1 commit

985 - (merged to 'next' on 2014-06-10 at 831aa30)

986 - + api-strbuf.txt minor typos

987 -

988 - Will merge to 'master'.

989 -

990 -

991 -* rs/more-starts-with (2014-06-09) 1 commit

992 - (merged to 'next' on 2014-06-10 at efcd02e)

993 - + Use starts_with() for C strings instead of memcmp()

994 -

995 - Will merge to 'master'.

996 -

997 -

755 * sk/mingw-dirent (2014-06-09) 5 commits

756 - Win32 dirent: improve dirent implementation

757 - Win32 dirent: clarify #include directives

@@ -1022,13 +779,6 @@ of the repositories listed at

779 Now, are Windows folks happy with all four mingw topics?

780

781

1025 -* tb/t5551-clone-notice-to-stderr (2014-06-09) 1 commit

1026 - (merged to 'next' on 2014-06-10 at 374082c)

1027 - + t5551: fix the 50,000 tag test

1028 -

1029 - Will merge to 'master'.

1030 -

1031 -

782 * jk/repack-pack-keep-objects (2014-06-10) 3 commits

783 (merged to 'next' on 2014-06-16 at 89716c9)

784 + repack: s/write_bitmap/&s/ in code

@@ -1054,15 +804,6 @@ of the repositories listed at

804 Will merge to 'master'.

805

806

1057 -* mg/verify-commit (2014-06-10) 3 commits

1058 - - verify-commit: scriptable commit signature verification

1059 - - gpg-interface: provide access to the payload

1060 - - pretty: free the gpg status buf

1061 -

1062 - What is queued here is v1; v2 exists but I skipped it.

1063 - Expecting a reroll.

1064 -

1065 -

807 * nd/init-restore-env (2014-06-10) 1 commit

808 (merged to 'next' on 2014-06-16 at ecbbfca)

809 + git potty: restore environments after alias expansion

@@ -1084,28 +825,12 @@ of the repositories listed at

825 Will drop, as I heard from Paul that these are queued in his tree.

826

827

1087 -* mt/send-email-cover-to-cc (2014-06-10) 3 commits

1088 - (merged to 'next' on 2014-06-10 at 6bb1465)

1089 - + t9001: avoid non-portable '\n' with sed

1090 - + test/send-email: to-cover, cc-cover tests

1091 - + git-send-email: two new options: to-cover, cc-cover

1092 -

1093 - Originally merged to 'next' on 2014-06-10

1094 -

1095 - Will merge to 'master'.

1096 -

1097 -

828 * mt/patch-id-stable (2014-06-10) 1 commit

829 - patch-id: change default to stable

830

1101 ---------------------------------------------------

1102 -[Discarded]

1103 -

1104 -* jl/submodule-recursive-checkout (2013-12-26) 5 commits

1105 - . Teach checkout to recursively checkout submodules

1106 - . submodule: teach unpack_trees() to update submodules

1107 - . submodule: teach unpack_trees() to repopulate submodules

1108 - . submodule: teach unpack_trees() to remove submodule contents

1109 - . submodule: prepare for recursive checkout of submodules

1110 -

1111 - Dropped for now to make room for another topic ($gmane/251521)

831 + Teaches "git patch-id" to compute the patch ID that does not change

832 + when the files in a single patch is reordered. As this new algorithm

833 + is backward incompatible, the last bit to flip it to be the default

834 + is left out of 'master' for now.

835 + * mt/patch-id-stable (2014-06-10) 1 commit

836 + - patch-id: change default to stable

What's cooking (2014/06 #05)