bead1ece05 · matheusbsbs/matheus-bagliano

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

1 To: git@vger.kernel.org

2 -Subject: What's cooking in git.git (Aug 2009, #01; Wed, 05)

3 -X-master-at: 3f55e4107f7906134df029f9a5c44864f9258110

4 -X-next-at: 2981fa5b8f20e8ff086aceb252c0e693fa2d0c75

2 +Subject: What's cooking in git.git (Aug 2009, #02; Wed, 12)

3 +X-master-at: 6ffd781226f04629eff63a684b47ad7555143312

4 +X-next-at: e5cd0abadfa20eaf7a76784ad5802115c75eff2f

5

6 -What's cooking in git.git (Aug 2009, #01; Wed, 05)

6 +What's cooking in git.git (Aug 2009, #02; Wed, 12)

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

8

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

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

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

12 holding onto them.

13

14 -In preparation for rewinding 'next' after a major release, one topic was

15 -reverted and kicked back to 'pu' to give it a fresh start.

16 -

14 After the 1.6.5 cycle, the next release will be 1.7.0, and we will push

15 out the planned "push safety" change. 1.7.0 would be a good time to

16 introduce "justifiable" changes that are not strictly backward compatible.

@@ -23,94 +20,99 @@ During 1.6.5 cycle, 'next' will hold topics meant for 1.6.5 and 1.7.0.

20 ----------------------------------------------------------------

21 [New Topics]

22

26 -* gb/apply-ignore-whitespace (Tue Aug 4 13:16:49 2009 +0200) 1 commit

27 - - git apply: option to ignore whitespace differences

28 -

29 -* db/vcs-helper (Wed Aug 5 01:02:25 2009 -0400) 13 commits

30 - - Changes for new vcs-helper series

31 - - Add simple test cases of git-vcs-cvs functionality

32 - - First draft of CVS importer using the foreign-scm machinery

33 - - Allow helpers to request marks for fast-import

34 - - Allow helpers to report in "list" command that the ref is

35 - unchanged

36 - - Add support for "import" helper command

37 - - Add a config option for remotes to specify a foreign vcs

38 - - Allow programs to not depend on remotes having urls

39 - - Allow fetch to modify refs

40 - - Use a function to determine whether a remote is valid

41 - - git-http-fetch: not a builtin

42 - - Use an external program to implement fetching with curl

43 - - Add support for external programs for handling native fetches

44 -

45 -This consolidates various previous rounds from Daniel and Johan.

23 +* ld/p4 (Thu Jul 30 00:13:46 2009 +0100) 1 commit

24 + - git-p4: stream from perforce to speed up clones

25 +

26 +Waiting for Ack/Nack from stakeholders. Probably I should merge this to

27 +'next' soon, keep it there for a week and see if anybody screams, aka

28 +"Nack now or forever hold your peace" ;-).

29 +

30 +* mr/gitweb-xz (Thu Aug 6 10:28:25 2009 -0400) 3 commits

31 + - gitweb: add support for XZ compressed snapshots

32 + - gitweb: update INSTALL regarding specific snapshot settings

33 + - gitweb: support to globally disable a snapshot format

34 +

35 +This should be safe as long as it does not silently enable itself for

36 +folks who merely updated gitweb to this version without explicitly asking

37 +for the new format (but I do not remember if that is what the patch does).

38 +

39 +* jh/cvs-helper (Wed Aug 12 02:13:51 2009 +0200) 4 commits

40 + - Add simple selftests of git-remote-cvs functionality

41 + - Third draft of CVS remote helper program

42 + - Add Python support library for CVS remote helper

43 + - Basic build infrastructure for Python scripts

44 +

45 +Builds on db/vcs-helper. The last round failed its own selftest for me,

46 +but this one seems to be Ok. Documentation/git-remote-cvs.txt needs to be

47 +fixed to build, though.

48 +

49 +* bc/maint-am-email (Thu Aug 6 20:08:13 2009 -0500) 2 commits

50 + + git-am: print fair error message when format detection fails

51 + + am: allow individual e-mail files as input

52 +

53 +It seems that the "not mbox but a single piece of e-mail" format was

54 +something many people relied on. I'm cooking this in 'next', and

55 +hopefully it can graduate both to 'master' and 'maint'.

56 +

57 +* js/maint-cover-letter-non-ascii (Mon Aug 10 18:22:22 2009 +0200) 2 commits

58 + + Correctly mark cover letters' encodings if they are not pure ASCII

59 + + Expose the has_non_ascii() function

60 +

61 +* jc/verify-pack-stat (Fri Aug 7 15:45:30 2009 -0700) 2 commits

62 + + verify-pack --stat-only: show histogram without verifying

63 + + Merge branch 'maint' into jc/verify-pack-stat

64 +

65 +* lt/block-sha1 (Wed Aug 12 15:47:55 2009 -0400) 15 commits

66 + + block-sha1: support for architectures with memory alignment

67 + restrictions

68 + + block-sha1: split the different "hacks" to be individually

69 + selected

70 + + block-sha1: move code around

71 + + block-sha1: improve code on large-register-set machines

72 + + block-sha1: improved SHA1 hashing

73 + + block-sha1: perform register rotation using cpp

74 + + block-sha1: get rid of redundant 'lenW' context

75 + + block-sha1: Use '(B&C)+(D&(B^C))' instead of '(B&C)|(D&(B|C))' in

76 + round 3

77 + + block-sha1: macroize the rounds a bit further

78 + + block-sha1: re-use the temporary array as we calculate the SHA1

79 + + block-sha1: make the 'ntohl()' part of the first SHA1 loop

80 + + block-sha1: minor fixups

81 + + block-sha1: try to use rol/ror appropriately

82 + + block-sha1: undo ctx->size change

83 + + Add new optimized C 'block-sha1' routines

84 +

85 +Linus's "written in C, faster than handcrafted asm" SHA-1 implementation

86 +with clean-up and ARM support from Nico.

87 +

88 +* nd/sparse (Tue Aug 11 22:44:06 2009 +0700) 8 commits

89 + . --sparse for porcelains

90 + . Support sparse checkout in unpack_trees() and read-tree

91 + . unpack-trees.c: generalize verify_* functions

92 + . dir.c: export excluded_1() and add_excludes_from_file_1()

93 + . excluded_1(): support exclude "directories" in index

94 + . Read .gitignore from index if it is assume-unchanged

95 + . Avoid writing to buffer in add_excludes_from_file_1()

96 + . Prevent diff machinery from examining assume-unchanged entries on

97 + worktree

98 +

99 +Privately applied but not yet queued to 'pu', expecting a minor reroll

100 +near the tip.

101 +

102 +* jk/maint-merge-msg-fix (Sun Aug 9 06:02:51 2009 -0400) 3 commits

103 + + merge: indicate remote tracking branches in merge message

104 + + merge: fix incorrect merge message for ambiguous tag/branch

105 + + add tests for merge message headings

106

47 -* je/send-email-no-subject (Wed Aug 5 18:49:54 2009 +0200) 1 commit

48 - - send-email: confirm on empty mail subjects

107 +----------------------------------------------------------------

108 +[Graduated to "master"]

109

110 * zf/maint-gitweb-acname (Sun Aug 2 09:42:24 2009 +0200) 1 commit

111 - gitweb: parse_commit_text encoding fix

112

53 -* jc/maint-clean-nested-dir-safety (Tue Jun 30 15:33:45 2009 -0700) 1 commit

54 - - clean: require double -f options to nuke nested git repository and

55 - work tree

56 -

57 -* jc/shortstatus (Tue Aug 4 23:55:22 2009 -0700) 5 commits

58 - - shortstatus: a new command

59 - - status: show worktree status of conflicted paths separately

60 - - wt-status.c: rework the way changes to the index and work tree are

61 - summarized

62 - - diff-index: keep the original index intact

63 - - diff-index: report unmerged new entries

64 -

65 -* bc/mailsplit-cr-at-eol (Tue Aug 4 22:31:59 2009 -0500) 4 commits

66 - - Allow mailsplit (and hence git-am) to handle mails with CRLF line-

67 - endings

68 - - builtin-mailsplit.c: remove read_line_with_nul() since it is no

69 - longer used

70 - - builtin-mailinfo,builtin-mailsplit: use strbufs

71 - - strbuf: add new function strbuf_getwholeline()

72 -

113 * jc/maint-merge-recursive-fix (Thu Jul 30 17:38:15 2009 -0700) 1 commit

114 - merge-recursive: don't segfault while handling rename clashes

115

76 -----------------------------------------------------------------

77 -[Graduated to "master"]

78 -

79 -* ne/futz-upload-pack (Wed Jun 10 01:50:18 2009 +0200) 1 commit

80 - + Shift object enumeration out of upload-pack

81 -

82 -* sb/maint-pull-rebase (Sun Jul 19 09:45:16 2009 +0200) 2 commits

83 - + pull: support rebased upstream + fetch + pull --rebase

84 - + t5520-pull: Test for rebased upstream + fetch + pull --rebase

85 -

86 -* sb/read-tree (Thu Jun 25 22:14:10 2009 -0700) 2 commits

87 - + read-tree: migrate to parse-options

88 - + read-tree: convert unhelpful usage()'s to helpful die()'s

89 -

90 -* sb/parse-options (Tue Jul 7 22:15:41 2009 -0700) 4 commits

91 - + prune-packed: migrate to parse-options

92 - + verify-pack: migrate to parse-options

93 - + verify-tag: migrate to parse-options

94 - + write-tree: migrate to parse-options

95 -

96 -* ns/init-mkdir (Sat Jul 25 06:59:28 2009 +0900) 1 commit

97 - + git init: optionally allow a directory argument

98 -

99 -Straightforward usability change.

100 -

101 -* mk/init-db-parse-options (Sun Jul 12 12:24:32 2009 +0200) 1 commit

102 - + init-db: migrate to parse-options

103 -

104 -* jk/maint-show-tag (Sat Jul 18 06:14:37 2009 -0400) 2 commits

105 - + show: add space between multiple items

106 - + show: suppress extra newline when showing annotated tag

107 -

108 -* jc/apply-epoch-patch (Fri Jul 10 18:38:08 2009 -0700) 1 commit

109 - + apply: notice creation/removal patches produced by GNU diff

110 -

111 -----------------------------------------------------------------

112 -[In 'next']

113 -

116 * js/run-command-updates (Tue Aug 4 11:28:40 2009 +0200) 7 commits

117 + run-command.c: squelch a "use before assignment" warning

118 + receive-pack: remove unnecessary run_status report

@@ -122,12 +124,28 @@ Straightforward usability change.

124 + run_command: return exit code as positive value

125 + MinGW: simplify waitpid() emulation macros

126

125 -Will merge soon.

126 -

127 * mk/grep-max-depth (Wed Jul 22 19:52:15 2009 +0200) 1 commit

128 + grep: Add --max-depth option.

129

130 -Will merge soon.

130 +* jp/symlink-dirs (Wed Jul 29 20:22:25 2009 -0700) 3 commits

131 + + git-checkout: be careful about untracked symlinks

132 + + lstat_cache: guard against full match of length of 'name'

133 + parameter

134 + + Demonstrate bugs when a directory is replaced with a symlink

135 +

136 +----------------------------------------------------------------

137 +[In 'next']

138 +

139 +* bc/mailsplit-cr-at-eol (Tue Aug 4 22:31:59 2009 -0500) 4 commits

140 + + Allow mailsplit (and hence git-am) to handle mails with CRLF line-

141 + endings

142 + + builtin-mailsplit.c: remove read_line_with_nul() since it is no

143 + longer used

144 + + builtin-mailinfo,builtin-mailsplit: use strbufs

145 + + strbuf: add new function strbuf_getwholeline()

146 +

147 +* gb/apply-ignore-whitespace (Tue Aug 4 13:16:49 2009 +0200) 1 commit

148 + + git apply: option to ignore whitespace differences

149

150 * cc/replace (Wed May 27 07:14:09 2009 +0200) 14 commits

151 + t6050: check pushing something based on a replaced commit

@@ -146,20 +164,28 @@ Will merge soon.

164 "refs/replace/"

165 + refs: add a "for_each_replace_ref" function

166

149 -Does not seem to hurt normal operation without "replace". The basic idea

150 -should be easier and safer to use than the graft mechanism. I haven't

151 -tried the replacement myself, though.

167 +* jc/1.7.0-diff-whitespace-only-status (Sat May 23 01:15:35 2009 -0700) 2 commits

168 + + diff: Rename QUIET internal option to QUICK

169 + + diff: change semantics of "ignore whitespace" options

170

153 -* jp/symlink-dirs (Wed Jul 29 20:22:25 2009 -0700) 3 commits

154 - + git-checkout: be careful about untracked symlinks

155 - + lstat_cache: guard against full match of length of 'name'

156 - parameter

157 - + Demonstrate bugs when a directory is replaced with a symlink

171 +This changes exit code from "git diff --ignore-whitespace" and friends

172 +when there is no actual output. It is a backward incompatible change, but

173 +we could argue that it is a bugfix.

174

159 -James's test scripts to expose corner case bugs in the merge and branch

160 -switching machinery, and a few fix-ups.

175 +* jc/1.7.0-push-safety (Mon Feb 9 00:19:46 2009 -0800) 2 commits

176 + + Refuse deleting the current branch via push

177 + + Refuse updating the current branch in a non-bare repository via

178 + push

179

162 -* jn/gitweb-blame (Sat Jul 25 00:44:10 2009 +0200) 10 commits

180 +----------------------------------------------------------------

181 +[In 'pu']

182 +

183 +* jn/gitweb-blame (Thu Aug 6 19:11:52 2009 +0200) 14 commits

184 + - gitweb: Create links leading to 'blame_incremental' using

185 + JavaScript

186 + - gitweb: Incremental blame (proof of concept)

187 + - gitweb: Add optional "time to generate page" info in footer

188 + + Revert the four topmost commits from jn/gitweb-blame topic

189 + gitweb: Create links leading to 'blame_incremental' using

190 JavaScript

191 + gitweb: Incremental blame (proof of concept)

@@ -172,23 +198,63 @@ switching machinery, and a few fix-ups.

198 + gitweb: Mark boundary commits in 'blame' view

199 + gitweb: Make .error style generic

200

175 -Will merge soon.

201 +I haven't picked up Jakub's replacement to the second one from the tip.

202 +We probably should merge up to "Use light/dark" (aef3768) to 'master' and

203 +start the rest over.

204

177 -* jc/1.7.0-diff-whitespace-only-status (Sat May 23 01:15:35 2009 -0700) 2 commits

178 - + diff: Rename QUIET internal option to QUICK

179 - + diff: change semantics of "ignore whitespace" options

205 +* jc/maint-clean-nested-dir-safety (Tue Jun 30 15:33:45 2009 -0700) 1 commit

206 + + clean: require double -f options to nuke nested git repository and

207 + work tree

208

181 -This changes exit code from "git diff --ignore-whitespace" and friends

182 -when there is no actual output. It is a backward incompatible change, but

183 -we could argue that it is a bugfix.

209 +This probably should go in 'master' soonish.

210 +

211 +* jc/shortstatus (Tue Aug 4 23:55:22 2009 -0700) 12 commits

212 + - git stat -s: short status output

213 + - git stat: pathspec limits, unlike traditional "git status"

214 + - git stat: the beginning

215 + + wt-status: collect untracked files in a separate "collect" phase

216 + + Make git_status_config() file scope static to builtin-commit.c

217 + + wt-status: move wt_status_colors[] into wt_status structure

218 + + wt-status: move many global settings to wt_status structure

219 + + commit: --dry-run

220 + + status: show worktree status of conflicted paths separately

221 + + wt-status.c: rework the way changes to the index and work tree are

222 + summarized

223 + + diff-index: keep the original index intact

224 + + diff-index: report unmerged new entries

225

185 -* jc/1.7.0-push-safety (Mon Feb 9 00:19:46 2009 -0800) 2 commits

186 - + Refuse deleting the current branch via push

187 - + Refuse updating the current branch in a non-bare repository via

188 - push

226 +Slowly progressing. I've addressed issues pointed out by Jeff in his

227 +review, and hopefully the whole thing would be ready to go.

228

190 -----------------------------------------------------------------

191 -[In 'pu']

229 +* db/vcs-helper (Sun Aug 9 15:28:28 2009 -0400) 17 commits

230 + - Allow helpers to request marks for fast-import

231 + - Allow helpers to report in "list" command that the ref is

232 + unchanged

233 + - Add support for "import" helper command

234 + - transport-helper_init(): fix a memory leak in error path

235 + - Add a config option for remotes to specify a foreign vcs

236 + - Allow programs to not depend on remotes having urls

237 + - Allow fetch to modify refs

238 + - Use a function to determine whether a remote is valid

239 + - Use a clearer style to issue commands to remote helpers

240 + + Makefile: install hardlinks for git-remote-<scheme> supported by

241 + libcurl if possible

242 + + Makefile: do not link three copies of git-remote-* programs

243 + + Makefile: git-http-fetch does not need expat

244 + + http-fetch: Fix Makefile dependancies

245 + + Add transport native helper executables to .gitignore

246 + + git-http-fetch: not a builtin

247 + + Use an external program to implement fetching with curl

248 + + Add support for external programs for handling native fetches

249 +

250 +This consolidates various previous rounds from Daniel and Johan. It seems

251 +that the use of colon ':' before vcs helper name needs to be corrected

252 +before this series can go further.

253 +

254 +* je/send-email-no-subject (Wed Aug 5 18:49:54 2009 +0200) 1 commit

255 + - send-email: confirm on empty mail subjects

256 +

257 +This seems to break t9001. Near the tip of 'pu' I have a iffy workaround.

258

259 * jh/notes (Wed Jul 29 04:25:26 2009 +0200) 8 commits

260 - t3302-notes-index-expensive: Speed up create_repo()

@@ -200,12 +266,20 @@ we could argue that it is a bugfix.

266 - Add a script to edit/inspect notes

267 - Introduce commit notes

268

203 -* cc/sequencer-rebase-i (Fri Jun 26 23:08:46 2009 +0200) 4 commits

269 +* cc/sequencer-rebase-i (Wed Aug 5 22:53:00 2009 +0200) 8 commits

270 + - rebase -i: use "git sequencer--helper --reset-hard"

271 + - sequencer: add "--reset-hard" option to "git sequencer--helper"

272 + - sequencer: add comments about reset_almost_hard()

273 + - sequencer: add "reset_almost_hard()" and related functions

274 - rebase -i: use "git sequencer--helper --make-patch"

275 - sequencer: free memory used in "make_patch" function

276 - sequencer: add "make_patch" function to save a patch

277 - sequencer: add "builtin-sequencer--helper.c"

278

279 +More sequencer updates. I didn't look at the latest round that had a

280 +handful "oops, fix that earlier botch" patches, expecting a cleaner

281 +reroll.

282 +

283 * jc/mailinfo-remove-brackets (Wed Jul 15 15:31:12 2009 -0700) 1 commit

284 - mailinfo: -b option keeps [bracketed] strings that is not a

285 [PATCH] marker

@@ -220,9 +294,26 @@ we could argue that it is a bugfix.

294 - builtin-add: refactor the meat of interactive_add()

295 - git-apply--interactive: Refactor patch mode code

296

297 +Progress?

298 +

299 * js/stash-dwim (Mon Jul 27 20:37:10 2009 +0200) 1 commit

300 - Make 'git stash -k' a short form for 'git stash save --keep-index'

301

302 +This should be merged to 'next' soonish, but I keep forgetting.

303 +

304 +* pb/tracking (Thu Jul 16 16:26:15 2009 -0500) 7 commits

305 + . branch.c: if remote is not config'd for branch, don't try delete

306 + push config

307 + . branch, checkout: introduce autosetuppush

308 + . move deletion of merge configuration to branch.c

309 + . remote: add per-remote autosetupmerge and autosetuprebase

310 + configuration

311 + . introduce a struct tracking_config

312 + . branch: install_branch_config and struct tracking refactoring

313 + . config: allow false and true values for branch.autosetuprebase

314 +

315 +Has been ejected from 'pu' for some time, expecting a reroll.

316 +

317 * jc/log-tz (Tue Mar 3 00:45:37 2009 -0800) 1 commit

318 - Allow --date=local --date=other-format to work as expected

319

What's cooking (2009/08 #02)