20ab4d5ca4 · 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 (Oct 2013, #08; Wed, 30)

4 -X-master-at: 42817b96b1b80b56fd5a4d5e0d6239524b1832a3

5 -X-next-at: a9bf06aa4c8db76465f9b7c11b2704229b2adb5a

3 +Subject: What's cooking in git.git (Nov 2013, #01; Fri, 1)

4 +X-master-at: aa2706463fdeb51d6f9d0e267113b251888cf7f5

5 +X-next-at: 895133908010cd8192e1783286fa28ed6538f61f

6

7 -What's cooking in git.git (Oct 2013, #08; Wed, 30)

7 +What's cooking in git.git (Nov 2013, #01; Fri, 1)

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

9

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

@@ -29,178 +29,119 @@ of the repositories listed at

29 --------------------------------------------------

30 [Graduated to "master"]

31

32 -* fc/styles (2013-10-16) 7 commits

33 - (merged to 'next' on 2013-10-28 at cf592ed)

34 - + block-sha1/sha1.c: have SP around arithmetic operators

35 - + base85.c: have SP around arithmetic operators

36 - + archive.c: have SP around arithmetic operators

37 - + alloc.c: have SP around arithmetic operators

38 - + abspath.c: have SP around arithmetic operators

39 - + alias: have SP around arithmetic operators

40 - + C: have space around && and || operators

41 -

42 - C coding style fixes.

43 -

44 -

45 -* hn/log-graph-color-octopus (2013-10-18) 1 commit

46 - (merged to 'next' on 2013-10-28 at e103175)

47 - + graph: fix coloring around octopus merges

48 -

49 -

50 -* jc/upload-pack-send-symref (2013-10-22) 10 commits

51 - (merged to 'next' on 2013-10-23 at 8ef5660)

52 - + t5570: Update for clone-progress-to-stderr branch

53 - + Merge branch 'jk/clone-progress-to-stderr' into jc/upload-pack-send-symref

54 - + t5570: Update for symref capability

55 - (merged to 'next' on 2013-10-16 at eb1ae25)

56 - + clone: test the new HEAD detection logic

57 - + connect: annotate refs with their symref information in get_remote_head()

58 - + connect.c: make parse_feature_value() static

59 - + upload-pack: send non-HEAD symbolic refs

60 - + upload-pack: send symbolic ref information as capability

61 - + upload-pack.c: do not pass confusing cb_data to mark_our_ref()

62 - + t5505: fix "set-head --auto with ambiguous HEAD" test

63 -

64 - One long-standing flaw in the pack transfer protocol used by "git

65 - clone" was that there was no way to tell the other end which branch

66 - "HEAD" points at, and the receiving end needed to guess. A new

67 - capability has been defined in the pack protocol to convey this

68 - information so that cloning from a repository with more than one

69 - branches pointing at the same commit where the HEAD is at now

70 - reliably sets the initial branch in the resulting repository.

71 -

72 -

73 -* jk/date-c-double-semicolon (2013-10-24) 1 commit

74 - (merged to 'next' on 2013-10-28 at 00ce440)

75 - + drop redundant semicolon in empty while

76 -

77 -

78 -* jk/http-auth-redirects (2013-10-24) 10 commits

79 - (merged to 'next' on 2013-10-24 at 4bebb66)

80 - + http.c: Spell the null pointer as NULL

81 - + remote-curl: rewrite base url from info/refs redirects

82 - + remote-curl: store url as a strbuf

83 - + remote-curl: make refs_url a strbuf

84 - + http: update base URLs when we see redirects

85 - + http: provide effective url to callers

86 - + http: hoist credential request out of handle_curl_result

87 - (merged to 'next' on 2013-10-14 at a0642be)

88 - + http: refactor options to http_get_*

89 - + http_request: factor out curlinfo_strbuf

90 - + http_get_file: style fixes

91 -

92 - Handle the case where http transport gets redirected during the

93 - authorization request better.

94 -

95 -

96 -* jk/refs-c-squelch-gcc (2013-10-24) 1 commit

97 - (merged to 'next' on 2013-10-28 at d15f7c2)

98 - + silence gcc array-bounds warning

99 -

100 -

101 -* jl/pack-transfer-avoid-double-close (2013-10-23) 1 commit

102 - (merged to 'next' on 2013-10-28 at 4a55bba)

103 - + Clear fd after closing to avoid double-close error

32 +* ap/remote-hg-unquote-cquote (2013-10-23) 1 commit

33 + (merged to 'next' on 2013-10-28 at 6b99fd5)

34 + + remote-hg: unquote C-style paths when exporting

35

105 - The codepath that send_pack() calls pack_objects() mistakenly

106 - closed the same file descriptor twice, leading to potentially

107 - closing a wrong file descriptor that was opened in the meantime.

36 + A fast-import stream expresses a pathname with funny characters by

37 + quoting them in C style; remote-hg remote helper forgot to unquote

38 + such a path.

39

40

110 -* mm/checkout-auto-track-fix (2013-10-18) 2 commits

111 - (merged to 'next' on 2013-10-28 at f4594ba)

112 - + checkout: proper error message on 'git checkout foo bar --'

113 - + checkout: allow dwim for branch creation for "git checkout $branch --"

41 +* jk/for-each-ref-skip-parsing (2013-10-30) 1 commit

42 + (merged to 'next' on 2013-10-30 at 56ea310)

43 + + for-each-ref: avoid loading objects to print %(objectname)

44

115 - "git checkout topic", when there is not yet a local "topic" branch

116 - but there is a unique remote-tracking branch for a remote "topic"

117 - branch, pretended as if "git checkout -t -b topic remote/$r/topic"

118 - (for that unique remote $r) was run. This hack however was not

119 - implemented for "git checkout topic --".

45

46 +* jk/pack-corruption-post-mortem (2013-10-25) 1 commit

47 + (merged to 'next' on 2013-10-30 at 2248df6)

48 + + howto: add article on recovering a corrupted object

49

122 -* nd/gc-lock-against-each-other (2013-10-18) 1 commit

123 - (merged to 'next' on 2013-10-28 at 14bd458)

124 - + gc: remove gc.pid file at end of execution

50

51 +* jk/reset-p-current-head-fix (2013-10-25) 2 commits

52 + (merged to 'next' on 2013-10-30 at 37ae6e0)

53 + + reset: pass real rev name to add--interactive

54 + + add-interactive: handle unborn branch in patch mode

55

127 -* nd/lift-path-max (2013-10-24) 2 commits

128 - (merged to 'next' on 2013-10-28 at 07698af)

129 - + checkout_entry(): clarify the use of topath[] parameter

130 - + entry.c: convert checkout_entry to use strbuf

56 + "git reset -p HEAD" has codepath to special case it from resetting

57 + to contents of other commits, but recent change broke it.

58

59

133 -* nd/magic-pathspec (2013-10-22) 1 commit

134 - (merged to 'next' on 2013-10-28 at 50eda68)

135 - + Fix calling parse_pathspec with no paths nor PATHSPEC_PREFER_* flags

60 +* jl/submodule-mv (2013-10-13) 1 commit

61 + (merged to 'next' on 2013-10-28 at 8dc9b31)

62 + + mv: Fix spurious warning when moving a file in presence of submodules

63

137 - All callers to parse_pathspec() must choose between getting no

138 - pathspec or one path that is limited to the current directory

139 - when there is no paths given on the command line, but there were

140 - two callers that violated this rule, triggering a BUG().

64 + Moving a regular file in a repository with a .gitmodules file was

65 + producing a warning 'Could not find section in .gitmodules where

66 + path=<filename>'.

67

68

143 -* sb/git-svn-docs-indent-with-ht (2013-10-22) 1 commit

144 - (merged to 'next' on 2013-10-28 at 8a952d1)

145 - + git-svn docs: Use tabs consistently within the ascii doc

69 +* js/test-help-format-windows-port-fix (2013-10-30) 1 commit

70 + (merged to 'next' on 2013-10-30 at b98e991)

71 + + t3200: do not open a HTML manual page when DEFAULT_MAN_FORMAT is html

72

73

148 -* sg/t3600-nul-sha1-fix (2013-10-16) 1 commit

149 - (merged to 'next' on 2013-10-28 at ac4b703)

150 - + t3600: fix broken "choking git rm" test

74 +* js/tests-windows-port-fix (2013-10-28) 3 commits

75 + (merged to 'next' on 2013-10-30 at 61f8e24)

76 + + tests: undo special treatment of CRLF for Windows

77 + + Windows: a test_cmp that is agnostic to random LF <> CRLF conversions

78 + + t5300-pack-object: do not compare binary data using test_cmp

79

80

153 -* tr/gitk-doc-update (2013-10-22) 1 commit

154 - (merged to 'next' on 2013-10-28 at f4158b8)

155 - + Documentation: revamp gitk(1)

81 +* rs/web-browse-xdg-open (2013-10-30) 1 commit

82 + (merged to 'next' on 2013-10-30 at 37d6eb4)

83 + + web--browse: Add support for xdg-open

84

85

158 -* tr/valgrind-test-fix (2013-10-22) 2 commits

159 - (merged to 'next' on 2013-10-28 at 4d3f31a)

160 - + Revert "test-lib: allow prefixing a custom string before "ok N" etc."

161 - + Revert "test-lib: support running tests under valgrind in parallel"

86 +* sb/refs-code-cleanup (2013-10-28) 2 commits

87 + (merged to 'next' on 2013-10-30 at a9bf06a)

88 + + cache: remove unused function 'have_git_dir'

89 + + refs: remove unused function invalidate_ref_cache

90

91 --------------------------------------------------

92 [New Topics]

93

166 -* jn/test-prereq-perl-doc (2013-10-28) 1 commit

167 - - t/README: tests can use perl even with NO_PERL

94 +* fc/trivial (2013-10-31) 13 commits

95 + - setup: trivial style fixes

96 + - run-command: trivial style fixes

97 + - diff: trivial style fix

98 + - revision: trivial style fixes

99 + - pretty: trivial style fix

100 + - describe: trivial style fixes

101 + - transport-helper: trivial style fix

102 + - sha1-name: trivial style cleanup

103 + - branch: trivial style fix

104 + - revision: add missing include

105 + - doc/pull: clarify the illustrations

106 + - t: replace pulls with merges

107 + - merge: simplify ff-only option

108 +

109 + A random collection of style fixes and minor doc updates.

110

111 Will merge to 'next'.

112

113

172 -* ak/cvsserver-stabilize-use-of-hash-keys (2013-10-30) 1 commit

173 - - cvsserver: Determinize output to combat Perl 5.18 hash randomization

114 +* jk/duplicate-objects-in-packs (2013-10-31) 1 commit

115 + (merged to 'next' on 2013-11-01 at 8951339)

116 + + Fix '\%o' for printf from coreutils

117

175 - Will merge to 'next'.

176 -

177 -

178 -* jk/replace-perl-in-built-scripts (2013-10-29) 1 commit

179 - - use @@PERL@@ in built scripts

180 -

181 - Will merge to 'next'.

118 + Test fixup to a topic recently graduated.

119

120 + Will merge to 'master'.

121

184 -* jk/subtree-install-fix (2013-10-30) 1 commit

185 - - subtree: add makefile target for html docs

122

187 - Will merge to 'next'.

123 +* rr/for-each-ref-decoration (2013-10-31) 4 commits

124 + - fixup! for-each-ref: introduce %(upstream:track[short])

125 + - for-each-ref: introduce %(upstream:track[short])

126 + - for-each-ref: introduce %(HEAD) asterisk marker

127 + - for-each-ref: introduce %C(...) for color

128

129

190 -* jk/wrap-perl-used-in-tests (2013-10-29) 2 commits

191 - - t: use perl instead of "$PERL_PATH" where applicable

192 - - t: provide a perl() function which uses $PERL_PATH

130 +* vd/doc-unpack-objects (2013-11-01) 2 commits

131 + (merged to 'next' on 2013-11-01 at 443d0f4)

132 + + Documentation: "pack-file" is not literal in unpack-objects

133 + + Documentation: restore a space in unpack-objects usage

134

194 - Will merge to 'next'.

135 + Will merge to 'master'.

136

137

197 -* jt/commit-fixes-footer (2013-10-30) 1 commit

198 - - commit: Add -f, --fixes <commit> option to add Fixes: line

138 +* jk/two-way-merge-corner-case-fix (2013-11-01) 3 commits

139 + - t1005: add test for "read-tree --reset -u A B"

140 + - t1005: reindent

141 + - unpack-trees: fix "read-tree -u --reset A B" with conflicted index

142

200 - There is an ongoing discussion around this topic; in general I am

201 - fairly negative on a new feature that is too narrow and prefer a

202 - more generic solution that can be tailored for specific needs, as

203 - many people stated in the thread.

143 + Fix a rather longstanding corner-case bug in twoway "reset to

144 + there" merge, which is most often seen in "git am --abort".

145

146 --------------------------------------------------

147 [Stalled]

@@ -254,18 +195,6 @@ of the repositories listed at

195 I am not sure if that is solving a right problem, though.

196

197

257 -* jc/ref-excludes (2013-09-03) 2 commits

258 - - document --exclude option

259 - - revision: introduce --exclude=<glob> to tame wildcards

260 -

261 - People often wished a way to tell "git log --branches" (and "git

262 - log --remotes --not --branches") to exclude some local branches

263 - from the expansion of "--branches" (similarly for "--tags", "--all"

264 - and "--glob=<pattern>"). Now they have one.

265 -

266 - Needs a matching change to rev-parse.

267 -

268 -

198 * rv/send-email-cache-generated-mid (2013-08-21) 2 commits

199 - git-send-email: Cache generated message-ids, use them when prompting

200 - git-send-email: add optional 'choices' parameter to the ask sub

@@ -318,118 +247,151 @@ of the repositories listed at

247 --------------------------------------------------

248 [Cooking]

249

321 -* sc/doc-howto-dumb-http (2013-10-28) 1 commit

322 - - doc/howto: warn about (dumb)http server document being too old

250 +* jc/ref-excludes (2013-11-01) 5 commits

251 + - rev-parse: introduce --exclude=<glob> to tame wildcards

252 + - rev-list --exclude: export add/clear-ref-exclusion and ref-excluded API

253 + - rev-list --exclude: tests

254 + - document --exclude option

255 + - revision: introduce --exclude=<glob> to tame wildcards

256

324 - Will merge to 'next'.

257 + People often wished a way to tell "git log --branches" (and "git

258 + log --remotes --not --branches") to exclude some local branches

259 + from the expansion of "--branches" (similarly for "--tags", "--all"

260 + and "--glob=<pattern>"). Now they have one.

261

262

327 -* bw/solaris-sed-tr-test-portability (2013-10-30) 2 commits

328 - - Avoid difference in tr semantics between System V and BSD

329 - - Change sed i\ usage to something Solaris' sed can handle

263 +* jn/test-prereq-perl-doc (2013-10-28) 1 commit

264 + (merged to 'next' on 2013-11-01 at 4d4a8b4)

265 + + t/README: tests can use perl even with NO_PERL

266

331 - The bottom one may want to lose the "\<nl>" that seems to be a

332 - no-op.

267 + Will merge to 'master'.

268

269

335 -* fc/transport-helper-fixes (2013-10-28) 13 commits

336 - - test: remote-helper: add test for force pushes

337 - - git-remote-testgit: support the new 'force' option

338 - - fixup! transport-helper: add 'force' to 'export' helpers

339 - - transport-helper: don't update refs in dry-run

340 - - transport-helper: add support to delete branches

341 - - fast-export: add support to delete refs

342 - - fast-import: add support to delete refs

343 - - transport-helper: add support for old:new refspec

344 - - fast-export: add new --refspec option

345 - - fast-export: improve argument parsing

346 - - transport-helper: check for 'forced update' message

347 - - transport-helper: fix extra lines

348 - - transport-helper: add 'force' to 'export' helpers

270 +* ak/cvsserver-stabilize-use-of-hash-keys (2013-10-30) 1 commit

271 + (merged to 'next' on 2013-11-01 at cc3b890)

272 + + cvsserver: Determinize output to combat Perl 5.18 hash randomization

273

350 - This may need to be rerolled, taking review comments and

351 - discussions into account.

274 + Will merge to 'master'.

275

276

354 -* jh/loose-object-dirs-creation-race (2013-10-28) 1 commit

355 - - sha1_file.c:create_tmpfile(): Fix race when creating loose object dirs

277 +* jk/replace-perl-in-built-scripts (2013-10-29) 1 commit

278 + (merged to 'next' on 2013-11-01 at 2384e29)

279 + + use @@PERL@@ in built scripts

280

357 - Will merge to 'next'.

281 + Will cook in 'next'.

282

283

360 -* js/test-help-format-windows-port-fix (2013-10-30) 1 commit

361 - (merged to 'next' on 2013-10-30 at b98e991)

362 - + t3200: do not open a HTML manual page when DEFAULT_MAN_FORMAT is html

284 +* jk/subtree-install-fix (2013-10-30) 1 commit

285 + (merged to 'next' on 2013-11-01 at 531bd79)

286 + + subtree: add makefile target for html docs

287

288 Will merge to 'master'.

289

290

367 -* js/tests-windows-port-fix (2013-10-28) 3 commits

368 - (merged to 'next' on 2013-10-30 at 61f8e24)

369 - + tests: undo special treatment of CRLF for Windows

370 - + Windows: a test_cmp that is agnostic to random LF <> CRLF conversions

371 - + t5300-pack-object: do not compare binary data using test_cmp

291 +* jk/wrap-perl-used-in-tests (2013-10-29) 2 commits

292 + (merged to 'next' on 2013-11-01 at 73444c5)

293 + + t: use perl instead of "$PERL_PATH" where applicable

294 + + t: provide a perl() function which uses $PERL_PATH

295

296 Will merge to 'master'.

297

298

376 -* nd/liteal-pathspecs (2013-10-28) 1 commit

377 - - pathspec: stop --*-pathspecs impact on internal parse_pathspec() uses

299 +* jt/commit-fixes-footer (2013-10-30) 1 commit

300 + - commit: Add -f, --fixes <commit> option to add Fixes: line

301

379 - Will merge to 'next'.

302 + There is an ongoing discussion around this topic; in general I am

303 + fairly negative on a new feature that is too narrow and prefer a

304 + more generic solution that can be tailored for specific needs, as

305 + many people stated in the thread.

306

307

382 -* rs/web-browse-xdg-open (2013-10-30) 1 commit

383 - (merged to 'next' on 2013-10-30 at 37d6eb4)

384 - + web--browse: Add support for xdg-open

308 +* sc/doc-howto-dumb-http (2013-10-28) 1 commit

309 + (merged to 'next' on 2013-11-01 at a734b6e)

310 + + doc/howto: warn about (dumb)http server document being too old

311

312 Will merge to 'master'.

313

314

389 -* sb/refs-code-cleanup (2013-10-28) 2 commits

390 - (merged to 'next' on 2013-10-30 at a9bf06a)

391 - + cache: remove unused function 'have_git_dir'

392 - + refs: remove unused function invalidate_ref_cache

315 +* bw/solaris-sed-tr-test-portability (2013-10-30) 2 commits

316 + (merged to 'next' on 2013-11-01 at f04be9a)

317 + + Avoid difference in tr semantics between System V and BSD

318 + + Change sed i\ usage to something Solaris' sed can handle

319

320 Will merge to 'master'.

321

322

397 -* th/reflog-annotated-tag (2013-10-28) 1 commit

398 - - reflog: handle lightweight and annotated tags equally

323 +* fc/transport-helper-fixes (2013-11-01) 11 commits

324 + - transport-helper: demote lack of "force" option to a warning

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

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

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

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

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

330 + - fast-export: improve argument parsing

331 + - transport-helper: check for 'forced update' message

332 + - transport-helper: add 'force' to 'export' helpers

333 + - transport-helper: don't update refs in dry-run

334 + - transport-helper: mismerge fix

335 +

336 + Updates transport-helper, fast-import and fast-export to allow the

337 + ref mapping and ref deletion in a way similar to the natively

338 + supported transports.

339

340 Will merge to 'next'.

341

342

343 +* jh/loose-object-dirs-creation-race (2013-10-28) 1 commit

344 + (merged to 'next' on 2013-11-01 at 3169b0f)

345 + + sha1_file.c:create_tmpfile(): Fix race when creating loose object dirs

346 +

347 + Will cook in 'next'.

348 +

349 +

350 +* nd/liteal-pathspecs (2013-10-28) 1 commit

351 + (merged to 'next' on 2013-11-01 at 1a91775)

352 + + pathspec: stop --*-pathspecs impact on internal parse_pathspec() uses

353 +

354 + Will cook in 'next'.

355 +

356 +

357 +* th/reflog-annotated-tag (2013-10-28) 1 commit

358 + (merged to 'next' on 2013-11-01 at 8b154cc)

359 + + reflog: handle lightweight and annotated tags equally

360 +

361 + "git log -g $annotated_tag", when there is no reflog history, should

362 + have produced a single output entry (i.e. the ref creation event),

363 + but instead showed the history leading to the tag.

364 +

365 + Will merge to 'master'.

366 +

367 +

368 * tr/merge-recursive-index-only (2013-10-28) 3 commits

369 - merge-recursive: -Xindex-only to leave worktree unchanged

370 - merge-recursive: internal flag to avoid touching the worktree

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

372

373

409 -* bc/http-100-continue (2013-10-29) 1 commit

410 - - remote-curl: fix large pushes with GSSAPI

374 +* bc/http-100-continue (2013-10-31) 3 commits

375 + (merged to 'next' on 2013-11-01 at e12ae23)

376 + + remote-curl: fix large pushes with GSSAPI

377 + + remote-curl: pass curl slot_results back through run_slot

378 + + http: return curl's AUTHAVAIL via slot_results

379

412 - Conditionally allow "100 Continue" responses to help use of

413 - GSS-Negotiate authentication scheme over HTTP transport.

380 + Issue "100 Continue" responses to help use of GSS-Negotiate

381 + authentication scheme over HTTP transport when needed.

382

415 - Still being updated, but it seems like we are getting there.

383 + Will cook in 'next'.

384

385

386 * jc/merge-base-reflog (2013-10-29) 2 commits

419 - - merge-base: teach "--fork-point" mode

420 - - merge-base: use OPT_CMDMODE and clarify the command line parsing

387 + (merged to 'next' on 2013-11-01 at 6114764)

388 + + merge-base: teach "--fork-point" mode

389 + + merge-base: use OPT_CMDMODE and clarify the command line parsing

390

391 Code the logic in "pull --rebase" that figures out a fork point

392 from reflog entries in C.

393

425 - Will merge to 'next'.

426 -

427 -

428 -* jk/for-each-ref-skip-parsing (2013-10-30) 1 commit

429 - (merged to 'next' on 2013-10-30 at 56ea310)

430 - + for-each-ref: avoid loading objects to print %(objectname)

431 -

432 - Will merge to 'master'.

394 + Will cook in 'next'.

395

396

397 * jk/pack-bitmap (2013-10-30) 20 commits

@@ -462,14 +424,15 @@ of the repositories listed at

424

425

426 * jk/robustify-parse-commit (2013-10-24) 6 commits

465 - - checkout: do not die when leaving broken detached HEAD

466 - - use parse_commit_or_die instead of custom message

467 - - use parse_commit_or_die instead of segfaulting

468 - - assume parse_commit checks for NULL commit

469 - - assume parse_commit checks commit->object.parsed

470 - - log_tree_diff: die when we fail to parse a commit

427 + (merged to 'next' on 2013-11-01 at 2bfbaab)

428 + + checkout: do not die when leaving broken detached HEAD

429 + + use parse_commit_or_die instead of custom message

430 + + use parse_commit_or_die instead of segfaulting

431 + + assume parse_commit checks for NULL commit

432 + + assume parse_commit checks commit->object.parsed

433 + + log_tree_diff: die when we fail to parse a commit

434

472 - Will merge to 'next' after taking another look.

435 + Will cook in 'next'.

436

437

438 * mh/fetch-tags-in-addition-to-normal-refs (2013-10-30) 23 commits

@@ -500,43 +463,15 @@ of the repositories listed at

463 Will merge to 'next' after taking another look.

464

465

503 -* jk/pack-corruption-post-mortem (2013-10-25) 1 commit

504 - (merged to 'next' on 2013-10-30 at 2248df6)

505 - + howto: add article on recovering a corrupted object

506 -

507 - Will merge to 'master'.

508 -

509 -

510 -* jk/reset-p-current-head-fix (2013-10-25) 2 commits

511 - (merged to 'next' on 2013-10-30 at 37ae6e0)

512 - + reset: pass real rev name to add--interactive

513 - + add-interactive: handle unborn branch in patch mode

514 -

515 - "git reset -p HEAD" has codepath to special case it from resetting

516 - to contents of other commits, but recent change broke it.

517 -

518 - Will merge to 'master'.

519 -

520 -

521 -* nv/parseopt-opt-arg (2013-10-25) 1 commit

522 - - rev-parse --parseopt: add the --sticked-long mode

466 +* nv/parseopt-opt-arg (2013-10-31) 2 commits

467 + (merged to 'next' on 2013-11-01 at cd2afd9)

468 + + rev-parse --parseopt: add the --stuck-long mode

469 + + Use the word 'stuck' instead of 'sticked'

470

471 Enhance "rev-parse --parseopt" mode to help parsing options with

472 an optional parameter.

473

527 - Option name bikeshedding aside ("Is it sticked or stuck?"), the

528 - change seems to be competently done.

529 -

530 -

531 -* ap/remote-hg-unquote-cquote (2013-10-23) 1 commit

532 - (merged to 'next' on 2013-10-28 at 6b99fd5)

533 - + remote-hg: unquote C-style paths when exporting

534 -

535 - A fast-import stream expresses a pathname with funny characters by

536 - quoting them in C style; remote-hg remote helper forgot to unquote

537 - such a path.

538 -

539 - Will merge to 'master'.

474 + Will cook in 'next'.

475

476

477 * ak/submodule-foreach-quoting (2013-09-27) 1 commit

@@ -564,17 +499,6 @@ of the repositories listed at

499 Will cook in 'next' for the rest of this cycle.

500

501

567 -* jl/submodule-mv (2013-10-13) 1 commit

568 - (merged to 'next' on 2013-10-28 at 8dc9b31)

569 - + mv: Fix spurious warning when moving a file in presence of submodules

570 -

571 - Moving a regular file in a repository with a .gitmodules file was

572 - producing a warning 'Could not find section in .gitmodules where

573 - path=<filename>'.

574 -

575 - Will merge to 'master'.

576 -

577 -

502 * kb/fast-hashmap (2013-10-22) 12 commits

503 - remove old hash.[ch] implementation

504 - read-cache.c: fix memory leaks caused by removed cache entries

@@ -631,6 +555,7 @@ of the repositories listed at

555

556

557 * jc/hold-diff-remove-q-synonym-for-no-deletion (2013-07-19) 1 commit

634 - - diff: remove "diff-files -q" in a version of Git in a distant future

558 + (merged to 'next' on 2013-11-01 at 5fc26e4)

559 + + diff: remove "diff-files -q" in a version of Git in a distant future

560

636 - Will merge to and cook in 'next' until a distant future.

561 + Will cook in 'next' until a distant future.

What's cooking (2013/11 #01)