74cd2639dc · matheusbsbs/matheus-bagliano

@@ -1,23 +1,24 @@

1 To: git@vger.kernel.org

2 Bcc: lwn@lwn.net

3 -Subject: What's cooking in git.git (Jan 2013, #03; Sun, 6)

4 -X-master-at: 32238aeb730fda0f66ccc6ec2f1e342af8b9fd04

5 -X-next-at: 6e0eed0d38e507b7cf6c43be8a89ad15eb9aab5e

3 +Subject: What's cooking in git.git (Jan 2013, #04; Wed, 9)

4 +X-master-at: 44fe83502edf5391bb3a5997cab01794b4568062

5 +X-next-at: ffbe6f75280588398438a571a8a937328d87c3a3

6

7 -What's cooking in git.git (Jan 2013, #03; Sun, 6)

7 +What's cooking in git.git (Jan 2013, #04; Wed, 9)

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 tip of 'next' will be rewound and rebuilt shortly, kicking a

15 -couple of topics back to 'pu' and reordering the remainder as

16 -needed.

14 +So far, about 60 topics, most of which have been cooking since the

15 +previous cycle, have been graduated to the 'master' branch in

16 +preparation for the next release, which tentatively is called 1.8.2.

17 +Many of these early topics are bugfixes and expected to later land

18 +in the 'maint' branch for 1.8.1.1 release as well.

19

18 -As usual, this cycle is expected to last for 8 to 10 weeks. To

19 -ensure the quality of the end result, let's merge topics in flight

20 -earlier than previous cycles to 'next' and fix issues in-tree.

20 +As usual, this cycle is expected to last for 8 to 10 weeks, with a

21 +preview -rc0 sometime in the middle of next month.

22

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

24 repositories listed at

@@ -25,330 +26,287 @@ repositories listed at

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

27

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

28 -[Graduated to "master"]

29 +[New Topics]

30

30 -* cr/push-force-tag-update (2012-12-03) 10 commits

31 - (merged to 'next' on 2012-12-04 at af2e3a9)

32 - + push: allow already-exists advice to be disabled

33 - + push: rename config variable for more general use

34 - + push: cleanup push rules comment

35 - + push: clarify rejection of update to non-commit-ish

36 - + push: require force for annotated tags

37 - + push: require force for refs under refs/tags/

38 - + push: flag updates that require force

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

40 - + push: add advice for rejected tag reference

41 - + push: return reject reasons as a bitset

31 +* nz/send-email-headers-are-case-insensitive (2013-01-06) 1 commit

32 + - git-send-email: treat field names as case-insensitively

33

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

34 + When user spells "cc:" in lowercase in the fake "header" in the

35 + trailer part, send-email failed to pick up the addresses from

36 + there. As e-mail headers field names are case insensitive, this

37 + script should follow suit and treat "cc:" and "Cc:" the same way.

38

39 + Will merge to 'next'.

40

46 -* fc/fast-export-fixes (2012-12-03) 15 commits

47 - (merged to 'next' on 2012-12-03 at f9df523)

48 - + fast-export: make sure updated refs get updated

49 - + fast-export: don't handle uninteresting refs

50 - + fast-export: fix comparison in tests

51 - + fast-export: trivial cleanup

52 - + remote-testgit: implement the "done" feature manually

53 - + remote-testgit: report success after an import

54 - + remote-testgit: exercise more features

55 - + remote-testgit: cleanup tests

56 - + remote-testgit: remove irrelevant test

57 - + remote-testgit: remove non-local functionality

58 - + Add new simplified git-remote-testgit

59 - + Rename git-remote-testgit to git-remote-testpy

60 - + remote-helpers: fix failure message

61 - + remote-testgit: fix direction of marks

62 - + fast-export: avoid importing blob marks

41

64 - Various updates to fast-export used in the context of the remote

65 - helper interface.

42 +* mk/complete-tcsh (2013-01-07) 1 commit

43 + - Prevent space after directories in tcsh completion

44

45 + Update tcsh command line completion so that an unwanted space is

46 + not added to a single directory name.

47

68 -* ja/directory-attrs (2012-12-17) 1 commit

69 - (merged to 'next' on 2012-12-17 at ced8e73)

70 - + Add directory pattern matching to attributes

48 + Will merge to 'next'.

49

72 - The attribute mechanism didn't allow limiting attributes to be

73 - applied to only a single directory itself with "path/" like the

74 - exclude mechanism does.

50

51 +* dg/subtree-fixes (2013-01-08) 7 commits

52 + - contrib/subtree: mkdir the manual directory if needed

53 + - contrib/subtree: honor $(DESTDIR)

54 + - contrib/subtree: fix synopsis and command help

55 + - contrib/subtree: better error handling for "add"

56 + - contrib/subtree: add --unannotate option

57 + - contrib/subtree: use %B for split Subject/Body

58 + - t7900: remove test number comments

59

77 -* jc/fetch-ignore-symref (2012-12-11) 1 commit

78 - (merged to 'next' on 2012-12-17 at 370e2c8)

79 - + fetch: ignore wildcarded refspecs that update local symbolic refs

60 + contrib/subtree updates.

61

81 - Avoid false error from an attempt to update local symbolic ref via

82 - fetch.

62 + Will merge to 'next'.

63

64

85 -* jc/format-color-auto (2012-12-17) 2 commits

86 - (merged to 'next' on 2012-12-18 at 5aaac94)

87 - + log --format: teach %C(auto,black) to respect color config

88 - + t6006: clean up whitespace

65 +* ap/log-mailmap (2013-01-08) 11 commits

66 + - log --use-mailmap: optimize for cases without --author/--committer search

67 + - log: add log.mailmap configuration option

68 + - log: grep author/committer using mailmap

69 + - test: add test for --use-mailmap option

70 + - log: add --use-mailmap option

71 + - pretty: use mailmap to display username and email

72 + - mailmap: add mailmap structure to rev_info and pp

73 + - mailmap: simplify map_user() interface

74 + - mailmap: remove email copy and length limitation

75 + - Use split_ident_line to parse author and committer

76 + - string-list: allow case-insensitive string list

77

90 - Introduce "log --format=%C(auto,blue)Foo%C(auto,reset)" that does

91 - not color its output when writing to a non-terminal.

78 + Teach commands in the "log" family to optionally pay attention to

79 + the mailmap.

80

81 + Will merge to 'next'.

82

94 -* jk/complete-commit-c (2012-12-15) 1 commit

95 - (merged to 'next' on 2012-12-18 at 75b5f21)

96 - + completion: complete refs for "git commit -c"

83

98 - Complete "git commmit -c foo<TAB>" into a refname that begins with

99 - "foo".

84 +* nd/upload-pack-shallow-must-be-commit (2013-01-08) 1 commit

85 + - upload-pack: only accept commits from "shallow" line

86

87 + A minor consistency check patch that does not have much relevance

88 + to the real world.

89

102 -* jk/error-const-return (2012-12-15) 2 commits

103 - (merged to 'next' on 2012-12-22 at bf2b1cd)

104 - + silence some -Wuninitialized false positives

105 - + make error()'s constant return value more visible

90 + Will merge to 'next'.

91

107 - Help compilers' flow analysis by making it more explicit that

108 - error() always returns -1, to reduce false "variable used

109 - uninitialized" warnings. Looks somewhat ugly but not too much.

92 +--------------------------------------------------

93 +[Graduated to "master"]

94

95 +* ap/merge-stop-at-prepare-commit-msg-failure (2013-01-03) 1 commit

96 + (merged to 'next' on 2013-01-07 at 6790566)

97 + + merge: Honor prepare-commit-msg return code

98

112 -* jk/fsck-dot-in-trees (2012-11-28) 2 commits

113 - (merged to 'next' on 2012-11-28 at 519dabc)

114 - + fsck: warn about ".git" in trees

115 - + fsck: warn about '.' and '..' in trees

99 + Originally merged to 'next' on 2013-01-04

100

101 + "git merge" started calling prepare-commit-msg hook like "git

102 + commit" does some time ago, but forgot to pay attention to the exit

103 + status of the hook. t7505 may want a general clean-up but that is

104 + a different topic.

105

118 -* jk/mailmap-from-blob (2012-12-13) 5 commits

119 - (merged to 'next' on 2012-12-17 at 14b7cdc)

120 - + mailmap: default mailmap.blob in bare repositories

121 - + mailmap: fix some documentation loose-ends for mailmap.blob

122 - + mailmap: clean up read_mailmap error handling

123 - + mailmap: support reading mailmap from blobs

124 - + mailmap: refactor mailmap parsing for non-file sources

106

126 - Allow us to read, and default to read, mailmap files from the tip

127 - of the history in bare repositories. This will help running tools

128 - like shortlog in server settings.

107 +* as/test-name-alias-uniquely (2012-12-28) 1 commit

108 + (merged to 'next' on 2013-01-07 at 3b11c25)

109 + + Use longer alias names in subdirectory tests

110

111 + Originally merged to 'next' on 2013-01-02

112

131 -* mh/unify-xml-in-imap-send-and-http-push (2012-12-02) 8 commits

132 - (merged to 'next' on 2012-12-03 at d677090)

133 - + wrap_in_html(): process message in bulk rather than line-by-line

134 - + wrap_in_html(): use strbuf_addstr_xml_quoted()

135 - + imap-send: change msg_data from storing (ptr, len) to storing strbuf

136 - + imap-send: correctly report errors reading from stdin

137 - + imap-send: store all_msgs as a strbuf

138 - + lf_to_crlf(): NUL-terminate msg_data::data

139 - + xml_entities(): use function strbuf_addstr_xml_quoted()

140 - + Add new function strbuf_add_xml_quoted()

113 + A few short-and-bland aliases used in the tests were interfering

114 + with git-custom command in user's $PATH.

115

142 - Update imap-send to reuse xml quoting code from http-push codepath,

143 - clean up some code, and fix a small bug.

116

117 +* cc/no-gitk-build-dependency (2012-12-18) 3 commits

118 + + Makefile: replace "echo 1>..." with "echo >..."

119 + + Makefile: detect when PYTHON_PATH changes

120 + + Makefile: remove tracking of TCLTK_PATH

121

146 -* nd/pathspec-wildcard (2012-11-26) 4 commits

147 - (merged to 'next' on 2012-12-03 at eca0fcb)

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

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

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

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

122 + Remove leftover bits from an earlier change to move gitk in its own

123 + subdirectory. Reimplementing the dependency tracking rules needs

124 + to be done in gitk history separately.

125

153 - Optimize matching paths with common forms of pathspecs that contain

154 - wildcard characters.

126

127 +* er/python-version-requirements (2012-12-28) 1 commit

128 + (merged to 'next' on 2013-01-07 at 4954e27)

129 + + Add checks to Python scripts for version dependencies.

130

157 -* wk/submodule-update-remote (2012-12-19) 3 commits

158 - (merged to 'next' on 2012-12-22 at 7ddf897)

159 - + submodule add: If --branch is given, record it in .gitmodules

160 - + submodule update: add --remote for submodule's upstream changes

161 - + submodule: add get_submodule_config helper funtion

131 + Originally merged to 'next' on 2013-01-02

132

163 - The beginning of 'integrate with the tip of the remote branch, not

164 - the commit recorded in the superproject gitlink' support.

133 + Some python scripts we ship cannot be run with old versions of the

134 + interpreter.

135

166 ---------------------------------------------------

167 -[New Topics]

136

169 -* jk/pathspec-literal (2013-01-06) 1 commit

170 - - t6130-pathspec-noglob: Windows does not allow a file named "f*"

137 +* er/stop-recommending-parsecvs (2012-12-28) 1 commit

138 + (merged to 'next' on 2013-01-07 at 689f28f)

139 + + Remove the suggestion to use parsecvs, which is currently broken.

140

172 - Will merge to 'next' and 'master' as a quick "oops" fix.

141 + Originally merged to 'next' on 2013-01-02

142

143 + Stop recommending a defunct third-party software.

144

175 -* as/dir-c-cleanup (2012-12-28) 10 commits

176 - - dir.c: rename free_excludes() to clear_exclude_list()

177 - - dir.c: refactor is_path_excluded()

178 - - dir.c: refactor is_excluded()

179 - - dir.c: refactor is_excluded_from_list()

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

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

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

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

184 - - Improve documentation and comments regarding directory traversal API

185 - - api-directory-listing.txt: update to match code

186 - (this branch is used by as/check-ignore.)

145

188 - Separated an earlier and more solidly done bits from the other

189 - topic.

146 +* fc/remote-bzr (2013-01-02) 9 commits

147 + (merged to 'next' on 2013-01-07 at f8c0b76)

148 + + remote-bzr: detect local repositories

149 + + remote-bzr: add support for older versions of bzr

150 + + remote-bzr: add support to push special modes

151 + + remote-bzr: add support for fecthing special modes

152 + + remote-bzr: add simple tests

153 + + remote-bzr: update working tree upon pushing

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

155 + + remote-bzr: add support for pushing

156 + + Add new remote-bzr transport helper

157

191 - Will merge to 'next'.

158 + Originally merged to 'next' on 2013-01-04

159

160 + New remote helper for bzr, with minimum fix squashed in.

161

194 -* jk/config-uname (2013-01-03) 1 commit

195 - - Makefile: hoist uname autodetection to config.mak.uname

162

197 - Move the bits to set fallback default based on the platform from

198 - the main Makefile to a separate file, so that it can be included in

199 - Makefiles in subdirectories.

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

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

165

201 - Will merge to 'next'.

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

167 + possibility that whitespace fix could shrink the preimage and

168 + change the number of lines in it.

169 +

170 +

171 +* jc/submittingpatches (2013-01-02) 4 commits

172 + (merged to 'next' on 2013-01-07 at 1cc3b8e)

173 + + SubmittingPatches: give list and maintainer addresses

174 + + SubmittingPatches: remove overlong checklist

175 + + SubmittingPatches: mention subsystems with dedicated repositories

176 + + SubmittingPatches: who am I and who cares?

177

178 + Originally merged to 'next' on 2013-01-04

179

204 -* jc/push-2.0-default-to-simple (2013-01-04) 10 commits

205 - - push: switch default from "matching" to "simple"

206 - - t9401: do not assume the "matching" push is the default

207 - - t9400: do not assume the "matching" push is the default

208 - - t7406: do not assume the "matching" push is the default

209 - - t5531: do not assume the "matching" push is the default

210 - - t5519: do not assume the "matching" push is the default

211 - - t5517: do not assume the "matching" push is the default

212 - - t5516: do not assume the "matching" push is the default

213 - - t5505: do not assume the "matching" push is the default

214 - - t5404: do not assume the "matching" push is the default

180 + Streamline the document and update with a few e-mail addresses the

181 + patches should be sent to.

182

216 - Will merge to 'next' and cook there until Git 2.0.

183

184 +* jk/enable-test-lint-by-default (2013-01-03) 1 commit

185 + (merged to 'next' on 2013-01-07 at 2a77155)

186 + + tests: turn on test-lint by default

187 +

188 + Originally merged to 'next' on 2013-01-04

189

219 -* jk/maint-fast-import-doc-dedup-done (2013-01-05) 1 commit

220 - - git-fast-import(1): remove duplicate "--done" option

190 + We had two simple and quick tests to catch common mistakes when

191 + writing test scripts, but they weren't run by default when running

192 + tests.

193

222 - Will merge to 'next' and 'master' as a quick "oops" fix.

194 +

195 +* jk/maint-fast-import-doc-dedup-done (2013-01-07) 1 commit

196 + (merged to 'next' on 2013-01-07 at af6a054)

197 + + git-fast-import(1): remove duplicate '--done' option

198

199 The "logical order" reorganization can come after that is done and

200 can cook longer in 'next'.

201

202

228 -* jk/unify-exit-code-by-receiving-signal (2013-01-06) 1 commit

229 - - run-command: encode signal death as a positive integer

203 +* jk/pathspec-literal (2013-01-06) 1 commit

204 + (merged to 'next' on 2013-01-07 at f0725cc)

205 + + t6130-pathspec-noglob: Windows does not allow a file named "f*"

206

231 - The internal logic had to deal with two representations of a death

232 - of a child process by a signal.

207 + Finishing touches to unbreak a test on Windows.

208

234 - Will merge to 'next'.

209

210 +* jn/less-reconfigure (2013-01-02) 1 commit

211 + (merged to 'next' on 2013-01-07 at 04c11cb)

212 + + build: do not automatically reconfigure unless configure.ac changed

213

237 -* jl/interrupt-clone-remove-separate-git-dir (2013-01-05) 1 commit

238 - - clone: support atomic operation with --separate-git-dir

214 + Originally merged to 'next' on 2013-01-02

215

240 - When "git clone --separate-git-dir" is interrupted, we failed to

241 - remove the real location we created the repository.

216 + When autoconf is used, any build on a different commit always ran

217 + "config.status --recheck" even when unnecessary.

218

243 - Will merge to 'next'.

219

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

221 + + config: exit on error accessing any config file

222 + + doc: advertise GIT_CONFIG_NOSYSTEM

223 + + config: treat user and xdg config permission problems as errors

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

225

246 -* rs/leave-base-name-in-name-field-of-tar (2013-01-05) 1 commit

247 - - archive-tar: split long paths more carefully

226 + Deal with a situation where .config/git is a file and we notice

227 + .config/git/config is not readable due to ENOTDIR, not ENOENT.

228

249 - Improve compatibility with implementations of "tar" that do not

250 - like empty name field in header (with the additional prefix field

251 - holding everything).

229

253 - Will merge to 'next'.

230 +* kb/maint-bundle-doc (2013-01-01) 2 commits

231 + (merged to 'next' on 2013-01-07 at 3d2b1ea)

232 + + Documentation: full-ness of a bundle is significant for cloning

233 + + Documentation: correct example restore from bundle

234

235 + Originally merged to 'next' on 2013-01-04

236

256 -* as/api-allocation-doc (2013-01-06) 1 commit

257 - - api-allocation-growing.txt: encourage better variable naming

237 + Update an example in the "git bundle" documentation.

238

259 - Will merge to 'next'.

239

240 +* mz/oneway-merge-wo-u-no-lstat (2012-12-20) 1 commit

241 + + oneway_merge(): only lstat() when told to update worktree

242

262 -* jc/comment-cygwin-win32api-in-makefile (2013-01-06) 1 commit

263 - - Makefile: add comment on CYGWIN_V15_WIN32API

243 + Optimize "read-tree -m <tree-ish>" without "-u".

244

265 - Will merge to 'next'.

245

246 +* nd/maint-branch-desc-doc (2013-01-03) 5 commits

247 + (merged to 'next' on 2013-01-07 at 5117679)

248 + + format-patch: pick up branch description when no ref is specified

249 + + format-patch: pick up correct branch name from symbolic ref

250 + + t4014: a few more tests on cover letter using branch description

251 + + branch: delete branch description if it's empty

252 + + config.txt: a few lines about branch.<name>.description

253

268 -* jn/xml-depends-on-asciidoc-conf (2013-01-06) 1 commit

269 - - docs: manpage XML depends on asciidoc.conf

254 + Originally merged to 'next' on 2013-01-04

255

271 - Will merge to 'next'.

256 + Teach various forms of "format-patch" command line to identify what

257 + branch the patches are taken from, so that the branch description

258 + is picked up in more cases.

259

260

274 -* nd/clone-no-separate-git-dir-with-bare (2013-01-06) 1 commit

275 - - clone: forbid --bare --separate-git-dir <dir>

261 +* os/gitweb-highlight-uncaptured (2013-01-01) 1 commit

262 + (merged to 'next' on 2013-01-07 at 5db0558)

263 + + gitweb: fix error in sanitize when highlight is enabled

264

277 - Expecting a reroll.

278 - $gmane/212863

265 + Originally merged to 'next' on 2013-01-04

266

267 + The code to sanitize control characters before passing it to

268 + "highlight" filter lost known-to-be-safe control characters by

269 + mistake.

270

281 -* nd/parse-pathspec (2013-01-06) 21 commits

282 - - Convert more init_pathspec() to parse_pathspec()

283 - - Convert add_files_to_cache to take struct pathspec

284 - - Convert {read,fill}_directory to take struct pathspec

285 - - Convert refresh_index to take struct pathspec

286 - - Convert report_path_error to take struct pathspec

287 - - checkout: convert read_tree_some to take struct pathspec

288 - - Convert unmerge_cache to take struct pathspec

289 - - Convert read_cache_preload() to take struct pathspec

290 - - add: convert to use parse_pathspec

291 - - archive: convert to use parse_pathspec

292 - - ls-files: convert to use parse_pathspec

293 - - rm: convert to use parse_pathspec

294 - - checkout: convert to use parse_pathspec

295 - - rerere: convert to use parse_pathspec

296 - - status: convert to use parse_pathspec

297 - - commit: convert to use parse_pathspec

298 - - clean: convert to use parse_pathspec

299 - - Export parse_pathspec() and convert some get_pathspec() calls

300 - - pathspec: make sure the prefix part is wildcard-clean

301 - - Add parse_pathspec() that converts cmdline args to struct pathspec

302 - - pathspec: save the non-wildcard length part

271

304 - Uses the parsed pathspec structure in more places where we used to

305 - use the raw "array of strings" pathspec.

272 +* ta/remove-stale-translated-tut (2012-12-27) 1 commit

273 + (merged to 'next' on 2013-01-07 at 47b1056)

274 + + Remove Documentation/pt_BR/gittutorial.txt

275

307 - Unfortunately, this conflicts a couple of topics in flight. I tried

308 - to be careful while resolving conflicts, though.

276 + Originally merged to 'next' on 2013-01-02

277

278 + Remove a translation of a document that was left stale.

279

311 -* rs/zip-tests (2013-01-06) 4 commits

312 - - t5003: check if unzip supports symlinks

313 - - t5000, t5003: move ZIP tests into their own script

314 - - t0024, t5000: use test_lazy_prereq for UNZIP

315 - - t0024, t5000: clear variable UNZIP, use GIT_UNZIP instead

280

317 - Updates zip tests to skip some that cannot be handled on platform

318 - unzip.

281 +* tb/test-t9020-no-which (2013-01-01) 1 commit

282 + (merged to 'next' on 2013-01-07 at 9661948)

283 + + t9020: which is not portable

284

320 - I've renamed the t5002 in the original to t5003 to avoid name

321 - clashes with another topic in flight.

285 + Originally merged to 'next' on 2013-01-04

286

323 - Will merge to 'next'.

287 + Test portability update.

288

289

326 -* rs/zip-with-uncompressed-size-in-the-header (2013-01-06) 1 commit

327 - - archive-zip: write uncompressed size into header even with streaming

290 +* tb/test-t9810-no-sed-i (2013-01-01) 1 commit

291 + (merged to 'next' on 2013-01-07 at cd82266)

292 + + t9810: Do not use sed -i

293

329 - Improve compatibility of our zip output to fill uncompressed size

330 - in the header, which we can do without seeking back (even though it

331 - should not be necessary).

294 + Originally merged to 'next' on 2013-01-04

295

333 - Will merge to 'next'.

296 + Test portability update.

297

298 --------------------------------------------------

299 [Stalled]

300

301 * jl/submodule-deinit (2012-12-04) 1 commit

339 - (merged to 'next' on 2012-12-07 at ea772f0)

340 - + submodule: add 'deinit' command

302 + - submodule: add 'deinit' command

303

304 There was no Porcelain way to say "I no longer am interested in

305 this submodule", once you express your interest in a submodule with

306 "submodule init". "submodule deinit" is the way to do so.

307

346 - But this does not yet do so (does not remove the checkout of the

347 - submodule). The design discussion petered out.

348 -

349 - http://thread.gmane.org/gmane.comp.version-control.git/210867/focus=211456

350 -

351 - Will kick back to 'pu'.

308 + Expecting a reroll.

309 + $gmane/212884

310

311

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

@@ -365,13 +323,10 @@ repositories listed at

323

324

325 * rc/maint-complete-git-p4 (2012-09-24) 1 commit

368 - (merged to 'next' on 2012-10-29 at af52cef)

369 - + Teach git-completion about git p4

326 + - Teach git-completion about git p4

327

328 Comment from Pete will need to be addressed ($gmane/206172).

329

373 - Will kick back to 'pu'.

374 -

330

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

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

@@ -406,16 +361,6 @@ repositories listed at

361 Stalled mostly due to lack of responses.

362

363

409 -* jc/blame-no-follow (2012-09-21) 2 commits

410 - - blame: pay attention to --no-follow

411 - - diff: accept --no-follow option

412 -

413 - Teaches "--no-follow" option to "git blame" to disable its

414 - whole-file rename detection.

415 -

416 - Stalled mostly due to lack of responses.

417 -

418 -

364 * jc/add-delete-default (2012-08-13) 1 commit

365 - git add: notice removal of tracked paths by default

366

@@ -426,7 +371,7 @@ repositories listed at

371 Resurrected from graveyard, as I thought it was a worthwhile thing

372 to do in the longer term.

373

429 - Waiting for comments.

374 + Stalled mostly due to lack of responses.

375

376

377 * mb/remote-default-nn-origin (2012-07-11) 6 commits

@@ -450,208 +395,274 @@ repositories listed at

395 --------------------------------------------------

396 [Cooking]

397

453 -* jn/less-reconfigure (2013-01-02) 1 commit

454 - (merged to 'next' on 2013-01-02 at e5cd6cf)

455 - + build: do not automatically reconfigure unless configure.ac changed

398 +* jc/blame-no-follow (2012-09-21) 2 commits

399 + - blame: pay attention to --no-follow

400 + - diff: accept --no-follow option

401

457 - When autoconf is used, any build on a different commit always ran

458 - "config.status --recheck" even when unnecessary.

402 + Teaches "--no-follow" option to "git blame" to disable its

403 + whole-file rename detection.

404 +

405 + Will merge to 'next'.

406 +

407 +

408 +* as/dir-c-cleanup (2012-12-28) 10 commits

409 + (merged to 'next' on 2013-01-08 at 5aee090)

410 + + dir.c: rename free_excludes() to clear_exclude_list()

411 + + dir.c: refactor is_path_excluded()

412 + + dir.c: refactor is_excluded()

413 + + dir.c: refactor is_excluded_from_list()

414 + + dir.c: rename excluded() to is_excluded()

415 + + dir.c: rename excluded_from_list() to is_excluded_from_list()

416 + + dir.c: rename path_excluded() to is_path_excluded()

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

418 + + Improve documentation and comments regarding directory traversal API

419 + + api-directory-listing.txt: update to match code

420 + (this branch is used by as/check-ignore.)

421 +

422 + Refactor and generally clean up the directory traversal API

423 + implementation.

424

425 Will merge to 'master'.

426

427

463 -* ap/merge-stop-at-prepare-commit-msg-failure (2013-01-03) 1 commit

464 - (merged to 'next' on 2013-01-04 at 251e88b)

465 - + merge: Honor prepare-commit-msg return code

428 +* jk/config-uname (2013-01-03) 1 commit

429 + (merged to 'next' on 2013-01-08 at f986500)

430 + + Makefile: hoist uname autodetection to config.mak.uname

431

467 - "git merge" started calling prepare-commit-msg hook like "git

468 - commit" does some time ago, but forgot to pay attention to the exit

469 - status of the hook. t7505 may want a general clean-up but that is

470 - a different topic.

432 + Move the bits to set fallback default based on the platform from

433 + the main Makefile to a separate file, so that it can be included in

434 + Makefiles in subdirectories.

435

436 Will merge to 'master'.

437

438

475 -* tb/test-shell-lint (2013-01-02) 1 commit

476 - (merged to 'next' on 2013-01-04 at 0289566)

477 - + test: Add check-non-portable-shell.pl

439 +* jc/push-2.0-default-to-simple (2013-01-08) 11 commits

440 + (merged to 'next' on 2013-01-09 at 74c3498)

441 + + doc: push.default is no longer "matching"

442 + + push: switch default from "matching" to "simple"

443 + + t9401: do not assume the "matching" push is the default

444 + + t9400: do not assume the "matching" push is the default

445 + + t7406: do not assume the "matching" push is the default

446 + + t5531: do not assume the "matching" push is the default

447 + + t5519: do not assume the "matching" push is the default

448 + + t5517: do not assume the "matching" push is the default

449 + + t5516: do not assume the "matching" push is the default

450 + + t5505: do not assume the "matching" push is the default

451 + + t5404: do not assume the "matching" push is the default

452

479 - Check for common mistakes in the test scripts, based on simple

480 - pattern-matching.

453 + Will cook in 'next' until Git 2.0 ;-).

454

455

483 -* jk/enable-test-lint-by-default (2013-01-03) 1 commit

484 - (merged to 'next' on 2013-01-04 at 65b21ad)

485 - + tests: turn on test-lint by default

456 +* jk/unify-exit-code-by-receiving-signal (2013-01-06) 1 commit

457 + (merged to 'next' on 2013-01-08 at 5ebf940)

458 + + run-command: encode signal death as a positive integer

459

487 - We had two simple and quick tests to catch common mistakes when

488 - writing test scripts, but they weren't run by default when running

489 - tests.

460 + The internal logic had to deal with two representations of a death

461 + of a child process by a signal.

462

463 Will merge to 'master'.

464

465

494 -* jc/doc-maintainer (2013-01-03) 2 commits

495 - - howto/maintain: mark titles for asciidoc

496 - - Documentation: update "howto maintain git"

466 +* jl/interrupt-clone-remove-separate-git-dir (2013-01-05) 1 commit

467 + (merged to 'next' on 2013-01-08 at 568f874)

468 + + clone: support atomic operation with --separate-git-dir

469

498 - Describe tools for automation that were invented since this

499 - document was originally written.

470 + When "git clone --separate-git-dir" is interrupted, we failed to

471 + remove the real location we created the repository.

472

473 + Will merge to 'master'.

474

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

503 - - remote-testgit: properly check for errors

475

505 - In the longer term, tightening rules is a good thing to do, and

506 - because nobody who has worked in the remote helper area seems to be

507 - interested in reviewing this, I would assume they do not think

508 - such a retroactive tightening will affect their remote helpers. So

509 - let's advance this topic to see what happens.

476 +* rs/leave-base-name-in-name-field-of-tar (2013-01-05) 1 commit

477 + (merged to 'next' on 2013-01-08 at 98f325e)

478 + + archive-tar: split long paths more carefully

479

480 + Improve compatibility with implementations of "tar" that do not

481 + like empty name field in header (with the additional prefix field

482 + holding everything).

483

512 -* fc/remote-bzr (2013-01-02) 9 commits

513 - (merged to 'next' on 2013-01-04 at 7791dcb)

514 - + remote-bzr: detect local repositories

515 - + remote-bzr: add support for older versions of bzr

516 - + remote-bzr: add support to push special modes

517 - + remote-bzr: add support for fecthing special modes

518 - + remote-bzr: add simple tests

519 - + remote-bzr: update working tree upon pushing

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

521 - + remote-bzr: add support for pushing

522 - + Add new remote-bzr transport helper

484 + Will merge to 'master'.

485

524 - New remote helper for bzr, with minimum fix squashed in.

486

526 - Will merge to 'master'.

487 +* as/api-allocation-doc (2013-01-06) 1 commit

488 + (merged to 'next' on 2013-01-08 at c80b544)

489 + + api-allocation-growing.txt: encourage better variable naming

490

491 + Will merge to 'master'.

492

529 -* mo/cvs-server-updates (2012-12-09) 18 commits

530 - - t9402: Use TABs for indentation

531 - - t9402: Rename check.cvsCount and check.list

532 - - t9402: Simplify git ls-tree

533 - - t9402: Add missing &&; Code style

534 - - t9402: No space after IO-redirection

535 - - t9402: Dont use test_must_fail cvs

536 - - t9402: improve check_end_tree() and check_end_full_tree()

537 - - t9402: sed -i is not portable

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

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

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

541 - - cvsserver: Add version awareness to argsfromdir

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

543 - - cvsserver: implement req_Sticky and related utilities

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

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

546 - - cvsserver: cleanup extra slashes in filename arguments

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

548 -

549 - As nobody seems to be stepping up to review this, I am tempted to

550 - merge this to 'next and see who screams.

493

552 - Will merge to 'next'.

494 +* jc/comment-cygwin-win32api-in-makefile (2013-01-06) 1 commit

495 + (merged to 'next' on 2013-01-08 at dea04e8)

496 + + Makefile: add comment on CYGWIN_V15_WIN32API

497

498 + Will merge to 'master'.

499

555 -* jc/submittingpatches (2013-01-02) 4 commits

556 - (merged to 'next' on 2013-01-04 at 060ffb0)

557 - + SubmittingPatches: give list and maintainer addresses

558 - + SubmittingPatches: remove overlong checklist

559 - + SubmittingPatches: mention subsystems with dedicated repositories

560 - + SubmittingPatches: who am I and who cares?

500

562 - Streamline the document and update with a few e-mail addresses the

563 - patches should be sent to.

501 +* jn/xml-depends-on-asciidoc-conf (2013-01-06) 1 commit

502 + (merged to 'next' on 2013-01-08 at 4faf8d4)

503 + + docs: manpage XML depends on asciidoc.conf

504

505 Will merge to 'master'.

506

507

568 -* kb/maint-bundle-doc (2013-01-01) 2 commits

569 - (merged to 'next' on 2013-01-04 at 73486d9)

570 - + Documentation: full-ness of a bundle is significant for cloning

571 - + Documentation: correct example restore from bundle

508 +* nd/clone-no-separate-git-dir-with-bare (2013-01-06) 1 commit

509 + - clone: forbid --bare --separate-git-dir <dir>

510

573 - Will merge to 'master'.

511 + Expecting a reroll.

512 + $gmane/212863

513

514

576 -* nd/maint-branch-desc-doc (2013-01-03) 5 commits

577 - (merged to 'next' on 2013-01-04 at d05a47f)

578 - + format-patch: pick up branch description when no ref is specified

579 - + format-patch: pick up correct branch name from symbolic ref

580 - + t4014: a few more tests on cover letter using branch description

581 - + branch: delete branch description if it's empty

582 - + config.txt: a few lines about branch.<name>.description

515 +* nd/parse-pathspec (2013-01-06) 21 commits

516 + - Convert more init_pathspec() to parse_pathspec()

517 + - Convert add_files_to_cache to take struct pathspec

518 + - Convert {read,fill}_directory to take struct pathspec

519 + - Convert refresh_index to take struct pathspec

520 + - Convert report_path_error to take struct pathspec

521 + - checkout: convert read_tree_some to take struct pathspec

522 + - Convert unmerge_cache to take struct pathspec

523 + - Convert read_cache_preload() to take struct pathspec

524 + - add: convert to use parse_pathspec

525 + - archive: convert to use parse_pathspec

526 + - ls-files: convert to use parse_pathspec

527 + - rm: convert to use parse_pathspec

528 + - checkout: convert to use parse_pathspec

529 + - rerere: convert to use parse_pathspec

530 + - status: convert to use parse_pathspec

531 + - commit: convert to use parse_pathspec

532 + - clean: convert to use parse_pathspec

533 + - Export parse_pathspec() and convert some get_pathspec() calls

534 + - pathspec: make sure the prefix part is wildcard-clean

535 + - Add parse_pathspec() that converts cmdline args to struct pathspec

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

537

584 - Teach various forms of "format-patch" command line to identify what

585 - branch the patches are taken from, so that the branch description

586 - is picked up in more cases.

538 + Uses the parsed pathspec structure in more places where we used to

539 + use the raw "array of strings" pathspec.

540 +

541 + Unfortunately, this conflicts a couple of topics in flight. I tried

542 + to be careful while resolving conflicts, though.

543 +

544 + Expecting a reroll after the dust settles.

545 +

546 +

547 +* rs/zip-tests (2013-01-07) 4 commits

548 + (merged to 'next' on 2013-01-08 at 8e37423)

549 + + t5003: check if unzip supports symlinks

550 + + t5000, t5003: move ZIP tests into their own script

551 + + t0024, t5000: use test_lazy_prereq for UNZIP

552 + + t0024, t5000: clear variable UNZIP, use GIT_UNZIP instead

553 +

554 + Updates zip tests to skip some that cannot be handled on platform

555 + unzip.

556 +

557 + I've renamed the t5002 in the original to t5003 to avoid name

558 + clashes with another topic in flight.

559

560 Will merge to 'master'.

561

562

591 -* tb/test-t9020-no-which (2013-01-01) 1 commit

592 - (merged to 'next' on 2013-01-04 at 0bcf646)

593 - + t9020: which is not portable

563 +* rs/zip-with-uncompressed-size-in-the-header (2013-01-06) 1 commit

564 + (merged to 'next' on 2013-01-08 at d9ec30e)

565 + + archive-zip: write uncompressed size into header even with streaming

566 +

567 + Improve compatibility of our zip output to fill uncompressed size

568 + in the header, which we can do without seeking back (even though it

569 + should not be necessary).

570

571 Will merge to 'master'.

572

573

598 -* tb/test-t9810-no-sed-i (2013-01-01) 1 commit

599 - (merged to 'next' on 2013-01-04 at 0da03e6)

600 - + t9810: Do not use sed -i

574 +* tb/test-shell-lint (2013-01-02) 1 commit

575 + (merged to 'next' on 2013-01-07 at 0bca54a)

576 + + test: Add check-non-portable-shell.pl

577 +

578 + Originally merged to 'next' on 2013-01-04

579 +

580 + Check for common mistakes in the test scripts, based on simple

581 + pattern-matching.

582

583 Will merge to 'master'.

584

585

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

606 - (merged to 'next' on 2013-01-02 at b9db3a2)

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

586 +* jc/doc-maintainer (2013-01-03) 2 commits

587 + - howto/maintain: mark titles for asciidoc

588 + - Documentation: update "howto maintain git"

589

609 - Save output from format-patch command in a temporary file, just in

610 - case it aborts, to give a better failure-case behaviour.

590 + Describe tools for automation that were invented since this

591 + document was originally written.

592

593 + Will merge to 'next'.

594

613 -* ap/status-ignored-in-ignored-directory (2013-01-06) 3 commits

614 - - status: always report ignored tracked directories

615 - (merged to 'next' on 2013-01-04 at 114fb2f)

616 - + git-status: Test --ignored behavior

617 - + dir.c: Make git-status --ignored more consistent

595

619 - Output from "git status --ignored" showed an unexpected interaction

620 - with "--untracked".

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

597 + - remote-testgit: properly check for errors

598

599 + In the longer term, tightening rules is a good thing to do, and

600 + because nobody who has worked in the remote helper area seems to be

601 + interested in reviewing this, I would assume they do not think

602 + such a retroactive tightening will affect their remote helpers. So

603 + let's advance this topic to see what happens.

604

623 -* ta/remove-stale-translated-tut (2012-12-27) 1 commit

624 - (merged to 'next' on 2013-01-02 at e70df8e)

625 - + Remove Documentation/pt_BR/gittutorial.txt

605 + Will merge to 'next'.

606

627 - Remove a translation of a document that was left stale.

607

629 - Will merge to 'master'.

608 +* mo/cvs-server-updates (2012-12-09) 18 commits

609 + (merged to 'next' on 2013-01-08 at 75e2d11)

610 + + t9402: Use TABs for indentation

611 + + t9402: Rename check.cvsCount and check.list

612 + + t9402: Simplify git ls-tree

613 + + t9402: Add missing &&; Code style

614 + + t9402: No space after IO-redirection

615 + + t9402: Dont use test_must_fail cvs

616 + + t9402: improve check_end_tree() and check_end_full_tree()

617 + + t9402: sed -i is not portable

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

619 + + cvsserver: add t9402 to test branch and tag refs

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

621 + + cvsserver: Add version awareness to argsfromdir

622 + + cvsserver: generalize getmeta() to recognize commit refs

623 + + cvsserver: implement req_Sticky and related utilities

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

625 + + cvsserver: define a tag name character escape mechanism

626 + + cvsserver: cleanup extra slashes in filename arguments

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

628 +

629 + Various git-cvsserver updates.

630 +

631 + Will cook in 'next' for a while to see if anybody screams.

632

633

632 -* er/stop-recommending-parsecvs (2012-12-28) 1 commit

633 - (merged to 'next' on 2013-01-02 at fd816dd)

634 - + Remove the suggestion to use parsecvs, which is currently broken.

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

635 + (merged to 'next' on 2013-01-07 at 9e2ee43)

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

637

636 - Stop recommending a defunct third-party software.

638 + Originally merged to 'next' on 2013-01-02

639 +

640 + Save output from format-patch command in a temporary file, just in

641 + case it aborts, to give a better failure-case behaviour.

642

643 Will merge to 'master'.

644

645

641 -* as/test-name-alias-uniquely (2012-12-28) 1 commit

642 - (merged to 'next' on 2013-01-02 at e297810)

643 - + Use longer alias names in subdirectory tests

646 +* ap/status-ignored-in-ignored-directory (2013-01-07) 3 commits

647 + - status: always report ignored tracked directories

648 + (merged to 'next' on 2013-01-07 at 2a20b19)

649 + + git-status: Test --ignored behavior

650 + + dir.c: Make git-status --ignored more consistent

651

645 - A few short-and-bland aliases used in the tests were interfering

646 - with git-custom command in user's $PATH.

652 + Originally merged to 'next' on 2013-01-04

653

648 - Will merge to 'master'.

654 + Output from "git status --ignored" showed an unexpected interaction

655 + with "--untracked".

656 +

657 + Will merge to 'next'.

658

659

660 * jc/maint-fmt-merge-msg-no-edit-lose-credit (2012-12-28) 1 commit

652 - (merged to 'next' on 2013-01-02 at 8795e87)

661 + (merged to 'next' on 2013-01-07 at 497bf10)

662 + merge --no-edit: do not credit people involved in the side branch

663

664 + Originally merged to 'next' on 2013-01-02

665 +

666 Stop spending cycles to compute information to be placed on

667 commented lines in "merge --no-edit".

668

@@ -672,11 +683,12 @@ repositories listed at

683 - dir.c: use a single struct exclude_list per source of excludes

684 (this branch uses as/dir-c-cleanup.)

685

675 - Rerolled.

686 + The test it adds seems to break under dash.

687 + Expecting a reroll or fixup.

688

689

690 * jc/format-patch-reroll (2013-01-03) 9 commits

679 - (merged to 'next' on 2013-01-04 at 6840dbd)

691 + (merged to 'next' on 2013-01-07 at 0e007e6)

692 + format-patch: give --reroll-count a short synonym -v

693 + format-patch: document and test --reroll-count

694 + format-patch: add --reroll-count=$N option

@@ -687,6 +699,8 @@ repositories listed at

699 + builtin/log.c: drop redundant "numbered_files" parameter from make_cover_letter()

700 + builtin/log.c: drop unused "numbered" parameter from make_cover_letter()

701

702 + Originally merged to 'next' on 2013-01-04

703 +

704 Teach "format-patch" to prefix v4- to its output files for the

705 fourth iteration of a patch series, to make it easier for the

706 submitter to keep separate copies for iterations.

@@ -695,16 +709,20 @@ repositories listed at

709

710

711 * mz/pick-unborn (2012-12-23) 2 commits

698 - (merged to 'next' on 2013-01-02 at 22b9951)

712 + (merged to 'next' on 2013-01-07 at c6c062b)

713 + learn to pick/revert into unborn branch

714 + tests: move test_cmp_rev to test-lib-functions

715

716 + Originally merged to 'next' on 2013-01-02

717 +

718 Allows "git cherry-pick $commit" when you do not have any history

719 behind HEAD yet.

720

721 + Will merge to 'master'.

722 +

723

724 * nd/retire-fnmatch (2013-01-01) 7 commits

707 - (merged to 'next' on 2013-01-04 at 4dc3ff1)

725 + (merged to 'next' on 2013-01-07 at ab31f9b)

726 + Makefile: add USE_WILDMATCH to use wildmatch as fnmatch

727 + wildmatch: advance faster in <asterisk> + <literal> patterns

728 + wildmatch: make a special case for "*/" with FNM_PATHNAME

@@ -714,41 +732,25 @@ repositories listed at

732 + wildmatch: rename constants and update prototype

733 (this branch uses nd/wildmatch.)

734

735 + Originally merged to 'next' on 2013-01-04

736 +

737 Replace our use of fnmatch(3) with a more feature-rich wildmatch.

738 A handful patches at the bottom have been moved to nd/wildmatch to

739 graduate as part of that branch, before this series solidifies.

740

721 -

722 -* os/gitweb-highlight-uncaptured (2013-01-01) 1 commit

723 - (merged to 'next' on 2013-01-04 at d565cdd)

724 - + gitweb: fix error in sanitize when highlight is enabled

725 -

726 - The code to sanitize control characters before passing it to

727 - "highlight" filter lost known-to-be-safe control characters by

728 - mistake.

729 -

730 - Will merge to 'master'.

741 + Will cook in 'next' a bit longer than other topics.

742

743

744 * jc/merge-blobs (2012-12-26) 5 commits

734 - - merge-tree: fix d/f conflicts

735 - - merge-tree: add comments to clarify what these functions are doing

736 - - merge-tree: lose unused "resolve_directories"

737 - - merge-tree: lose unused "flags" from merge_list

738 - - Which merge_file() function do you mean?

745 + (merged to 'next' on 2013-01-08 at 582ca38)

746 + + merge-tree: fix d/f conflicts

747 + + merge-tree: add comments to clarify what these functions are doing

748 + + merge-tree: lose unused "resolve_directories"

749 + + merge-tree: lose unused "flags" from merge_list

750 + + Which merge_file() function do you mean?

751

752 Update the disused merge-tree proof-of-concept code.

753

742 - Will merge to 'next'.

743 -

744 -

745 -* er/python-version-requirements (2012-12-28) 1 commit

746 - (merged to 'next' on 2013-01-02 at 1023a3f)

747 - + Add checks to Python scripts for version dependencies.

748 -

749 - Some python scripts we ship cannot be run with old versions of the

750 - interpreter.

751 -

754 Will merge to 'master'.

755

756

@@ -759,28 +761,6 @@ repositories listed at

761 $gmane/211935

762

763

762 -* mz/oneway-merge-wo-u-no-lstat (2012-12-20) 1 commit

763 - (merged to 'next' on 2012-12-22 at 87bd30e)

764 - + oneway_merge(): only lstat() when told to update worktree

765 -

766 - Optimize "read-tree -m <tree-ish>" without "-u".

767 -

768 - Will merge to 'master'.

769 -

770 -

771 -* cc/no-gitk-build-dependency (2012-12-18) 3 commits

772 - (merged to 'next' on 2012-12-22 at da7b2cf)

773 - + Makefile: replace "echo 1>..." with "echo >..."

774 - + Makefile: detect when PYTHON_PATH changes

775 - + Makefile: remove tracking of TCLTK_PATH

776 -

777 - Remove leftover bits from an earlier change to move gitk in its own

778 - subdirectory. Reimplementing the dependency tracking rules needs

779 - to be done in gitk history separately.

780 -

781 - Will merge to 'master'.

782 -

783 -

764 * zk/clean-report-failure (2013-01-06) 1 commit

765 - git-clean: Display more accurate delete messages

766

@@ -789,7 +769,7 @@ repositories listed at

769 removed after recursing into a directory, which makes the output

770 confusing and even wrong.

771

792 - Rerolled.

772 + Expecting a response to $gmane/212860.

773

774

775 * mp/complete-paths (2012-12-21) 1 commit

@@ -801,27 +781,9 @@ repositories listed at

781 git-aware logic to enumerate only relevant ones.

782

783 It has been reported (no surprise) that this does not work inside

804 - subdirectory. $gmane/212642

805 -

806 - Waiting for area-experts' review.

807 -

808 -

809 -* ap/log-mailmap (2013-01-06) 10 commits

810 - - log: add log.mailmap configuration option

811 - - log: grep author/committer using mailmap

812 - - test: add test for --use-mailmap option

813 - - log: add --use-mailmap option

814 - - pretty: use mailmap to display username and email

815 - - mailmap: add mailmap structure to rev_info and pp

816 - - mailmap: simplify map_user() interface

817 - - mailmap: remove email copy and length limitation

818 - - Use split_ident_line to parse author and committer

819 - - list_lookup: create case and length search

784 + subdirectory, and fixing it seems to be non-trivial. $gmane/212642

785

821 - Clean up various codepaths around mailmap and teach the "log"

822 - machinery to use it.

823 -

824 - Rerolled.

786 + Waiting for area-experts' help.

787

788

789 * bc/append-signed-off-by (2013-01-01) 12 commits

@@ -842,40 +804,13 @@ repositories listed at

804 $gmane/212507

805

806

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

846 - (merged to 'next' on 2012-11-28 at 43d51c2)

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

848 - + doc: advertise GIT_CONFIG_NOSYSTEM

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

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

851 -

852 - Deal with a situation where .config/git is a file and we notice

853 - .config/git/config is not readable due to ENOTDIR, not ENOENT.

854 -

855 - Will merge to 'master'.

856 -

857 -

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

859 - (merged to 'next' on 2012-11-26 at 3af69e7)

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

861 -

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

863 - possibility that whitespace fix could shrink the preimage and

864 - change the number of lines in it.

865 -

866 - Will merge to 'master'.

867 -

868 -

807 * nd/wildmatch (2013-01-01) 18 commits

870 - (merged to 'next' on 2013-01-01 at 8c633a5)

808 + (merged to 'next' on 2013-01-07 at 2a39f7d)

809 + wildmatch: replace variable 'special' with better named ones

810 + compat/fnmatch: respect NO_FNMATCH* even on glibc

811 + wildmatch: fix "**" special case

874 - (merged to 'next' on 2012-12-15 at c734714)

812 + t3070: Disable some failing fnmatch tests

876 - (merged to 'next' on 2012-11-21 at 151288f)

813 + test-wildmatch: avoid Windows path mangling

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

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

815 + wildmatch: make /**/ match zero or more directories

816 + wildmatch: adjust "**" behavior

@@ -891,17 +826,10 @@ repositories listed at

826 + ctype: make sane_ctype[] const array

827 (this branch is used by nd/retire-fnmatch.)

828

829 + Originally merged to 'next' on 2013-01-01

830 +

831 Allows pathname patterns in .gitignore and .gitattributes files

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

833 hierarchies.

834

898 ---------------------------------------------------

899 -[Discarded]

900 -

901 -* jc/doc-default-format (2013-01-03) 2 commits

902 - . Allow installing a non-default set of documentation

903 - . Allow generating a non-default set of documentation

904 -

905 - Instead of the default of generating html/man and installing man,

906 - you can control what "make doc" and "make install-doc" do via two

907 - make variables.

835 + Will merge to 'master'.

What's cooking (2013/01 #04)