f248a92d29 · matheusbsbs/matheus-bagliano

@@ -1,21 +1,23 @@

1 To: git@vger.kernel.org

2 Bcc: lwn@lwn.net

3 -Subject: What's cooking in git.git (Nov 2012, #05; Fri, 16)

4 -X-master-at: 5a90748f2856f587a948148a9b6fad50a43df57c

5 -X-next-at: e7909caa037a3472e4c34fa47f04758920bd6c91

3 +Subject: What's cooking in git.git (Nov 2012, #06; Mon, 19)

4 +X-master-at: f3828dc0669826660f5034a468913115675ff501

5 +X-next-at: 0037290f177c95a7fd401d8dfe453851e0840c9d

6

7 -What's cooking in git.git (Nov 2012, #05; Fri, 16)

7 +What's cooking in git.git (Nov 2012, #06; Mon, 19)

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

9

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

11 '-' are only in 'pu' (proposed updates) while commits prefixed with

12 '+' are in 'next'.

13

14 -Big thanks go to Jeff who curated topics in flight while I was on

15 -vacation. I merged a couple of topics to 'next', and made the fifth

16 -batch of topics graduate to 'master'. Over the weekend, I'll start

17 -merging maintenance topics to 'maint' in preparation for cutting

18 -1.8.1, hopefully sometime late next week.

14 +Bunch of topics have been merged to 'next'.

15 +

16 +We are at the beginning of the 5th week of this release cycle

17 +(cf. http://tinyurl.com/gitcal), and I've moved many topics to the

18 +Stalled category, which will be discarded without prejudice soonish

19 +unless there are some updates. I am still a bit behind on some

20 +topics and already posted rerolls may have to be pulled in.

21

22 You can find the changes described here in the integration branches of the

23 repositories listed at

@@ -23,168 +25,154 @@ repositories listed at

25 http://git-blame.blogspot.com/p/git-public-repositories.html

26

27 --------------------------------------------------

26 -[Graduated to "master"]

27 -

28 -* as/maint-doc-fix-no-post-rewrite (2012-11-02) 1 commit

29 - (merged to 'next' on 2012-11-09 at 117a91e)

30 - + commit: fixup misplacement of --no-post-rewrite description

31 -

32 -

33 -* cr/cvsimport-local-zone (2012-11-04) 2 commits

34 - (merged to 'next' on 2012-11-04 at 292f0b4)

35 - + cvsimport: work around perl tzset issue

36 - + git-cvsimport: allow author-specific timezones

37 -

38 - Allows "cvsimport" to read per-author timezone from the author info

39 - file.

40 -

41 -

42 -* jc/maint-fetch-tighten-refname-check (2012-10-19) 1 commit

43 - (merged to 'next' on 2012-11-04 at eda85ef)

44 - + get_fetch_map(): tighten checks on dest refs

45 -

46 - This was split out from discarded jc/maint-push-refs-all topic.

47 -

48 -

49 -* jc/prettier-pretty-note (2012-11-13) 12 commits

50 - (merged to 'next' on 2012-11-14 at 7230f26)

51 - + format-patch: add a blank line between notes and diffstat

52 - (merged to 'next' on 2012-11-04 at 40e3e48)

53 - + Doc User-Manual: Patch cover letter, three dashes, and --notes

54 - + Doc format-patch: clarify --notes use case

55 - + Doc notes: Include the format-patch --notes option

56 - + Doc SubmittingPatches: Mention --notes option after "cover letter"

57 - + Documentation: decribe format-patch --notes

58 - + format-patch --notes: show notes after three-dashes

59 - + format-patch: append --signature after notes

60 - + pretty_print_commit(): do not append notes message

61 - + pretty: prepare notes message at a centralized place

62 - + format_note(): simplify API

63 - + pretty: remove reencode_commit_message()

64 -

65 - Emit the notes attached to the commit in "format-patch --notes"

66 - output after three-dashes.

67 -

68 -

69 -* jc/same-encoding (2012-11-04) 1 commit

70 - (merged to 'next' on 2012-11-04 at 54991f2)

71 - + reencode_string(): introduce and use same_encoding()

72 -

73 - Various codepaths checked if two encoding names are the same using

74 - ad-hoc code and some of them ended up asking iconv() to convert

75 - between "utf8" and "UTF-8". The former is not a valid way to spell

76 - the encoding name, but often people use it by mistake, and we

77 - equated them in some but not all codepaths. Introduce a new helper

78 - function to make these codepaths consistent.

79 -

80 -

81 -* jh/symbolic-ref-d (2012-10-21) 1 commit

82 - (merged to 'next' on 2012-11-04 at b0762f5)

83 - + git symbolic-ref --delete $symref

84 -

85 - Add "symbolic-ref -d SYM" to delete a symbolic ref SYM.

86 -

87 - It is already possible to remove a symbolic ref with "update-ref -d

88 - --no-deref", but it may be a good addition for completeness.

89 -

28 +[New Topics]

29

91 -* jk/maint-diff-grep-textconv (2012-10-28) 1 commit

92 - (merged to 'next' on 2012-11-04 at 790337b)

93 - + diff_grep: use textconv buffers for add/deleted files

94 - (this branch is used by jk/pickaxe-textconv.)

30 +* nd/pathspec-wildcard (2012-11-19) 4 commits

31 + - tree_entry_interesting: do basedir compare on wildcard patterns when possible

32 + - pathspec: apply "*.c" optimization from exclude

33 + - pathspec: do exact comparison on the leading non-wildcard part

34 + - pathspec: save the non-wildcard length part

35

96 - Fixes inconsistent use of textconv with "git log -G".

36 +--------------------------------------------------

37 +[Stalled]

38

39 +* pf/editor-ignore-sigint (2012-11-11) 5 commits

40 + - launch_editor: propagate SIGINT from editor to git

41 + - run-command: do not warn about child death by SIGINT

42 + - run-command: drop silent_exec_failure arg from wait_or_whine

43 + - launch_editor: ignore SIGINT while the editor has control

44 + - launch_editor: refactor to use start/finish_command

45

99 -* js/hp-nonstop (2012-10-30) 1 commit

100 - (merged to 'next' on 2012-11-09 at fe58205)

101 - + fix 'make test' for HP NonStop

46 + Avoid confusing cases where the user hits Ctrl-C while in the editor

47 + session, not realizing git will receive the signal. Since most editors

48 + will take over the terminal and will block SIGINT, this is not likely

49 + to confuse anyone.

50

51 + Some people raised issues with emacsclient, which are addressed by this

52 + re-roll. It should probably also handle SIGQUIT, and there were a

53 + handful of other review comments.

54

104 -* mg/maint-pull-suggest-upstream-to (2012-11-08) 1 commit

105 - (merged to 'next' on 2012-11-13 at bd74252)

106 - + push/pull: adjust missing upstream help text to changed interface

55 + Expecting a re-roll.

56

108 - Follow-on to the new "--set-upstream-to" topic from v1.8.0 to avoid

109 - suggesting the deprecated "--set-upstream".

57

58 +* pp/gitweb-config-underscore (2012-11-08) 1 commit

59 + - gitweb: make remote_heads config setting work

60

112 -* mh/notes-string-list (2012-11-08) 5 commits

113 - (merged to 'next' on 2012-11-09 at 7a4c58c)

114 - + string_list_add_refs_from_colon_sep(): use string_list_split()

115 - + notes: fix handling of colon-separated values

116 - + combine_notes_cat_sort_uniq(): sort and dedup lines all at once

117 - + Initialize sort_uniq_list using named constant

118 - + string_list: add a function string_list_remove_empty_items()

61 + The key "gitweb.remote_heads" is not legal git config; this maps it to

62 + "gitweb.remoteheads".

63

120 - Improve the asymptotic performance of the cat_sort_uniq notes merge

121 - strategy.

64 + Junio raised a good point about the implementation for three-level

65 + variables.

66

67 + Expecting a re-roll.

68

124 -* mh/strbuf-split (2012-11-04) 4 commits

125 - (merged to 'next' on 2012-11-09 at fa984b1)

126 - + strbuf_split*(): document functions

127 - + strbuf_split*(): rename "delim" parameter to "terminator"

128 - + strbuf_split_buf(): simplify iteration

129 - + strbuf_split_buf(): use ALLOC_GROW()

69

131 - Cleanups and documentation for strbuf_split.

70 +* mo/cvs-server-updates (2012-10-16) 10 commits

71 + - cvsserver Documentation: new cvs ... -r support

72 + - cvsserver: add t9402 to test branch and tag refs

73 + - cvsserver: support -r and sticky tags for most operations

74 + - cvsserver: Add version awareness to argsfromdir

75 + - cvsserver: generalize getmeta() to recognize commit refs

76 + - cvsserver: implement req_Sticky and related utilities

77 + - cvsserver: add misc commit lookup, file meta data, and file listing functions

78 + - cvsserver: define a tag name character escape mechanism

79 + - cvsserver: cleanup extra slashes in filename arguments

80 + - cvsserver: factor out git-log parsing logic

81

82 + Needs review by folks interested in cvsserver.

83

134 -* mm/maint-doc-commit-edit (2012-11-02) 1 commit

135 - (merged to 'next' on 2012-11-09 at 8dab7f5)

136 - + Document 'git commit --no-edit' explicitly

84

85 +* jc/apply-trailing-blank-removal (2012-10-12) 1 commit

86 + - apply.c:update_pre_post_images(): the preimage can be truncated

87

139 -* ph/submodule-sync-recursive (2012-10-29) 2 commits

140 - (merged to 'next' on 2012-11-04 at a000f78)

141 - + Add tests for submodule sync --recursive

142 - + Teach --recursive to submodule sync

88 + Fix to update_pre_post_images() that did not take into account the

89 + possibility that whitespace fix could shrink the preimage and

90 + change the number of lines in it.

91

144 - Adds "--recursive" option to submodule sync.

92 + Extra set of eyeballs appreciated.

93

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

147 -[New Topics]

94

149 -* jl/submodule-rm (2012-11-14) 1 commit

150 - - docs: move submodule section

95 +* jn/warn-on-inaccessible-loosen (2012-10-14) 4 commits

96 + - config: exit on error accessing any config file

97 + - doc: advertise GIT_CONFIG_NOSYSTEM

98 + - config: treat user and xdg config permission problems as errors

99 + - config, gitignore: failure to access with ENOTDIR is ok

100

152 - Documentation correction for d21240f (Merge branch

153 - 'jl/submodule-rm', 2012-10-29) that needs to be fast-tracked.

101 + An RFC to deal with a situation where .config/git is a file and we

102 + notice .config/git/config is not readable due to ENOTDIR, not

103 + ENOENT; I think a bit more refactored approach to consistently

104 + address permission errors across config, exclude and attrs is

105 + desirable. Don't we also need a check for an opposite situation

106 + where we open .config/git/config or .gitattributes for reading but

107 + they turn out to be directories?

108

155 - Will merge to 'next' and soon to 'master'.

109

110 +* as/check-ignore (2012-11-08) 14 commits

111 + - t0007: fix tests on Windows

112 + - Documentation/check-ignore: we show the deciding match, not the first

113 + - Add git-check-ignore sub-command

114 + - dir.c: provide free_directory() for reclaiming dir_struct memory

115 + - pathspec.c: move reusable code from builtin/add.c

116 + - dir.c: refactor treat_gitlinks()

117 + - dir.c: keep track of where patterns came from

118 + - dir.c: refactor is_path_excluded()

119 + - dir.c: refactor is_excluded()

120 + - dir.c: refactor is_excluded_from_list()

121 + - dir.c: rename excluded() to is_excluded()

122 + - dir.c: rename excluded_from_list() to is_excluded_from_list()

123 + - dir.c: rename path_excluded() to is_path_excluded()

124 + - dir.c: rename cryptic 'which' variable to more consistent name

125

158 -* sg/complete-help-undup (2012-11-14) 1 commit

159 - - completion: remove 'help' duplicate from porcelain commands

126 + Duy helped to reroll this.

127

161 - Will merge to 'next' and soon to 'master'.

128 + Expecting a re-roll.

129

130

164 -* bc/do-not-recurse-in-die (2012-11-15) 1 commit

165 - - usage.c: detect recursion in die routines and bail out immediately

131 +* aw/rebase-am-failure-detection (2012-10-11) 1 commit

132 + - rebase: Handle cases where format-patch fails

133

167 - Will merge to 'next'.

134 + I am unhappy a bit about the possible performance implications of

135 + having to store the output in a temporary file only for a rare case

136 + of format-patch aborting.

137

138

170 -* cn/config-missing-path (2012-11-15) 1 commit

171 - - config: don't segfault when given --path with a missing value

139 +* jk/lua-hackery (2012-10-07) 6 commits

140 + - pretty: fix up one-off format_commit_message calls

141 + - Minimum compilation fixup

142 + - Makefile: make "lua" a bit more configurable

143 + - add a "lua" pretty format

144 + - add basic lua infrastructure

145 + - pretty: make some commit-parsing helpers more public

146

173 - Will merge to 'next' and soon to 'master'.

147 + Interesting exercise. When we do this for real, we probably would want

148 + to wrap a commit to make it more like an "object" with methods like

149 + "parents", etc.

150

151

176 -* jk/checkout-out-of-unborn (2012-11-15) 1 commit

177 - - checkout: print a message when switching unborn branches

152 +* fc/remote-testgit-feature-done (2012-10-29) 1 commit

153 + - remote-testgit: properly check for errors

154

179 - Will merge to 'next'.

155 + Is this still in "Needs review" state? Are poeple involved in the

156 + remote interface happy with this change?

157

158

182 -* mk/complete-tcsh (2012-11-16) 1 commit

183 - - tcsh-completion re-using git-completion.bash

159 +* jk/send-email-sender-prompt (2012-11-15) 8 commits

160 + - send-email: do not prompt for explicit repo ident

161 + - Git.pm: teach "ident" to query explicitness

162 + - var: provide explicit/implicit ident information

163 + - var: accept multiple variables on the command line

164 + - ident: keep separate "explicit" flags for author and committer

165 + - ident: make user_ident_explicitly_given static

166 + - t7502: factor out autoident prerequisite

167 + - test-lib: allow negation of prerequisites

168

169 + Avoid annoying sender prompt in git-send-email, but only when it is

170 + safe to do so.

171

186 -* mm/status-push-pull-advise (2012-11-16) 1 commit

187 - - status: add advice on how to push/pull to tracking branch

172 + Perhaps keep only the first three patches, and replace the rest

173 + with the one from Felipe that takes a much simpler approach (the

174 + rationale of that patch needs to be cleaned up first, along the

175 + lines Jeff outlined, though). Frozen until that happens.

176

177

178 * nd/unify-appending-of-s-o-b (2012-11-15) 1 commit

@@ -193,8 +181,6 @@ repositories listed at

181 I am not sure if the logic to refrain from adding a sign-off based

182 on the existing run of sign-offs is done correctly in this change.

183

196 ---------------------------------------------------

197 -[Stalled]

184

185 * nd/pretty-placeholder-with-color-option (2012-09-30) 9 commits

186 . pretty: support %>> that steal trailing spaces

@@ -341,30 +327,64 @@ repositories listed at

327 --------------------------------------------------

328 [Cooking]

329

330 +* jl/submodule-rm (2012-11-14) 1 commit

331 + (merged to 'next' on 2012-11-18 at bf4525d)

332 + + docs: move submodule section

333 +

334 + Documentation correction for d21240f (Merge branch

335 + 'jl/submodule-rm', 2012-10-29) that needs to be fast-tracked.

336 +

337 + Will merge to 'master' in the sixth batch.

338 +

339 +

340 +* sg/complete-help-undup (2012-11-14) 1 commit

341 + (merged to 'next' on 2012-11-18 at eadd0f3)

342 + + completion: remove 'help' duplicate from porcelain commands

343 +

344 + Will merge to 'master' in the seventh batch.

345 +

346 +

347 +* bc/do-not-recurse-in-die (2012-11-15) 1 commit

348 + (merged to 'next' on 2012-11-18 at 79d62a8)

349 + + usage.c: detect recursion in die routines and bail out immediately

350 +

351 + Will merge to 'master' in the seventh batch.

352 +

353 +

354 +* cn/config-missing-path (2012-11-15) 1 commit

355 + (merged to 'next' on 2012-11-18 at c08b73c)

356 + + config: don't segfault when given --path with a missing value

357 +

358 + Will merge to 'master' in the sixth batch.

359 +

360 +

361 +* jk/checkout-out-of-unborn (2012-11-15) 1 commit

362 + (merged to 'next' on 2012-11-18 at 7d2aa24)

363 + + checkout: print a message when switching unborn branches

364 +

365 + Will merge to 'master' in the sixth batch.

366 +

367 +

368 +* mk/complete-tcsh (2012-11-16) 1 commit

369 + (merged to 'next' on 2012-11-19 at 8309029)

370 + + tcsh-completion re-using git-completion.bash

371 +

372 + Will merge to 'master' in the seventh batch.

373 +

374 +

375 +* mm/status-push-pull-advise (2012-11-16) 1 commit

376 + - status: add advice on how to push/pull to tracking branch

377 +

378 + Will merge to 'next'.

379 +

380 +

381 * jk/maint-gitweb-xss (2012-11-12) 1 commit

382 (merged to 'next' on 2012-11-14 at 7a667bc)

383 + gitweb: escape html in rss title

384

385 Fixes an XSS vulnerability in gitweb.

386

350 -

351 -* jk/send-email-sender-prompt (2012-11-15) 8 commits

352 - - send-email: do not prompt for explicit repo ident

353 - - Git.pm: teach "ident" to query explicitness

354 - - var: provide explicit/implicit ident information

355 - - var: accept multiple variables on the command line

356 - - ident: keep separate "explicit" flags for author and committer

357 - - ident: make user_ident_explicitly_given static

358 - - t7502: factor out autoident prerequisite

359 - - test-lib: allow negation of prerequisites

360 -

361 - Avoid annoying sender prompt in git-send-email, but only when it is

362 - safe to do so.

363 -

364 - Perhaps keep only the first three patches, and replace the rest

365 - with the one from Felipe that takes a much simpler approach (the

366 - rationale of that patch needs to be cleaned up first, along the

367 - lines Jeff outlined, though).

387 + Will merge to 'master' in the sixth batch.

388

389

390 * mg/replace-resolve-delete (2012-11-13) 1 commit

@@ -373,27 +393,18 @@ repositories listed at

393

394 Be more user friendly to people using "git replace -d".

395

396 + Will merge to 'master' in the sixth batch.

397 +

398

377 -* ml/cygwin-mingw-headers (2012-11-12) 1 commit

399 +* ml/cygwin-mingw-headers (2012-11-18) 2 commits

400 + (merged to 'next' on 2012-11-19 at f9964da)

401 + + USE CGYWIN_V15_WIN32API as macro to select api for cygwin

402 (merged to 'next' on 2012-11-15 at 22e11b3)

403 + Update cygwin.c for new mingw-64 win32 api headers

404

405 Make git work on newer cygwin.

406

383 -

384 -* mo/cvs-server-updates (2012-10-16) 10 commits

385 - - cvsserver Documentation: new cvs ... -r support

386 - - cvsserver: add t9402 to test branch and tag refs

387 - - cvsserver: support -r and sticky tags for most operations

388 - - cvsserver: Add version awareness to argsfromdir

389 - - cvsserver: generalize getmeta() to recognize commit refs

390 - - cvsserver: implement req_Sticky and related utilities

391 - - cvsserver: add misc commit lookup, file meta data, and file listing functions

392 - - cvsserver: define a tag name character escape mechanism

393 - - cvsserver: cleanup extra slashes in filename arguments

394 - - cvsserver: factor out git-log parsing logic

395 -

396 - Needs review by folks interested in cvsserver.

407 + Will merge to 'master' in the sixth batch.

408

409

410 * ta/doc-cleanup (2012-10-25) 6 commits

@@ -409,69 +420,22 @@ repositories listed at

420

421

422 * lt/diff-stat-show-0-lines (2012-10-17) 1 commit

412 - - Fix "git diff --stat" for interesting - but empty - file changes

423 + (merged to 'next' on 2012-11-19 at 0037290)

424 + + Fix "git diff --stat" for interesting - but empty - file changes

425

426 We failed to mention a file without any content change but whose

427 permission bit was modified, or (worse yet) a new file without any

428 content in the "git diff --stat" output.

429

418 - Needs some test updates.

430 + Will merge to 'master' in the seventh batch.

431

432

421 -* fc/zsh-completion (2012-10-29) 3 commits

433 +* fc/zsh-completion (2012-11-19) 2 commits

434 + - completion: start moving to the new zsh completion

435 - completion: add new zsh completion

423 - - completion: add new __gitcompadd helper

424 - - completion: get rid of empty COMPREPLY assignments

425 -

426 - There were some comments on this, but I wasn't clear on the outcome.

427 -

428 - Need to take a closer look.

429 -

430 -

431 -* jc/apply-trailing-blank-removal (2012-10-12) 1 commit

432 - - apply.c:update_pre_post_images(): the preimage can be truncated

433 -

434 - Fix to update_pre_post_images() that did not take into account the

435 - possibility that whitespace fix could shrink the preimage and

436 - change the number of lines in it.

437 -

438 - Extra set of eyeballs appreciated.

439 -

440 -

441 -* jn/warn-on-inaccessible-loosen (2012-10-14) 4 commits

442 - - config: exit on error accessing any config file

443 - - doc: advertise GIT_CONFIG_NOSYSTEM

444 - - config: treat user and xdg config permission problems as errors

445 - - config, gitignore: failure to access with ENOTDIR is ok

446 -

447 - An RFC to deal with a situation where .config/git is a file and we

448 - notice .config/git/config is not readable due to ENOTDIR, not

449 - ENOENT; I think a bit more refactored approach to consistently

450 - address permission errors across config, exclude and attrs is

451 - desirable. Don't we also need a check for an opposite situation

452 - where we open .config/git/config or .gitattributes for reading but

453 - they turn out to be directories?

454 -

455 -

456 -* as/check-ignore (2012-11-08) 14 commits

457 - - t0007: fix tests on Windows

458 - - Documentation/check-ignore: we show the deciding match, not the first

459 - - Add git-check-ignore sub-command

460 - - dir.c: provide free_directory() for reclaiming dir_struct memory

461 - - pathspec.c: move reusable code from builtin/add.c

462 - - dir.c: refactor treat_gitlinks()

463 - - dir.c: keep track of where patterns came from

464 - - dir.c: refactor is_path_excluded()

465 - - dir.c: refactor is_excluded()

466 - - dir.c: refactor is_excluded_from_list()

467 - - dir.c: rename excluded() to is_excluded()

468 - - dir.c: rename excluded_from_list() to is_excluded_from_list()

469 - - dir.c: rename path_excluded() to is_path_excluded()

470 - - dir.c: rename cryptic 'which' variable to more consistent name

436

472 - Duy helped to reroll this.

473 -

474 - Expecting a re-roll.

437 + Replaced by shedding large changes to other independent topics.

438 + Any comments from zsh users?

439

440

441 * so/prompt-command (2012-10-17) 4 commits

@@ -488,14 +452,6 @@ repositories listed at

452 Will cook in 'next'.

453

454

491 -* aw/rebase-am-failure-detection (2012-10-11) 1 commit

492 - - rebase: Handle cases where format-patch fails

493 -

494 - I am unhappy a bit about the possible performance implications of

495 - having to store the output in a temporary file only for a rare case

496 - of format-patch aborting.

497 -

498 -

455 * nd/wildmatch (2012-10-15) 13 commits

456 (merged to 'next' on 2012-10-25 at 510e8df)

457 + Support "**" wildcard in .gitignore and .gitattributes

@@ -524,27 +480,15 @@ repositories listed at

480 Will cook in 'next'.

481

482

527 -* jk/lua-hackery (2012-10-07) 6 commits

528 - - pretty: fix up one-off format_commit_message calls

529 - - Minimum compilation fixup

530 - - Makefile: make "lua" a bit more configurable

531 - - add a "lua" pretty format

532 - - add basic lua infrastructure

533 - - pretty: make some commit-parsing helpers more public

534 -

535 - Interesting exercise. When we do this for real, we probably would want

536 - to wrap a commit to make it more like an "object" with methods like

537 - "parents", etc.

538 -

539 -

483 * jh/update-ref-d-through-symref (2012-10-21) 2 commits

541 - - Fix failure to delete a packed ref through a symref

542 - - t1400-update-ref: Add test verifying bug with symrefs in delete_ref()

484 + (merged to 'next' on 2012-11-19 at 6bcca4c)

485 + + Fix failure to delete a packed ref through a symref

486 + + t1400-update-ref: Add test verifying bug with symrefs in delete_ref()

487

488 "update-ref -d --deref SYM" to delete a ref through a symbolic ref

489 that points to it did not remove it correctly.

490

547 - Need to check reviews, but is probably ready for 'next'.

491 + Will merge to 'master' in the seventh batch.

492

493

494 * jk/config-ignore-duplicates (2012-10-29) 9 commits

@@ -581,56 +525,55 @@ repositories listed at

525 way (e.g. making sure individual tests in 9902 can be skipped).

526

527

584 -* fc/remote-testgit-feature-done (2012-10-29) 1 commit

585 - - remote-testgit: properly check for errors

586 -

587 - Needs review.

588 -

589 -

528 * jk/pickaxe-textconv (2012-10-28) 2 commits

529 - pickaxe: use textconv for -S counting

530 - pickaxe: hoist empty needle check

531

532 Use textconv filters when searching with "log -S".

533

534 + It probably should lose "are the textconv on the two sides the

535 + same?" check.

536 +

537

538 * fc/remote-bzr (2012-11-08) 5 commits

598 - - remote-bzr: update working tree

599 - - remote-bzr: add support for remote repositories

600 - - remote-bzr: add support for pushing

601 - - remote-bzr: add simple tests

602 - - Add new remote-bzr transport helper

539 + (merged to 'next' on 2012-11-18 at 86add07)

540 + + remote-bzr: update working tree

541 + + remote-bzr: add support for remote repositories

542 + + remote-bzr: add support for pushing

543 + + remote-bzr: add simple tests

544 + + Add new remote-bzr transport helper

545

546 New remote helper for bzr.

547

606 - Will merge to 'next'.

548 + Will merge to 'master' in the seventh batch.

549

550

551 * fc/remote-hg (2012-11-12) 20 commits

610 - - remote-hg: avoid bad refs

611 - - remote-hg: try the 'tip' if no checkout present

612 - - remote-hg: fix compatibility with older versions of hg

613 - - remote-hg: add missing config for basic tests

614 - - remote-hg: the author email can be null

615 - - remote-hg: add option to not track branches

616 - - remote-hg: add extra author test

617 - - remote-hg: add tests to compare with hg-git

618 - - remote-hg: add bidirectional tests

619 - - test-lib: avoid full path to store test results

620 - - remote-hg: add basic tests

621 - - remote-hg: fake bookmark when there's none

622 - - remote-hg: add compat for hg-git author fixes

623 - - remote-hg: add support for hg-git compat mode

624 - - remote-hg: match hg merge behavior

625 - - remote-hg: make sure the encoding is correct

626 - - remote-hg: add support to push URLs

627 - - remote-hg: add support for remote pushing

628 - - remote-hg: add support for pushing

629 - - Add new remote-hg transport helper

552 + (merged to 'next' on 2012-11-18 at 4a4f2e4)

553 + + remote-hg: avoid bad refs

554 + + remote-hg: try the 'tip' if no checkout present

555 + + remote-hg: fix compatibility with older versions of hg

556 + + remote-hg: add missing config for basic tests

557 + + remote-hg: the author email can be null

558 + + remote-hg: add option to not track branches

559 + + remote-hg: add extra author test

560 + + remote-hg: add tests to compare with hg-git

561 + + remote-hg: add bidirectional tests

562 + + test-lib: avoid full path to store test results

563 + + remote-hg: add basic tests

564 + + remote-hg: fake bookmark when there's none

565 + + remote-hg: add compat for hg-git author fixes

566 + + remote-hg: add support for hg-git compat mode

567 + + remote-hg: match hg merge behavior

568 + + remote-hg: make sure the encoding is correct

569 + + remote-hg: add support to push URLs

570 + + remote-hg: add support for remote pushing

571 + + remote-hg: add support for pushing

572 + + Add new remote-hg transport helper

573

574 New remote helper for hg.

575

633 - Will merge to 'next'.

576 + Will merge to 'master' in the seventh batch.

577

578

579 * jk/maint-http-half-auth-fetch (2012-10-31) 2 commits

@@ -655,21 +598,15 @@ repositories listed at

598 Will merge to 'master' in the sixth batch.

599

600

658 -* cr/push-force-tag-update (2012-11-12) 5 commits

601 +* cr/push-force-tag-update (2012-11-19) 5 commits

602 - push: update remote tags only with force

603 - push: flag updates that require force

661 - - push: flag updates

604 + - push: keep track of "update" state separately

605 - push: add advice for rejected tag reference

606 - push: return reject reasons via a mask

607

608 Require "-f" for push to update a tag, even if it is a fast-forward.

609

667 - Needs review.

668 -

669 - I'm undecided yet on whether the goal is the right thing to do, but it

670 - does prevent some potential mistakes. I haven't looked closely at the

671 - implementation itself; review from interested parties would be helpful.

672 -

610

611 * fc/fast-export-fixes (2012-11-08) 14 commits

612 - fast-export: don't handle uninteresting refs

@@ -708,37 +645,6 @@ repositories listed at

645 Will merge to 'master' in the sixth batch.

646

647

711 -* pf/editor-ignore-sigint (2012-11-11) 5 commits

712 - - launch_editor: propagate SIGINT from editor to git

713 - - run-command: do not warn about child death by SIGINT

714 - - run-command: drop silent_exec_failure arg from wait_or_whine

715 - - launch_editor: ignore SIGINT while the editor has control

716 - - launch_editor: refactor to use start/finish_command

717 -

718 - Avoid confusing cases where the user hits Ctrl-C while in the editor

719 - session, not realizing git will receive the signal. Since most editors

720 - will take over the terminal and will block SIGINT, this is not likely

721 - to confuse anyone.

722 -

723 - Some people raised issues with emacsclient, which are addressed by this

724 - re-roll. It should probably also handle SIGQUIT, and there were a

725 - handful of other review comments.

726 -

727 - Expecting a re-roll.

728 -

729 -

730 -* pp/gitweb-config-underscore (2012-11-08) 1 commit

731 - - gitweb: make remote_heads config setting work

732 -

733 - The key "gitweb.remote_heads" is not legal git config; this maps it to

734 - "gitweb.remoteheads".

735 -

736 - Junio raised a good point about the implementation for three-level

737 - variables.

738 -

739 - Expecting a re-roll.

740 -

741 -

648 * pw/maint-p4-rcs-expansion-newline (2012-11-08) 1 commit

649 (merged to 'next' on 2012-11-13 at e90cc7c)

650 + git p4: RCS expansion should not span newlines

@@ -757,14 +663,13 @@ repositories listed at

663 Will merge to 'master' in the sixth batch.

664

665

760 -* rr/submodule-diff-config (2012-11-08) 3 commits

761 - - submodule: display summary header in bold

762 - - diff: introduce diff.submodule configuration variable

763 - - Documentation: move diff.wordRegex from config.txt to diff-config.txt

666 +* rr/submodule-diff-config (2012-11-18) 4 commits

667 + (merged to 'next' on 2012-11-19 at 355319e)

668 + + submodule: display summary header in bold

669 + + diff: rename "set" variable

670 + + diff: introduce diff.submodule configuration variable

671 + + Documentation: move diff.wordRegex from config.txt to diff-config.txt

672

673 Lets "git diff --submodule=log" become the default via configuration.

674

767 - Almost there. Looks like a new version has been posted, but I haven't

768 - picked it up yet.

769 -

770 - Needs review.

675 + Will merge to 'master' in the seventh batch.

What's cooking (2012/11 #06)