e928cf3b8c · matheusbsbs/matheus-bagliano

@@ -1,9 +1,9 @@

1 To: git@vger.kernel.org

2 -Subject: What's cooking in git.git (Feb 2010, #03; Fri, 12)

3 -X-master-at: e923eaeb901ff056421b9007adcbbce271caa7b6

4 -X-next-at: 57c9972634e181f6aad83258a8e7d61f0b99b6ce

2 +Subject: What's cooking in git.git (Feb 2010, #04; Wed, 17)

3 +X-master-at: 1df48766137f2040e2e992d7d278d5aca26406cf

4 +X-next-at: 3b7be804f698c39d8f538d9996786b41c08b7181

5

6 -What's cooking in git.git (Feb 2010, #03; Fri, 12)

6 +What's cooking in git.git (Feb 2010, #04; Wed, 17)

7 --------------------------------------------------

8

9 Here are the topics that have been cooking. Commits prefixed with '-' are

@@ -11,68 +11,205 @@ only in 'pu' while commits prefixed with '+' are in 'next'. The ones

11 marked with '.' do not appear in any of the integration branches, but I am

12 still holding onto them.

13

14 -Now 1.7.0 is out, we will take a short pause and watch breakage reports

15 -for a few days, and then start merging down new topics.

14 +--------------------------------------------------

15 +[Graduated to "master"]

16 +

17 +* jk/cherry-pick-reword (2010-02-11) 5 commits

18 + (merged to 'next' on 2010-02-11 at d0eace1)

19 + + cherry-pick: prettify the advice message

20 + + cherry-pick: show commit name instead of sha1

21 + + cherry-pick: format help message as strbuf

22 + + cherry-pick: refactor commit parsing code

23 + + cherry-pick: rewrap advice message

24 +

25 +* rs/git-dir-cleanup (2010-02-11) 3 commits

26 + (merged to 'next' on 2010-02-11 at fa4f83c)

27 + + Untouch RelNotes 1.7.0: grep --no-index will not be in the release

28 + (merged to 'next' on 2010-02-06 at ef8ab9b)

29 + + Resurrect "git grep --no-index"

30 + + setenv(GIT_DIR) clean-up

31 +

32 +* jk/grep-double-dash (2010-02-06) 1 commit

33 + (merged to 'next' on 2010-02-07 at 2ac040d)

34 + + accept "git grep -- pattern"

35 +

36 +* jc/typo (2010-02-03) 1 commit

37 + + Typofixes outside documentation area

38

39 --------------------------------------------------

40 [New Topics]

41

42 +* dp/maint-1.6.3-hash-sans-mmap (2010-02-14) 1 commit

43 + - don't use mmap() to hash files

44 +

45 +This was more of an RFC in that slurping a potentially huge file into

46 +memory without using mmap() was conceptually wrong. I suspect somebody

47 +is cooking a patch to hash and compress a large blob in chunks straight

48 +into a packfile as a replacement ;-).

49 +

50 +* jc/for-each-ref (2010-02-13) 4 commits

51 + - for-each-ref --format='%(flag)'

52 + - for-each-ref --format='%(symref) %(symref:short)'

53 + - builtin-for-each-ref.c: check if we need to peel onion while parsing the format

54 + - builtin-for-each-ref.c: comment fixes

55 +

56 +Should be Ok for 'next'.

57 +

58 +* jn/gitweb-config-error-die (2010-02-14) 1 commit

59 + - gitweb: Die if there are parsing errors in config file

60 +

61 +Should be Ok for 'next'.

62 +

63 +* jn/maint-fix-pager (2010-02-14) 6 commits

64 + - tests: Add tests for automatic use of pager

65 + - am: Fix launching of pager

66 + - git svn: Fix launching of pager

67 + - git.1: Clarify the behavior of the --paginate option

68 + - Make 'git var GIT_PAGER' always print the configured pager

69 + - Fix 'git var' usage synopsis

70 +

71 +Should be Ok for 'next'.

72 +

73 +* ml/color-when (2010-02-16) 1 commit

74 + - Add an optional argument for --color options

75 +

76 +* hm/imap-send-cram-md5 (2010-02-15) 1 commit

77 + - imap-send: support CRAM-MD5 authentication

78 +

79 +A potential clean-up sent as a counter-proposal; waiting for response.

80 +

81 +* jh/maint-submodule-status-in-void (2010-02-16) 1 commit

82 + - submodule summary: Don't barf when invoked in an empty repo

83 +

84 +Looked Ok for 'next' but I lost track somewhat...

85 +

86 +* ld/maint-diff-quiet-w (2010-02-16) 1 commit

87 + - git diff --quiet -w: check and report the status

88 +

89 +Needs tests but otherwise looked Ok.

90 +

91 +* ml/maint-grep-doc (2010-02-15) 1 commit

92 + (merged to 'next' on 2010-02-16 at 4059a38)

93 + + grep documentation: clarify what files match

94 +

95 +Soon to graduate to 'master'.

96 +

97 +* tc/maint-transport-ls-remote-with-void (2010-02-16) 1 commit

98 + (merged to 'next' on 2010-02-16 at e6ef1a8)

99 + + transport: add got_remote_refs flag

100 +

101 +Soon to graduate to 'master'.

102 +

103 +* bg/apply-blank-at-eof (2010-02-17) 3 commits

104 + - t3417: Add test cases for "rebase --whitespace=fix"

105 + - t4124: Add additional tests of --whitespace=fix

106 + - apply: Allow blank context lines to match beyond EOF

107 +

108 +RFC.

109 +

110 +* gf/maint-sh-setup-nongit-ok (2010-02-16) 1 commit

111 + - require_work_tree broken with NONGIT_OK

112 +

113 +Looked sensible and ready for 'next'.

114 +

115 +* ml/send-pack-transport-refactor (2010-02-16) 1 commit

116 + - Refactoring: remove duplicated code from builtin-send-pack.c and transport.c

117 +

118 +Probably ready for 'next'.

119 +

120 +* np/fast-import-idx-v2 (2010-02-17) 6 commits

121 + - fast-import: use the diff_delta() max_delta_size argument

122 + - fast-import: honor pack.indexversion and pack.packsizelimit config vars

123 + - fast-import: make default pack size unlimited

124 + - fast-import: use write_idx_file() instead of custom code

125 + - fast-import: use sha1write() for pack data

126 + - fast-import: start using struct pack_idx_entry

127 +

128 +* sd/format-patch-to (2010-02-17) 1 commit

129 + - Add 'git format-patch --to=' option and 'format.to' configuration variable.

130 +

131 +Shouldn't be too hard to add tests to t4014; other than that looked ready

132 +for 'next'.

133 +

134 +* sd/init-template (2010-02-17) 2 commits

135 + - Add a "TEMPLATE DIRECTORY" section to git-init[1].

136 + - Add `init.templatedir` configuration variable.

137 +

138 +Shouldn't be too hard to add tests to t0001; other than that looked ready

139 +for 'next'.

140 +

141 +* sd/log-decorate (2010-02-17) 3 commits

142 + - log.decorate: usability fixes

143 + - Add `log.decorate' configuration variable.

144 + - git_config_maybe_bool()

145 +

146 +Probably ready for 'next', except that people need to be warned about

147 +having to update their scripts to explicitly pass --no-decorate to keep

148 +them working.

149 +

150 +* jc/maint-status-preload (2010-02-17) 1 commit

151 + - status: preload index to optimize lstat(2) calls

152 +

153 +--------------------------------------------------

154 +[Cooking]

155 +

156 * ld/push-porcelain (2010-02-09) 4 commits

157 - git-push: fix an error message so it goes to stderr

158 - git-push: make git push --dry-run --porcelain exit with status 0 even if updates will be rejected

159 - git-push: send "To <remoteurl>" messages to the standard output in --porcelain mode

160 - git-push: squelch advice message if in --porcelain mode

161

26 -After some discussion this needs further simplification?

162 +After some discussion this needs further simplification? May need to move

163 +to Stalled.

164

165 * cp/add-u-pathspec (2010-02-09) 2 commits

166 - test for add with non-existent pathspec

167 - git add -u: die on unmatched pathspec

168

32 -* hm/maint-imap-send-crlf (2010-02-12) 1 commit

33 - - git-imap-send: Convert LF to CRLF before storing patch to draft box

169 +I am a bit torn on this one. Traditionally we never complained on

170 +unmatched pathspec when talking about tracked files. If we were to go

171 +this route, I think we should probably enhance the "run_diff_files" and

172 +friends in such a way that they mark matched pathspecs, in a way similar

173 +to match_pathspec() in dir.c does, and report unmatched ones based on

174 +that result, instead of adding an extra pass to scan the index. The same

175 +goes for pathspec_matches() in builtin-grep.c

176

35 -Cram-MD5 from the same author seemed to need another round before landing

36 -here, but this one seemed to be ready for 'pu'.

177 +Incidentally, I've proposed "pathspec unification" as possible GSoC'10

178 +project---with luck, we might finally see a progress on this front ;-)

179

38 -* jk/cherry-pick-reword (2010-02-11) 5 commits

39 - (merged to 'next' on 2010-02-11 at d0eace1)

40 - + cherry-pick: prettify the advice message

41 - + cherry-pick: show commit name instead of sha1

42 - + cherry-pick: format help message as strbuf

43 - + cherry-pick: refactor commit parsing code

44 - + cherry-pick: rewrap advice message

180 +* hm/maint-imap-send-crlf (2010-02-12) 1 commit

181 + (merged to 'next' on 2010-02-17 at c6162cb)

182 + + git-imap-send: Convert LF to CRLF before storing patch to draft box

183

46 -* nd/root-git (2010-02-11) 5 commits

47 - - Add test for using Git at root directory

184 +Soon to graduate to 'master'.

185 +

186 +* nd/root-git (2010-02-14) 5 commits

187 + - Add test for using Git at root of file system

188 - Support working directory located at root

49 - - Add is_root_path()

189 + - Move offset_1st_component() to path.c

190 - init-db, rev-parse --git-dir: do not append redundant slash

191 - make_absolute_path(): Do not append redundant slash

192

53 -The middle one needs replacement, as pointed by Hannes.

193 +How does this interact with the much larger series to rework the set-up

194 +codepath?

195

196 * pb/log-first-parent-p-m (2010-02-10) 1 commit

56 - - git log -p -m: document -m and honor --first-parent

197 + (merged to 'next' on 2010-02-17 at 2f8e5ae)

198 + + git log -p -m: document -m and honor --first-parent

199

200 Needs tests but otherwise looked fine. We might want to teach "-m trumps

201 implicit --cc" to "git show", but that is a totally separate topic.

202

61 ---------------------------------------------------

62 -[Cooking]

63 -

64 -Many of these have been parked in 'pu' during the pre-release freeze.

65 -They will start migrating to 'next' shortly.

66 -

203 * sp/maint-push-sideband (2010-02-10) 8 commits

68 - - receive-pack: Send internal errors over side-band #2

69 - - t5401: Use a bare repository for the remote peer

70 - - receive-pack: Send hook output over side band #2

71 - - receive-pack: Wrap status reports inside side-band-64k

72 - - receive-pack: Refactor how capabilities are shown to the client

73 - - send-pack: demultiplex a sideband stream with status data

74 - - run-command: support custom fd-set in async

75 - - run-command: Allow stderr to be a caller supplied pipe

204 + (merged to 'next' on 2010-02-16 at 6f19e5b)

205 + + receive-pack: Send internal errors over side-band #2

206 + + t5401: Use a bare repository for the remote peer

207 + + receive-pack: Send hook output over side band #2

208 + + receive-pack: Wrap status reports inside side-band-64k

209 + + receive-pack: Refactor how capabilities are shown to the client

210 + + send-pack: demultiplex a sideband stream with status data

211 + + run-command: support custom fd-set in async

212 + + run-command: Allow stderr to be a caller supplied pipe

213 (this branch is used by sp/push-sideband.)

214

215 Based on 1.6.5 maintenance track.

@@ -80,30 +217,19 @@ Based on 1.6.5 maintenance track.

217 * sp/push-sideband (2010-02-10) 0 commits

218 (this branch uses sp/maint-push-sideband.)

219

83 -And my conflict resolution in #ifdef WINDOWS codepath.

220 +This also is in 'next' now.

221

222 * ac/cvsimport-revision-mapping (2010-02-06) 1 commit

86 - - cvsimport: new -R option: generate .git/cvs-revisions mapping

223 + (merged to 'next' on 2010-02-17 at 6756446)

224 + + cvsimport: new -R option: generate .git/cvs-revisions mapping

225

88 -* jc/maint-1.6.3-imap-send-bool-config-fix (2010-02-06) 1 commit

89 - - imap-send: fix longstanding configuration parser bug

226 +Any comments from CVSimport users?

227

228 * js/rebase-origin-x (2010-02-05) 1 commit

229 - [RFC w/o test and incomplete] rebase: add -x option to record original commit name

230

94 -* rs/git-dir-cleanup (2010-02-11) 3 commits

95 - (merged to 'next' on 2010-02-11 at fa4f83c)

96 - + Untouch RelNotes 1.7.0: grep --no-index will not be in the release

97 - (merged to 'next' on 2010-02-06 at ef8ab9b)

98 - + Resurrect "git grep --no-index"

99 - + setenv(GIT_DIR) clean-up

100 -

101 -* jc/typo (2010-02-03) 1 commit

102 - - Typofixes outside documentation area

103 -

104 -* jk/grep-double-dash (2010-02-06) 1 commit

105 - (merged to 'next' on 2010-02-07 at 2ac040d)

106 - + accept "git grep -- pattern"

231 +I retract my objection against the idea of -x; needs polishing before

232 +moving forward.

233

234 * jn/maint-makedepend (2010-01-26) 5 commits

235 - Makefile: drop dependency on $(wildcard */*.h)

@@ -113,8 +239,6 @@ And my conflict resolution in #ifdef WINDOWS codepath.

239 - Makefile: add missing header file dependencies

240 (this branch is used by jn/makedepend and jn/master-makedepend.)

241

116 -These look sensible clean-up that could go to maint later.

117 -

242 * jn/master-makedepend (2010-01-26) 0 commits

243 (this branch uses jn/maint-makedepend; is used by jn/makedepend.)

244

@@ -132,36 +256,45 @@ This is to help merging the clean-up to "master".

256 - Makefile: transport.o depends on branch.h now

257 (this branch uses jn/maint-makedepend and jn/master-makedepend.)

258

135 -And this is to build on top. I don't want to touch build infrastructure

136 -during the pre-release freeze too much to avoid the last minute hassles

137 -that is only discovered when I try to cut RPMs; hence this will stay out

138 -of 'master' until 1.7.0 ships.

259 +And this is to build on top.

260 +Looked ok for 'next'.

261

262 * jc/checkout-detached (2010-01-29) 1 commit

141 - - Reword "detached HEAD" notification

263 + (merged to 'next' on 2010-02-17 at 7e03edc)

264 + + Reword "detached HEAD" notification

265

266 * jc/maint-fix-test-perm (2010-01-30) 2 commits

144 - - lib-patch-mode.sh: Fix permission

145 - - t6000lib: Fix permission

267 + (merged to 'next' on 2010-02-16 at 9d2e037)

268 + + lib-patch-mode.sh: Fix permission

269 + + t6000lib: Fix permission

270

271 * jh/gitweb-caching (2010-01-30) 1 commit

272 - gitweb: Add an option to force version match

273

274 +The controversial one. Will probably drop this. RFC v3 of gitweb caching

275 +series needs to be queued but hasn't happened yet.

276 +

277 * jn/makefile-script-lib (2010-01-31) 1 commit

151 - - Do not install shell libraries executable

278 + (merged to 'next' on 2010-02-16 at f5334f5)

279 + + Do not install shell libraries executable

280

153 -* mv/request-pull-modernize (2010-01-29) 1 commit

154 - - request-pull: avoid mentioning that the start point is a single commit

281 +Soon to graduate to 'master'.

282

156 -* cc/reset-keep (2010-01-19) 5 commits

157 - - reset: disallow using --keep when there are unmerged entries

158 - - reset: disallow "reset --keep" outside a work tree

159 - - Documentation: reset: describe new "--keep" option

160 - - reset: add test cases for "--keep" option

161 - - reset: add option "--keep" to "git reset"

162 -

163 -* jh/notes (2010-01-27) 23 commits

164 - - builtin-notes: Add "add" subcommand for appending to note objects

283 +* mv/request-pull-modernize (2010-01-29) 1 commit

284 + (merged to 'next' on 2010-02-16 at be03aad)

285 + + request-pull: avoid mentioning that the start point is a single commit

286 +

287 +Soon to graduate to 'master'.

288 +

289 +* jh/notes (2010-02-13) 30 commits

290 + - builtin-notes: Add "copy" subcommand for copying notes between objects

291 + - builtin-notes: Misc. refactoring of argc and exit value handling

292 + - builtin-notes: Add -c/-C options for reusing notes

293 + - builtin-notes: Refactor handling of -F option to allow combining -m and -F

294 + - builtin-notes: Deprecate the -m/-F options for "git notes edit"

295 + - builtin-notes: Add "append" subcommand for appending to note objects

296 + - builtin-notes: Add "add" subcommand for adding notes to objects

297 + - builtin-notes: Add --message/--file aliases for -m/-F options

298 - builtin-notes: Add "list" subcommand for listing note objects

299 - Documentation: Generalize git-notes docs to 'objects' instead of 'commits'

300 - builtin-notes: Add "prune" subcommand for removing notes for missing objects

@@ -183,7 +316,17 @@ of 'master' until 1.7.0 ships.

316 - Notes API: init_notes(): Initialize the notes tree from the given notes ref

317 - Add tests for checking correct handling of $GIT_NOTES_REF and core.notesRef

318 - Notes API: get_commit_notes() -> format_note() + remove the commit restriction

186 - - Cosmetic fixes to notes.c

319 + - Minor cosmetic fixes to notes.c

320 +

321 +Looked Ok for 'next'; comments?

322 +

323 +* cc/reset-keep (2010-01-19) 5 commits

324 + - reset: disallow using --keep when there are unmerged entries

325 + - reset: disallow "reset --keep" outside a work tree

326 + - Documentation: reset: describe new "--keep" option

327 + - reset: add test cases for "--keep" option

328 + - reset: add option "--keep" to "git reset"

329

330 * jc/grep-author-all-match-implicit (2010-01-17) 1 commit

189 - - "log --author=me --grep=it" should find intersection, not union

331 + (merged to 'next' on 2010-02-17 at 3b7be80)

332 + + "log --author=me --grep=it" should find intersection, not union

What'c cooking (2010/02 #4)