588f4bea89 · matheusbsbs/matheus-bagliano

@@ -1,17 +1,17 @@

1 To: git@vger.kernel.org

2 -Subject: What's cooking in git.git (May 2012, #02; Fri, 4)

3 -X-master-at: 8275905e7e9e8945f0bffdd207f622be39026943

4 -X-next-at: 8a79d964318316d4ce0606e0bf1c5fa7b677a641

2 +Subject: What's cooking in git.git (May 2012, #03; Tue, 8)

3 +X-master-at: a3935e6791c619a9f2f472e9e553d45d88c4e263

4 +X-next-at: fc4d754aa0f0b59f9e5aae11a66367f2db8d5ae0

5

6 -What's cooking in git.git (May 2012, #02; Fri, 4)

6 +What's cooking in git.git (May 2012, #03; Tue, 8)

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

8

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

10 only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'.

11

12 -Both 'next' and 'pu' branches are rapidly shrinking. Given that we would

13 -want to go into feature freeze in a week and half, I think this cycle is

14 -going fairly well.

12 +The ninth batch of topics have graduated to 'master'; we seem to have

13 +accumulated more topics on 'next' in the meantime, but they all look

14 +healthy. It is a good time to start preparing for the feature freeze.

15

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

17 repositories listed at

@@ -21,100 +21,152 @@ repositories listed at

21 --------------------------------------------------

22 [New Topics]

23

24 -* jc/install-no-hardlinks (2012-05-04) 1 commit

25 - - Makefile: NO_INSTALL_HARDLINKS

24 +* ah/maint-grep-double-init (2012-05-07) 1 commit

25 + (merged to 'next' on 2012-05-08 at 51f84c5)

26 + + grep.c: remove redundant line of code

27

27 -Your build platform may support hardlinks but you may prefer not to use

28 -them, e.g. when installing to DESTDIR to make a tarball and untarring on

29 -a filesystem that has poor support for hardlinks.

28 +Will merge to 'master'.

29

31 -The Makefile in git-gui project may need to learn to honor the same

32 -setting; it unconditionally creates git-citool by hardlinking git-gui.

30 +* ef/maint-1.7.6-clone-progress-fix (2012-05-07) 1 commit

31 + + clone: fix progress-regression

32 + (this branch is used by ef/maint-clone-progress-fix.)

33

34 -Will merge to 'next'.

34 +Will merge to 'master'.

35

36 -* jk/maint-reflog-walk-count-vs-time (2012-05-04) 4 commits

37 - - reflog-walk: always make HEAD@{0} show indexed selectors

38 - - reflog-walk: clean up "flag" field of commit_reflog struct

39 - - log: respect date_mode_explicit with --format:%gd

40 - - t1411: add more selector index/date tests

36 +* ef/maint-clone-progress-fix (2012-05-07) 1 commit

37 + (merged to 'next' on 2012-05-08 at b9a6cad)

38 + + Merge branch 'ef/maint-1.7.6-clone-progress-fix' into ef/maint-clone-progress-fix

39 + (this branch uses ef/maint-1.7.6-clone-progress-fix.)

40

42 -Gives a better DWIM behaviour for --pretty=format:%gd, "stash list", and

43 -"log -g", depending on how the starting point ("master" vs "master@{0}" vs

44 -"master@{now}") and date formatting options (e.g. "--date=iso") are given

45 -on the command line.

41 +Some time ago, "git clone" lost the progress output for its "checkout"

42 +phase; when run without any "--quiet" option, it should give progress to

43 +the lengthy operation.

44

47 -We may want to clean it up further so that "--date=default" is taken as an

48 -explicit request to show them in timed, not counted, format.

45 +Will merge to 'master'.

46

50 -* nd/i18n-branch-lego (2012-05-04) 1 commit

51 - - branch: remove lego in i18n tracking info strings

47 +* fa/maint-config-doc (2012-05-07) 1 commit

48 + (merged to 'next' on 2012-05-08 at 54cc478)

49 + + Documentation/git-config: describe and clarify "--local <file>" option

50

53 -Fix yet another message construction by concatenating pieces of sentenes,

54 -which is unfriendly to i18n.

51 +Will merge to 'master'.

52

56 -Will merge to 'next'.

53 +* fc/simplify-complete-revlist-file (2012-05-07) 1 commit

54 + (merged to 'next' on 2012-05-08 at ff0b7d1)

55 + + completion: simplify __git_complete_revlist_file

56

58 -* nh/empty-rebase (2012-05-03) 1 commit

59 - (merged to 'next' on 2012-05-04 at 8a79d96)

60 - + git cherry-pick: do not dereference a potential NULL pointer

57 +Will merge to 'master'.

58

62 -Fix to a topic merged to 'master'.

59 +* jk/maint-status-porcelain-z-b (2012-05-08) 4 commits

60 + + status: respect "-b" for porcelain format

61 + + status: fix null termination with "-b"

62 + + status: refactor null_termination option

63 + + commit: refactor option parsing

64 + (this branch is used by jk/status-porcelain-z-b.)

65

66 Will merge to 'master'.

67

66 -* jc/maint-push-refs-all (2012-05-04) 2 commits

67 - - get_fetch_map(): tighten checks on dest refs

68 - - fetch/push: allow refs/*:refs/*

68 +* jk/status-porcelain-z-b (2012-05-08) 2 commits

69 + (merged to 'next' on 2012-05-08 at 31172dd)

70 + + status: refactor colopts handling

71 + + Merge branch 'jk/maint-status-porcelain-z-b' into HEAD

72 + (this branch uses jk/maint-status-porcelain-z-b.)

73

70 -Allows pushing and fetching refs/stash.

71 -Not ready.

72 -There still seem to be other bugs hiding (e.g. try pushing twice).

74 +"git status --porcelain" ignored "--branch" option by mistake. The output

75 +for "git status --branch -z" was also incorrect and did not terminate the

76 +record for the current branch name with NUL as asked.

77

74 -* js/checkout-detach-count (2012-05-04) 2 commits

75 - - checkout (detached): truncate list of orphaned commits at the new HEAD

76 - - t2020-checkout-detach: check for the number of orphaned commits

78 +Will merge to 'master'.

79

78 -When checking out another commit from an already detached state, we used

79 -to report all commits that are not reachable from any of the refs as

80 -lossage, but some of them might be reachable from the new HEAD, and there

81 -is no need to warn about them.

80 +* ef/checkout-empty (2012-05-08) 1 commit

81 + (merged to 'next' on 2012-05-08 at fc4d754)

82 + + checkout: do not corrupt HEAD on empty repo

83

83 -Will merge to 'next'.

84 +Running "git checkout" on an unborn branch used to corrupt HEAD

85 +(regression in 1.7.10); this makes it error out.

86

85 ---------------------------------------------------

86 -[Graduated to "master"]

87 +Will merge to 'master'.

88

88 -* jk/maint-push-progress (2012-05-01) 3 commits

89 - (merged to 'next' on 2012-05-01 at 2286130)

90 - + t5541: test more combinations of --progress

91 - + teach send-pack about --[no-]progress

92 - + send-pack: show progress when isatty(2)

89 +* nd/i18n-apply-lego (2012-05-08) 1 commit

90 + (merged to 'next' on 2012-05-08 at c2be904)

91 + + apply: remove lego in i18n string in gitdiff_verify_name

92

94 -"git push" over smart-http lost progress output and this resurrects it.

93 +Will merge to 'master'.

94 +

95 +* nd/i18n-parseopt (2012-05-08) 2 commits

96 + (merged to 'next' on 2012-05-08 at 15eb029)

97 + + i18n: apply: mark parseopt strings for translation

98 + + i18n: parseopt: lookup help and argument translations when showing usage

99 +

100 +Text from "git cmd --help" are getting prepared for i18n.

101 +

102 +* rs/maint-dir-strbuf (2012-05-08) 1 commit

103 + + dir: convert to strbuf

104 + (this branch is used by rs/dir-strbuf.)

105

106 Will merge to 'master'.

107

98 -* nd/columns (2012-04-27) 10 commits

99 - (merged to 'next' on 2012-04-30 at 93bb157)

100 - + tag: add --column

101 - + column: support piping stdout to external git-column process

102 - + status: add --column

103 - + branch: add --column

104 - + help: reuse print_columns() for help -a

105 - + column: add dense layout support

106 - + t9002: work around shells that are unable to set COLUMNS to 1

107 - + column: add columnar layout

108 - + Stop starting pager recursively

109 - + Add column layout skeleton and git-column

110 -

111 -A couple of commands learn --column option to produce columnar output.

108 +* rs/dir-strbuf (2012-05-08) 1 commit

109 + (merged to 'next' on 2012-05-08 at 0bc94fb)

110 + + Merge branch 'rs/maint-dir-strbuf' into rs/dir-strbuf

111 + (this branch uses rs/maint-dir-strbuf.)

112

113 Will merge to 'master'.

114

115 +--------------------------------------------------

116 +[Graduated to "master"]

117 +

118 +* jk/maint-tformat-with-z (2012-05-01) 2 commits

119 + (merged to 'next' on 2012-05-02 at a0f8af7)

120 + + log-tree: the previous one is still not quite right

121 + + log-tree: use custom line terminator in line termination mode

122 +

123 +"log -z --pretty=tformat:..." does not terminate each record with NUL

124 +and this is a beginning of an attempt to fix it. It still is not right

125 +but the patch does not make externally observable behaviour worse.

126 +

127 +* nh/empty-rebase (2012-05-03) 1 commit

128 + (merged to 'next' on 2012-05-04 at 8a79d96)

129 + + git cherry-pick: do not dereference a potential NULL pointer

130 +

131 +Fix to a topic merged to 'master'.

132 +

133 +* th/difftool-diffall (2012-04-23) 8 commits

134 + (merged to 'next' on 2012-05-02 at fdc9f60)

135 + + difftool: print list of valid tools with '--tool-help'

136 + + difftool: teach difftool to handle directory diffs

137 + + difftool: eliminate setup_environment function

138 + + difftool: stop appending '.exe' to git

139 + + difftool: remove explicit change of PATH

140 + + difftool: exit(0) when usage is printed

141 + + difftool: add '--no-gui' option

142 + + difftool: parse options using Getopt::Long

143 +

144 +Rolls the two-directory-diff logic from diffall script (in contrib/) into

145 +"git difftool" framework.

146 +

147 +* zj/diff-empty-chmod (2012-05-02) 5 commits

148 + (merged to 'next' on 2012-05-02 at fb8cb11)

149 + + t4006: Windows do not have /dev/zero

150 + (merged to 'next' on 2012-05-01 at 5a92787)

151 + + diff --stat: do not run diff on indentical files

152 + + diff --stat: report mode-only changes for binary files like text files

153 + + tests: check --[short]stat output after chmod

154 + + test: modernize style of t4006

155 +

156 +"git diff --stat" used to fully count a binary file with modified

157 +execution bits whose contents is unmodified, which was not right.

158 +

159 --------------------------------------------------

160 [Stalled]

161

162 +* jc/maint-push-refs-all (2012-05-04) 2 commits

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

164 + - fetch/push: allow refs/*:refs/*

165 +

166 +Allows pushing and fetching refs/stash.

167 +Not ready.

168 +There still seem to be other bugs hiding (e.g. try pushing twice).

169 +

170 * nl/http-proxy-more (2012-05-03) 6 commits

171 - http: rename HTTP_REAUTH to HTTP_AUTH_RETRY

172 - http: Avoid limit of retrying request only twice

@@ -170,45 +222,71 @@ not working :-(.

222 --------------------------------------------------

223 [Cooking]

224

173 -* jk/maint-tformat-with-z (2012-05-01) 2 commits

174 - (merged to 'next' on 2012-05-02 at a0f8af7)

175 - + log-tree: the previous one is still not quite right

176 - + log-tree: use custom line terminator in line termination mode

225 +* jc/install-no-hardlinks (2012-05-04) 1 commit

226 + (merged to 'next' on 2012-05-07 at b69e132)

227 + + Makefile: NO_INSTALL_HARDLINKS

228

178 -"log -z --pretty=tformat:..." does not terminate each record with NUL

179 -and this is a beginning of an attempt to fix it. It still is not right

180 -but the patch does not make externally observable behaviour worse.

229 +Your build platform may support hardlinks but you may prefer not to use

230 +them, e.g. when installing to DESTDIR to make a tarball and untarring on

231 +a filesystem that has poor support for hardlinks.

232 +

233 +The Makefile in git-gui project may need to learn to honor the same

234 +setting; it unconditionally creates git-citool by hardlinking git-gui.

235

236 Will merge to 'master'.

237

184 -* nd/stream-to-archive (2012-05-03) 10 commits

185 - - t5000: rationalize unzip tests

186 - - archive-zip: streaming for deflated files

187 - - archive-zip: streaming for stored files

188 - - archive-zip: factor out helpers for writing sizes and CRC

189 - - archive-zip: remove uncompressed_size

190 - - archive-tar: stream large blobs to tar file

191 - - archive: delegate blob reading to backend

192 - - archive-tar: unindent write_tar_entry by one level

193 - - archive-tar: turn write_tar_entry into blob-writing only

194 - - streaming: void pointer instead of char pointer

238 +* jk/maint-reflog-walk-count-vs-time (2012-05-07) 5 commits

239 + (merged to 'next' on 2012-05-08 at b1a9987)

240 + + reflog-walk: tell explicit --date=default from not having --date at all

241 + (merged to 'next' on 2012-05-07 at 3652958)

242 + + reflog-walk: always make HEAD@{0} show indexed selectors

243 + + reflog-walk: clean up "flag" field of commit_reflog struct

244 + + log: respect date_mode_explicit with --format:%gd

245 + + t1411: add more selector index/date tests

246

196 -Stream large blobs directly out to archive files without slurping

197 -everything in memory first.

247 +Gives a better DWIM behaviour for --pretty=format:%gd, "stash list", and

248 +"log -g", depending on how the starting point ("master" vs "master@{0}" vs

249 +"master@{now}") and date formatting options (e.g. "--date=iso") are given

250 +on the command line.

251 +

252 +Will merge to 'master'.

253 +

254 +* nd/i18n-branch-lego (2012-05-04) 1 commit

255 + (merged to 'next' on 2012-05-07 at af4e16f)

256 + + branch: remove lego in i18n tracking info strings

257 +

258 +Fix yet another message construction by concatenating pieces of sentenes,

259 +which is unfriendly to i18n.

260

261 Will merge to 'next'.

262

201 -* zj/diff-empty-chmod (2012-05-02) 5 commits

202 - (merged to 'next' on 2012-05-02 at fb8cb11)

203 - + t4006: Windows do not have /dev/zero

204 - (merged to 'next' on 2012-05-01 at 5a92787)

205 - + diff --stat: do not run diff on indentical files

206 - + diff --stat: report mode-only changes for binary files like text files

207 - + tests: check --[short]stat output after chmod

208 - + test: modernize style of t4006

263 +* js/checkout-detach-count (2012-05-04) 2 commits

264 + (merged to 'next' on 2012-05-07 at 2957590)

265 + + checkout (detached): truncate list of orphaned commits at the new HEAD

266 + + t2020-checkout-detach: check for the number of orphaned commits

267

210 -"git diff --stat" used to fully count a binary file with modified

211 -execution bits whose contents is unmodified, which was not right.

268 +When checking out another commit from an already detached state, we used

269 +to report all commits that are not reachable from any of the refs as

270 +lossage, but some of them might be reachable from the new HEAD, and there

271 +is no need to warn about them.

272 +

273 +Will merge to 'master'.

274 +

275 +* nd/stream-to-archive (2012-05-03) 10 commits

276 + (merged to 'next' on 2012-05-07 at 92f11c4)

277 + + t5000: rationalize unzip tests

278 + + archive-zip: streaming for deflated files

279 + + archive-zip: streaming for stored files

280 + + archive-zip: factor out helpers for writing sizes and CRC

281 + + archive-zip: remove uncompressed_size

282 + + archive-tar: stream large blobs to tar file

283 + + archive: delegate blob reading to backend

284 + + archive-tar: unindent write_tar_entry by one level

285 + + archive-tar: turn write_tar_entry into blob-writing only

286 + + streaming: void pointer instead of char pointer

287 +

288 +Stream large blobs directly out to archive files without slurping

289 +everything in memory first.

290

291 Will merge to 'master'.

292

@@ -239,28 +317,14 @@ are only interested in listing branches, for example.

317

318 Will merge to 'master'.

319

242 -* nd/threaded-index-pack (2012-04-19) 4 commits

243 - - index-pack: disable threading if NO_PREAD is defined

244 - - index-pack: support multithreaded delta resolving

245 - - index-pack: split second pass obj handling into own function

246 - - compat/win32/pthread.h: Add an pthread_key_delete() implementation

247 -

248 -The resulting code seems to be correct but is somewhat a confusing mess.

249 -We may want to have a reroll before merging it to 'next'.

250 -

251 -* th/difftool-diffall (2012-04-23) 8 commits

252 - (merged to 'next' on 2012-05-02 at fdc9f60)

253 - + difftool: print list of valid tools with '--tool-help'

254 - + difftool: teach difftool to handle directory diffs

255 - + difftool: eliminate setup_environment function

256 - + difftool: stop appending '.exe' to git

257 - + difftool: remove explicit change of PATH

258 - + difftool: exit(0) when usage is printed

259 - + difftool: add '--no-gui' option

260 - + difftool: parse options using Getopt::Long

320 +* nd/threaded-index-pack (2012-05-07) 4 commits

321 + (merged to 'next' on 2012-05-08 at 053b797)

322 + + index-pack: disable threading if NO_PREAD is defined

323 + + index-pack: support multithreaded delta resolving

324 + + index-pack: restructure pack processing into three main functions

325 + + compat/win32/pthread.h: Add an pthread_key_delete() implementation

326

262 -Rolls the two-directory-diff logic from diffall script (in contrib/) into

263 -"git difftool" framework.

327 +Enables threading in index-pack to resolve base data in parallel.

328

329 Will merge to 'master'.

330

What's cooking (2012/05 #03)