85a4700cc2 · matheusbsbs/matheus-bagliano

@@ -1,22 +1,19 @@

1 To: git@vger.kernel.org

2 Bcc: lwn@lwn.net

3 -Subject: What's cooking in git.git (Sep 2012, #06; Mon, 17)

4 -X-master-at: 5976753e732186d7f8a5c6af55a8ce3e2d2b677b

5 -X-next-at: 3c10a18fa86d85c603e54c9c31776661e9d9fa29

3 +Subject: What's cooking in git.git (Sep 2012, #07; Fri, 21)

4 +X-master-at: 16eed7c9938a65022010c3d95ada911b2fd46d25

5 +X-next-at: 68bd821eac8800bddb2213d2b7e4065e3e082059

6

7 -What's cooking in git.git (Sep 2012, #06; Mon, 17)

7 +What's cooking in git.git (Sep 2012, #07; Fri, 21)

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 -The seventh wave of topics are in 'master' now.

15 -

16 -The archive-zip topic really needs help by people on platforms where

17 -zip archive is an important part of life (in other words, not UNIX)

18 -to test, in order to make sure the archive generated out of a tree

19 -with non-ascii filenames are usable on their platforms.

14 +Today's tip of 'pu' has breakage in t0007 for people whose shell is

15 +not bash; a topic queued there needs to be fixed before moving

16 +forward.

17

18 I'm planning to keep this cycle reasonably short and aim for tagging

19 the result as 1.8.0 at the end of 9th week, on October 21st, after

@@ -31,201 +28,241 @@ repositories listed at

28 --------------------------------------------------

29 [Graduated to "master"]

30

34 -* cn/branch-set-upstream-to (2012-09-11) 2 commits

35 - (merged to 'next' on 2012-09-12 at e162318)

36 - + completion: complete branch name for "branch --set-upstream-to="

37 - + completion: add --set-upstream-to and --unset-upstream

31 +* er/doc-fast-import-done (2012-08-22) 1 commit

32 + (merged to 'next' on 2012-09-17 at bb8709a)

33 + + fast-import: document the --done option

34

39 - Finishing touches to the recently graduated topic to introduce

40 - "git branch --set-upstream-to" option.

35 + I got tired of waiting for ESR to respond with S-o-b for a trivial

36 + documentation updates, so I'll be moving this forward.

37

38

43 -* dg/run-command-child-cleanup (2012-09-11) 1 commit

44 - (merged to 'next' on 2012-09-12 at aa5f9e2)

45 - + run-command.c: fix broken list iteration in clear_child_for_cleanup

39 +* jc/maint-log-grep-all-match (2012-09-15) 10 commits

40 + (merged to 'next' on 2012-09-17 at 3c10a18)

41 + + t7810-grep: test --all-match with multiple --grep and --author options

42 + + t7810-grep: test interaction of multiple --grep and --author options

43 + + t7810-grep: test multiple --author with --all-match

44 + + t7810-grep: test multiple --grep with and without --all-match

45 + + t7810-grep: bring log --grep tests in common form

46 + (merged to 'next' on 2012-09-15 at 73fad40)

47 + + grep.c: mark private file-scope symbols as static

48 + (merged to 'next' on 2012-09-14 at 86b848c)

49 + + log: document use of multiple commit limiting options

50 + + log --grep/--author: honor --all-match honored for multiple --grep patterns

51 + + grep: show --debug output only once

52 + + grep: teach --debug option to dump the parse tree

53

47 - The code to wait for subprocess and remove it from our internal queue

48 - wasn't quite right.

54 + Fix a long-standing bug in "git log --grep" when multiple "--grep"

55 + are used together with "--all-match" and "--author" or "--committer".

56

57

51 -* jc/ll-merge-binary-ours (2012-09-12) 3 commits

52 - (merged to 'next' on 2012-09-12 at 9a7a6b3)

53 - + ll-merge: warn about inability to merge binary files only when we can't

54 - + attr: "binary" attribute should choose built-in "binary" merge driver

55 - + merge: teach -Xours/-Xtheirs to binary ll-merge driver

58 +* jc/maint-log-grep-all-match-1 (2012-09-20) 1 commit

59 + (merged to 'next' on 2012-09-20 at 6bf192f)

60 + + grep.c: make two symbols really file-scope static this time

61

57 - "git merge -Xtheirs" did not help content-level merge of binary

58 - files; it should just take their version. Also "*.jpg binary" in

59 - the attributes did not imply they should use the binary ll-merge

60 - driver.

62 + A finishing touch to the "log --all-match --grep" topic.

63

64

63 -* jc/mailinfo-RE (2012-09-09) 1 commit

64 - (merged to 'next' on 2012-09-12 at 131edbf)

65 - + mailinfo: strip "RE: " prefix

65 +* jc/make-static (2012-09-15) 14 commits

66 + (merged to 'next' on 2012-09-17 at 3a7d87a)

67 + + sequencer.c: mark a private file-scope symbol as static

68 + + ident.c: mark private file-scope symbols as static

69 + + trace.c: mark a private file-scope symbol as static

70 + + wt-status.c: mark a private file-scope symbol as static

71 + + read-cache.c: mark a private file-scope symbol as static

72 + + strbuf.c: mark a private file-scope symbol as static

73 + + sha1-array.c: mark a private file-scope symbol as static

74 + + symlinks.c: mark private file-scope symbols as static

75 + + notes.c: mark a private file-scope symbol as static

76 + + rerere.c: mark private file-scope symbols as static

77 + + graph.c: mark private file-scope symbols as static

78 + + diff.c: mark a private file-scope symbol as static

79 + + commit.c: mark a file-scope private symbol as static

80 + + builtin/notes.c: mark file-scope private symbols as static

81

67 - We strip the prefix from "Re: subject" and also from a less common

68 - "re: subject", but left even less common "RE: subject" intact.

82 + Turn many file-scope private symbols to static to reduce the

83 + global namespace contamination.

84

85

71 -* jc/maint-blame-no-such-path (2012-09-11) 2 commits

72 - (merged to 'next' on 2012-09-14 at 84064d5)

73 - + blame: allow "blame file" in the middle of a conflicted merge

74 - + blame $path: avoid getting fooled by case insensitive filesystems

86 +* mh/fetch-filter-refs (2012-09-18) 1 commit

87 + (merged to 'next' on 2012-09-18 at 5dd77d8)

88 + + string_list API: document what "sorted" means

89

76 - "git blame MAKEFILE" run in a history that has "Makefile" but not

77 - "MAKEFILE" should say "No such file MAKEFILE in HEAD", but got

78 - confused on a case insensitive filesystem and failed to do so.

90

80 - Even during a conflicted merge, "git blame $path" always meant to

81 - blame uncommitted changes to the "working tree" version; make it

82 - more useful by showing cleanly merged parts as coming from the other

83 - branch that is being merged.

91 +* mv/cherry-pick-s (2012-09-14) 1 commit

92 + (merged to 'next' on 2012-09-14 at 2d143e1)

93 + + cherry-pick: don't forget -s on failure

94

95 + After "git cherry-pick -s" gave control back to the user asking

96 + help to resolve conflicts, concluding "git commit" needs to be run

97 + with "-s" if the user wants to sign it off, but people often forgot

98 + to do so.

99

86 -* jk/config-warn-on-inaccessible-paths (2012-09-13) 1 commit

87 - (merged to 'next' on 2012-09-14 at a9bba78)

88 - + attr: failure to open a .gitattributes file is OK with ENOTDIR

100

90 - The attribute system may be asked for a path whose leading

91 - directories do not exist in the current working tree. In addition

92 - to ENOENT, ENOTDIR must be ignored.

101 +* nd/fetch-status-alignment (2012-09-14) 1 commit

102 + (merged to 'next' on 2012-09-14 at 34237db)

103 + + fetch: align per-ref summary report in UTF-8 locales

104

105 + The status report from "git fetch", when messages like 'up-to-date'

106 + are translated, did not align the branch names well.

107

95 -* jw/doc-commit-title (2012-09-13) 1 commit

96 - (merged to 'next' on 2012-09-14 at d6bdd97)

97 - + Documentation: describe subject more precisely

108

99 - Update parts of document that talked about "first line of commit

100 - log" to say "title of commit" with definition of what that "title"

101 - is.

109 +* pw/p4-submit-conflicts (2012-09-16) 12 commits

110 + (merged to 'next' on 2012-09-17 at 7e57551)

111 + + git-p4: add submit --conflict option and config varaiable

112 + + git p4: add submit --prepare-p4-only option

113 + + git p4: add submit --dry-run option

114 + + git p4: accept -v for --verbose

115 + + git p4: revert deleted files after submit cancel

116 + + git p4: rearrange submit template construction

117 + + git p4: test clean-up after failed submit, fix added files

118 + + git p4: standardize submit cancel due to unchanged template

119 + + git p4: move conflict prompt into run, add [q]uit input

120 + + git p4: remove submit failure options [a]pply and [w]rite

121 + + git p4: gracefully fail if some commits could not be applied

122 + + git p4 test: remove bash-ism of combined export/assignment

123

124 +--------------------------------------------------

125 +[New Topics]

126

104 -* mh/fetch-filter-refs (2012-09-15) 15 commits

105 - (merged to 'next' on 2012-09-15 at 8767db3)

106 - + test-string-list.c: Fix some sparse warnings

107 - (merged to 'next' on 2012-09-14 at 567afe4)

108 - + fetch-pack: eliminate spurious error messages

109 - + cmd_fetch_pack(): simplify computation of return value

110 - + fetch-pack: report missing refs even if no existing refs were received

111 - + cmd_fetch_pack(): return early if finish_connect() fails

112 - + filter_refs(): simplify logic

113 - + filter_refs(): build refs list as we go

114 - + filter_refs(): delete matched refs from sought list

115 - + fetch_pack(): update sought->nr to reflect number of unique entries

116 - + filter_refs(): do not check the same sought_pos twice

117 - + Change fetch_pack() and friends to take string_list arguments

118 - + fetch_pack(): reindent function decl and defn

119 - + Rename static function fetch_pack() to http_fetch_pack()

120 - + t5500: add tests of fetch-pack --all --depth=N $URL $REF

121 - + t5500: add tests of error output for missing refs

122 - (this branch uses mh/string-list.)

127 +* js/rebase-exec-command-not-found (2012-09-18) 1 commit

128 + - rebase -i: fix misleading error message after 'exec no-such' instruction

129

124 - Code simplification and clarification.

130 + Will merge to 'next'.

131

132

127 -* mh/string-list (2012-09-12) 6 commits

128 - (merged to 'next' on 2012-09-14 at b4c50bc)

129 - + api-string-list.txt: initialize the string_list the easy way

130 - + string_list: add a function string_list_longest_prefix()

131 - + string_list: add a new function, string_list_remove_duplicates()

132 - + string_list: add a new function, filter_string_list()

133 - + string_list: add two new functions for splitting strings

134 - + string_list: add function string_list_append_nodup()

135 - (this branch is used by mh/fetch-filter-refs.)

133 +* rr/test-make-sure-we-have-git (2012-09-18) 1 commit

134 + - t/test-lib: make sure Git has already been built

135

136 + Will merge to 'next'.

137

138 -* nd/maint-diffstat-summary (2012-09-14) 1 commit

139 - (merged to 'next' on 2012-09-14 at 994217d)

140 - + Revert diffstat back to English

138

142 - Earlier we made the diffstat summary line that shows the number of

143 - lines added/deleted localizable, but it was found irritating having

144 - to see them in various languages on a list whose discussion language

145 - is English.

139 +* as/test-tweaks (2012-09-20) 7 commits

140 + - tests: paint unexpectedly fixed known breakages in bold red

141 + - tests: test the test framework more thoroughly

142 + - [SQUASH] t/t0000-basic.sh: quoting of TEST_DIRECTORY is screwed up

143 + - tests: refactor mechanics of testing in a sub test-lib

144 + - tests: paint skipped tests in bold blue

145 + - tests: test number comes first in 'not ok $count - $message'

146 + - tests: paint known breakages in bold yellow

147

147 - The original had trivial thinko in reverting Q_(), which has been

148 - fixed.

148 + Various minor tweaks to the test framework to paint its output

149 + lines in colors that match what they mean better.

150

151 + Has the "is this really blue?" issue Peff raised resolved???

152

151 -* sl/autoconf (2012-09-11) 2 commits

152 - (merged to 'next' on 2012-09-12 at 6ebe199)

153 - + build: don't duplicate substitution of make variables

154 - + build: improve GIT_CONF_SUBST signature

153

156 - Reduces repetition in configure.ac.

154 +* db/doc-custom-xmlto (2012-09-19) 1 commit

155 + - Documentation/Makefile: Allow custom XMLTO binary

156

158 ---------------------------------------------------

159 -[New Topics]

157 + Will merge to 'next'.

158

161 -* rt/maint-clone-single (2012-09-16) 2 commits

162 - - fixup! check what we really care about in a more direct way

163 - - clone --single: limit the fetch refspec to fetched branch

159

165 - Running "git fetch" in a repository made with "git clone --single"

166 - slurps all the branches, defeating the point of "--single".

160 +* js/hp-nonstop (2012-09-19) 1 commit

161 + - Port to HP NonStop

162 + (this branch uses js/poll-emu.)

163

164 + Will merge to 'next'.

165

169 -* ep/malloc-check-perturb (2012-09-14) 2 commits

170 - - MALLOC_CHECK: various clean-ups

171 - - Add MALLOC_CHECK_ and MALLOC_PERTURB_ libc env to the test suite for detecting heap corruption

166

173 - Queued with fix-ups.

174 - Waiting for response from the author.

167 +* po/maint-docs (2012-09-19) 5 commits

168 + - Doc branch: show -vv option and alternative

169 + - Doc clean: add See Also link

170 + - Doc add: link gitignore

171 + - Doc: separate gitignore pattern sources

172 + - Doc: shallow clone deepens _to_ new depth

173

174 + Various documentation fixups.

175

177 -* jc/make-static (2012-09-15) 14 commits

178 - (merged to 'next' on 2012-09-17 at 3a7d87a)

179 - + sequencer.c: mark a private file-scope symbol as static

180 - + ident.c: mark private file-scope symbols as static

181 - + trace.c: mark a private file-scope symbol as static

182 - + wt-status.c: mark a private file-scope symbol as static

183 - + read-cache.c: mark a private file-scope symbol as static

184 - + strbuf.c: mark a private file-scope symbol as static

185 - + sha1-array.c: mark a private file-scope symbol as static

186 - + symlinks.c: mark private file-scope symbols as static

187 - + notes.c: mark a private file-scope symbol as static

188 - + rerere.c: mark private file-scope symbols as static

189 - + graph.c: mark private file-scope symbols as static

190 - + diff.c: mark a private file-scope symbol as static

191 - + commit.c: mark a file-scope private symbol as static

192 - + builtin/notes.c: mark file-scope private symbols as static

176 + Will merge to 'next'.

177

194 - Turn many file-scope private symbols to static to reduce the

195 - global namespace contamination.

178

179 +* sp/maint-http-info-refs-no-retry (2012-09-20) 1 commit

180 + - Revert "retry request without query when info/refs?query fails"

181 + (this branch is used by jk/smart-http-switch.)

182

198 -* aj/xfuncname-ada (2012-09-16) 1 commit

199 - - Add userdiff patterns for Ada

183 + Kills an old workaround for a unlikely server misconfiguration that

184 + hurts debuggability.

185

186 + Will merge to 'next'.

187

202 -* aw/rebase-i-edit-todo (2012-09-16) 3 commits

203 - - rebase -i: Add tests for "--edit-todo"

204 - - rebase -i: Teach "--edit-todo" action

205 - - rebase -i: Refactor help messages for todo file

188

189 +* jk/smart-http-switch (2012-09-21) 2 commits

190 + - remote-curl: let users turn off smart http

191 + - remote-curl: rename is_http variable

192 + (this branch uses sp/maint-http-info-refs-no-retry.)

193

208 -* jc/maint-mailinfo-mime-attr (2012-09-17) 1 commit

209 - - mailinfo: do not concatenate charset= attribute values from mime headers

194 + Will merge to 'next'.

195

196

212 -* js/poll-emu (2012-09-17) 4 commits

213 - - make poll() work on platforms that can't recv() on a non-socket

214 - - poll() exits too early with EFAULT if 1st arg is NULL

215 - - fix some win32 specific dependencies in poll.c

216 - - make poll available for other platforms lacking it

197 +* sp/maint-http-enable-gzip (2012-09-20) 1 commit

198 + - Enable info/refs gzip decompression in HTTP client

199

200 + Allows a more common 'gzip' Accept-Encoding to be used.

201

219 -* nd/wildmatch (2012-09-17) 5 commits

220 - - Support "**" in .gitignore and .gitattributes patterns using wildmatch()

221 - - Integrate wildmatch to git

222 - - compat/wildmatch: fix case-insensitive matching

223 - - compat/wildmatch: remove static variable force_lower_case

224 - - Import wildmatch from rsync

202 + Will merge to 'next'.

203 +

204 +

205 +* nd/pretty-placeholder-with-color-option (2012-09-20) 4 commits

206 + - [SQUASH] do not use real-sb without initializing

207 + - pretty: support right alignment

208 + - pretty: support placeholders %C+ and %C-

209 + - pretty: share code between format_decoration and show_decorations

210 +

211 + The feature might be great, but the interface is iffy.

212 +

213 +

214 +* jk/receive-pack-unpack-error-to-pusher (2012-09-21) 3 commits

215 + - receive-pack: drop "n/a" on unpacker errors

216 + - receive-pack: send pack-processing stderr over sideband

217 + - receive-pack: redirect unpack-objects stdout to /dev/null

218 +

219 + Send errors from "unpack-objects" and "index-pack" back to the "git

220 + push" over the git and smart-http protocols, just like it is done

221 + for a push over the ssh protocol.

222 +

223 + Will merge to 'next'.

224 +

225 +

226 +* jc/blame-follows-renames (2012-09-21) 1 commit

227 + - git blame: document that it always follows origin across whole-file renames

228

229 --------------------------------------------------

230 [Stalled]

231

232 +* fa/remote-svn (2012-09-19) 16 commits

233 + - Add a test script for remote-svn

234 + - remote-svn: add marks-file regeneration

235 + - Add a svnrdump-simulator replaying a dump file for testing

236 + - remote-svn: add incremental import

237 + - remote-svn: Activate import/export-marks for fast-import

238 + - Create a note for every imported commit containing svn metadata

239 + - vcs-svn: add fast_export_note to create notes

240 + - Allow reading svn dumps from files via file:// urls

241 + - remote-svn, vcs-svn: Enable fetching to private refs

242 + - When debug==1, start fast-import with "--stats" instead of "--quiet"

243 + - Add documentation for the 'bidi-import' capability of remote-helpers

244 + - Connect fast-import to the remote-helper via pipe, adding 'bidi-import' capability

245 + - Add argv_array_detach and argv_array_free_detached

246 + - Add svndump_init_fd to allow reading dumps from arbitrary FDs

247 + - Add git-remote-testsvn to Makefile

248 + - Implement a remote helper for svn in C

249 + (this branch is used by fa/vcs-svn.)

250 +

251 + A GSoC project. Looked promising.

252 + Waiting for comments from mentors and stakeholders.

253 +

254 +

255 +* fa/vcs-svn (2012-09-19) 4 commits

256 + - vcs-svn: remove repo_tree

257 + - vcs-svn/svndump: rewrite handle_node(), begin|end_revision()

258 + - vcs-svn/svndump: restructure node_ctx, rev_ctx handling

259 + - svndump: move struct definitions to .h

260 + (this branch uses fa/remote-svn.)

261 +

262 + A GSoC project. Looked promising.

263 + Waiting for comments from mentors and stakeholders.

264 +

265 +

266 * ph/credential-refactor (2012-09-02) 5 commits

267 - wincred: port to generic credential helper

268 - Merge branch 'ef/win32-cred-helper' into ph/credential-refactor

@@ -245,21 +282,6 @@ repositories listed at

282 Seems to have design regression for silent users.

283

284

248 -* as/check-ignore (2012-09-02) 10 commits

249 - . fixup: decl-after-stmt etc.

250 - . Add git-check-ignore

251 - . Provide free_directory() for reclaiming dir_struct memory

252 - . Extract some useful pathspec handling code from builtin/add.c into a library

253 - . For each exclude pattern, store information about where it came from

254 - . dir.c: refactor excluded() and path_excluded()

255 - . dir.c: refactor excluded_from_list()

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

257 - . Improve documentation and comments regarding directory traversal API

258 - . Update directory listing API doc to match code

259 -

260 - Will be rerolled.

261 -

262 -

285 * jx/test-real-path (2012-08-27) 1 commit

286 - test: set the realpath of CWD as TRASH_DIRECTORY

287

@@ -391,95 +413,114 @@ repositories listed at

413 --------------------------------------------------

414 [Cooking]

415

394 -* jc/maint-name-rev (2012-09-17) 7 commits

395 - - describe --contains: use "name-rev --algorithm=weight"

396 - - name-rev --algorithm=weight: tests and documentation

397 - - name-rev --algorithm=weight: cache the computed weight in notes

398 - - name-rev --algorithm=weight: trivial optimization

399 - - name-rev: --algorithm option

400 - - name_rev: clarify the logic to assign a new tip-name to a commit

401 - - name-rev: lose unnecessary typedef

416 +* as/check-ignore (2012-09-21) 15 commits

417 + - [REROLL NEEDED] minimum compilation fix

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

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

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

421 + - dir.c: refactor treat_gitlinks()

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

423 + - dir.c: refactor is_path_excluded()

424 + - dir.c: refactor is_excluded()

425 + - dir.c: refactor is_excluded_from_list()

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

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

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

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

430 + - Improve documentation and comments regarding directory traversal API

431 + - Update directory listing API doc to match code

432 +

433 + Rerolled.

434 + Expecting a further reroll to follow-up review comments.

435 +

436 +

437 +* rt/maint-clone-single (2012-09-20) 1 commit

438 + - clone --single: limit the fetch refspec to fetched branch

439

403 - "git name-rev" names the given revision based on a ref that can be

404 - reached in the smallest number of steps from the rev, but that is

405 - not useful when the caller wants to know which tag is the oldest one

406 - that contains the rev. This teaches a new mode to the command that

407 - uses the oldest ref among those which contain the rev.

440 + Running "git fetch" in a repository made with "git clone --single"

441 + slurps all the branches, defeating the point of "--single".

442

409 - I am not sure if this is worth it; for one thing, even with the help

410 - from notes-cache, it seems to make the "describe --contains" even

411 - slower. Also the command will be unusably slow for a user who does

412 - not have a write access (hence unable to create or update the

413 - notes-cache).

443 + Will merge to 'next'.

444

445

416 -* er/doc-fast-import-done (2012-08-22) 1 commit

417 - (merged to 'next' on 2012-09-17 at bb8709a)

418 - + fast-import: document the --done option

446 +* ep/malloc-check-perturb (2012-09-17) 2 commits

447 + - MALLOC_CHECK: various clean-ups

448 + - Add MALLOC_CHECK_ and MALLOC_PERTURB_ libc env to the test suite for detecting heap corruption

449

420 - I got tired of waiting for ESR to respond with S-o-b for a trivial

421 - documentation updates, so I'll be moving this forward.

450 + Run our test scripts with MALLOC_CHECK_ and MALLOC_PERTURB_, the

451 + built-in memory access checking facility GNU libc has.

452

423 - Will merge to 'master'.

453 + Will merge to 'next'.

454

455

426 -* nd/fetch-status-alignment (2012-09-14) 1 commit

427 - (merged to 'next' on 2012-09-14 at 34237db)

428 - + fetch: align per-ref summary report in UTF-8 locales

456 +* aj/xfuncname-ada (2012-09-16) 1 commit

457 + - Add userdiff patterns for Ada

458

430 - The status report from "git fetch", when messages like 'up-to-date'

431 - are translated, did not align the branch names well.

459 + Will merge to 'next'.

460

433 - Will merge to 'master'.

461

462 +* aw/rebase-i-edit-todo (2012-09-19) 5 commits

463 + - rebase -i: suggest using --edit-todo to fix an unknown instruction

464 + - rebase -i: Add tests for "--edit-todo"

465 + - rebase -i: Teach "--edit-todo" action

466 + - rebase -i: Refactor help messages for todo file

467 + - rebase usage: subcommands can not be combined with -i

468

436 -* mv/cherry-pick-s (2012-09-14) 1 commit

437 - (merged to 'next' on 2012-09-14 at 2d143e1)

438 - + cherry-pick: don't forget -s on failure

469 + Will merge to 'next'.

470

440 - After "git cherry-pick -s" gave control back to the user asking

441 - help to resolve conflicts, concluding "git commit" needs to be run

442 - with "-s" if the user wants to sign it off, but people often forgot

443 - to do so.

471

445 - Will merge to 'master'.

472 +* jc/maint-mailinfo-mime-attr (2012-09-17) 1 commit

473 + - mailinfo: do not concatenate charset= attribute values from mime headers

474

475 + Will merge to 'next'.

476

448 -* jc/maint-log-grep-all-match (2012-09-15) 10 commits

449 - (merged to 'next' on 2012-09-17 at 3c10a18)

450 - + t7810-grep: test --all-match with multiple --grep and --author options

451 - + t7810-grep: test interaction of multiple --grep and --author options

452 - + t7810-grep: test multiple --author with --all-match

453 - + t7810-grep: test multiple --grep with and without --all-match

454 - + t7810-grep: bring log --grep tests in common form

455 - (merged to 'next' on 2012-09-15 at 73fad40)

456 - + grep.c: mark private file-scope symbols as static

457 - (merged to 'next' on 2012-09-14 at 86b848c)

458 - + log: document use of multiple commit limiting options

459 - + log --grep/--author: honor --all-match honored for multiple --grep patterns

460 - + grep: show --debug output only once

461 - + grep: teach --debug option to dump the parse tree

477

463 - Fix a long-standing bug in "git log --grep" when multiple "--grep"

464 - are used together with "--all-match" and "--author" or "--committer".

478 +* js/poll-emu (2012-09-17) 4 commits

479 + - make poll() work on platforms that can't recv() on a non-socket

480 + - poll() exits too early with EFAULT if 1st arg is NULL

481 + - fix some win32 specific dependencies in poll.c

482 + - make poll available for other platforms lacking it

483 + (this branch is used by js/hp-nonstop.)

484

485 + Will merge to 'next'.

486

467 -* pw/p4-submit-conflicts (2012-09-16) 12 commits

468 - (merged to 'next' on 2012-09-17 at 7e57551)

469 - + git-p4: add submit --conflict option and config varaiable

470 - + git p4: add submit --prepare-p4-only option

471 - + git p4: add submit --dry-run option

472 - + git p4: accept -v for --verbose

473 - + git p4: revert deleted files after submit cancel

474 - + git p4: rearrange submit template construction

475 - + git p4: test clean-up after failed submit, fix added files

476 - + git p4: standardize submit cancel due to unchanged template

477 - + git p4: move conflict prompt into run, add [q]uit input

478 - + git p4: remove submit failure options [a]pply and [w]rite

479 - + git p4: gracefully fail if some commits could not be applied

480 - + git p4 test: remove bash-ism of combined export/assignment

487

482 - Will merge to 'master'.

488 +* nd/wildmatch (2012-09-17) 5 commits

489 + - Support "**" in .gitignore and .gitattributes patterns using wildmatch()

490 + - Integrate wildmatch to git

491 + - compat/wildmatch: fix case-insensitive matching

492 + - compat/wildmatch: remove static variable force_lower_case

493 + - Import wildmatch from rsync

494 +

495 + Allows pathname patterns in .gitignore and .gitattributes files

496 + with double-asterisks "foo/**/bar" to match any number of directory

497 + hiearchies.

498 +

499 + It was pointed out that some symbols that do not have to be global

500 + are left global.

501 + Will wait for a reroll.

502 +

503 +

504 +* jc/maint-name-rev (2012-09-17) 7 commits

505 + - describe --contains: use "name-rev --algorithm=weight"

506 + - name-rev --algorithm=weight: tests and documentation

507 + - name-rev --algorithm=weight: cache the computed weight in notes

508 + - name-rev --algorithm=weight: trivial optimization

509 + - name-rev: --algorithm option

510 + - name_rev: clarify the logic to assign a new tip-name to a commit

511 + - name-rev: lose unnecessary typedef

512 +

513 + "git name-rev" names the given revision based on a ref that can be

514 + reached in the smallest number of steps from the rev, but that is

515 + not useful when the caller wants to know which tag is the oldest one

516 + that contains the rev. This teaches a new mode to the command that

517 + uses the oldest ref among those which contain the rev.

518 +

519 + I am not sure if this is worth it; for one thing, even with the help

520 + from notes-cache, it seems to make the "describe --contains" even

521 + slower. Also the command will be unusably slow for a user who does

522 + not have a write access (hence unable to create or update the

523 + notes-cache).

524

525

526 * jc/xprm-generation (2012-09-14) 1 commit

@@ -489,14 +530,15 @@ repositories listed at

530 world projects.

531

532

492 -* rs/archive-zip-utf8 (2012-09-04) 1 commit

533 +* rs/archive-zip-utf8 (2012-09-18) 4 commits

534 + (merged to 'next' on 2012-09-18 at 8535c83)

535 + + archive-zip: declare creator to be Unix for UTF-8 paths

536 + + archive-zip: support UTF-8 paths

537 + + Revert "archive-zip: support UTF-8 paths"

538 (merged to 'next' on 2012-09-11 at 3b1f071)

539 + archive-zip: support UTF-8 paths

540

496 - Need help from people on platforms on which Zip matters to see

497 - compatiblity with other people's zip implementations.

498 -

499 - Will merge to 'master' as part of the sixth batch.

541 + Will merge to 'master'.

542

543

544 * jl/submodule-rm (2012-08-27) 1 commit

@@ -513,40 +555,6 @@ repositories listed at

555 Replacement sent but was still iffy around conflicted merge cases.

556

557

516 -* fa/remote-svn (2012-08-28) 16 commits

517 - - Add a test script for remote-svn

518 - - remote-svn: add marks-file regeneration

519 - - Add a svnrdump-simulator replaying a dump file for testing

520 - - remote-svn: add incremental import

521 - - remote-svn: Activate import/export-marks for fast-import

522 - - Create a note for every imported commit containing svn metadata

523 - - vcs-svn: add fast_export_note to create notes

524 - - Allow reading svn dumps from files via file:// urls

525 - - remote-svn, vcs-svn: Enable fetching to private refs

526 - - When debug==1, start fast-import with "--stats" instead of "--quiet"

527 - - Add documentation for the 'bidi-import' capability of remote-helpers

528 - - Connect fast-import to the remote-helper via pipe, adding 'bidi-import' capability

529 - - Add argv_array_detach and argv_array_free_detached

530 - - Add svndump_init_fd to allow reading dumps from arbitrary FDs

531 - - Add git-remote-testsvn to Makefile and .gitignore

532 - - Implement a remote helper for svn in C

533 - (this branch is used by fa/vcs-svn.)

534 -

535 - A GSoC project. Looked promising.

536 - Waiting for comments from mentors and stakeholders.

537 -

538 -

539 -* fa/vcs-svn (2012-08-28) 4 commits

540 - - vcs-svn: remove repo_tree

541 - - vcs-svn/svndump: rewrite handle_node(), begin|end_revision()

542 - - vcs-svn/svndump: restructure node_ctx, rev_ctx handling

543 - - svndump: move struct definitions to .h

544 - (this branch uses fa/remote-svn.)

545 -

546 - A GSoC project. Looked promising.

547 - Waiting for comments from mentors and stakeholders.

548 -

549 -

558 * jk/no-more-pre-exec-callback (2012-06-05) 1 commit

559 - pager: drop "wait for output to run less" hack

560

What's cooking (2012/09 #07)