c9704f60d1 · matheusbsbs/matheus-bagliano

@@ -1,14 +1,24 @@

1 To: git@vger.kernel.org

2 -Subject: What's cooking in git.git (Mar 2012, #01; Thu, 1)

3 -X-master-at: 797166cfafb516a713fa442bfc0411a7d2e131e3

4 -X-next-at: a05ebf3088f87d3d8ec8c7fa8670b525d16eeede

2 +Subject: What's cooking in git.git (Mar 2012, #02; Sun, 4)

3 +X-master-at: 4a92a1721483d6a109cf0993843b20159f8d3387

4 +X-next-at: 2cd1508a8dbb08e076d7fa1a12757da6a0d65d53

5

6 -What's cooking in git.git (Mar 2012, #01; Thu, 1)

6 +What's cooking in git.git (Mar 2012, #02; Sun, 4)

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 +The tip of 'next' as of tonight is more or less how 1.7.10-rc0 will

13 +look like in a few days. I do not have enough confidence on other

14 +large-ish topics that are not yet in 'next'.

15 +

16 +Small, trivially correct topics that have high value/damage ratio

17 +however may have enough time to go in 1.7.10 final even if they are

18 +still in 'pu', if the owners put enough effort in them. Otherwise

19 +let's throw them into Stalled category and leave them to the next

20 +cycle.

21 +

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

23 repositories listed at

24

@@ -17,106 +27,154 @@ repositories listed at

27 --------------------------------------------------

28 [New Topics]

29

20 -* jc/maint-diff-patch-header (2012-03-01) 4 commits

21 - - diff --ignore-mode-change

22 - - diff -p: squelch "diff --git" header for stat-dirty paths

23 - - t4011: illustrate "diff-index -p" on stat-dirty paths

24 - - t4011: modernise style

30 +* cn/pull-rebase-message (2012-03-04) 1 commit

31 + (merged to 'next' on 2012-03-04 at 5a6cd58)

32 + + Make git-{pull,rebase} message without tracking information friendlier

33

26 -The last one is entirely optional as its utility is unknown, but

27 -the first three fixes a long-standing corner case buglet.

34 +The advise message given when the user didn't give enough clue on what

35 +to merge was overly long.

36

29 -* jk/symbolic-ref-short (2012-02-27) 1 commit

30 - (merged to 'next' on 2012-02-28 at d00f766)

31 - + symbolic-ref --short: abbreviate the output unambiguously

37 +* dg/test-from-elsewhere (2012-03-04) 2 commits

38 + - Support out-of-tree Valgrind tests

39 + - Allow overriding GIT_BUILD_DIR

40

33 -"git symbolic-ref" learned the "--short" option to abbreviate the refname

34 -it shows unambiguously.

41 +Better support for out-of-tree test scripts.

42

36 -* nd/optim-connected (2012-02-29) 1 commit

37 - - Perform cheaper connectivity check when pack is used as medium

43 +* jh/threadable-symlink-check (2012-03-02) 1 commit

44 + - Add threaded versions of functions in symlinks.c.

45

39 -* tr/maint-bundle-boundary (2012-03-01) 3 commits

40 - - bundle: keep around names passed to add_pending_object()

41 - - t5510: ensure we stay in the toplevel test dir

42 - - t5510: refactor bundle->pack conversion

46 +This does not look wrong, but is not urgent either.

47 +

48 +* jh/trace-use-startup-info (2012-03-02) 1 commit

49 + - Use startup_info->prefix rather than prefix.

50 +

51 +I tend to agree with the doubt of the author of this patch expressed.

52 +

53 +* jn/maint-do-not-match-with-unsanitized-searchtext (2012-03-04) 1 commit

54 + - gitweb: Fix fixed string (non-regexp) project search

55 +

56 +"gitweb" did use quotemeta() to prepare search string when asked to

57 +do a fixed-string project search, but did not use it by mistake and

58 +used the user-supplied string instead.

59 +

60 +I would love to see this in 1.7.10; what I queued for 'maint' (that

61 +does not have the lazy fill-info stuff), and my conflict resolution

62 +into 'pu' to adjust for lazy fill-info, are both correct, I think,

63 +but please double check.

64 +

65 +* nl/http-proxy-auth (2012-03-02) 1 commit

66 + (merged to 'next' on 2012-03-04 at f368669)

67 + + http: support proxies that require authentication

68 +

69 +Allow curl-based transport to use proxies that require authentication.

70

44 -* nd/threaded-index-pack (2012-02-28) 2 commits

45 - . index-pack: support multithreaded delta resolving

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

71 +* sl/modern-t0000 (2012-03-02) 1 commit

72 + (merged to 'next' on 2012-03-04 at 2cd1508)

73 + + t0000: modernise style

74

48 -Produces a corrupt pack. Will discard.

75 +* th/mergetools-deltawalker (2012-03-04) 1 commit

76 + - mergetools: add a plug-in to support DeltaWalker

77 +

78 +Add plug-in to support DeltaWalker in difftool/mergetool.

79 +

80 +Waiting for a few details to be filled in.

81

82 --------------------------------------------------

83 [Graduated to "master"]

84

53 -* cn/maint-branch-with-bad (2012-02-27) 1 commit

54 - (merged to 'next' on 2012-02-28 at a37929e)

55 - + branch: don't assume the merge filter ref exists

56 -

57 -"git branch --with $that" assumed incorrectly that the user will never

58 -ask the question with nonsense value in $that.

85 +* cb/fsck-squelch-dangling (2012-02-28) 1 commit

86 + (merged to 'next' on 2012-02-29 at 9057e12)

87 + + fsck: --no-dangling omits "dangling object" information

88

60 -* cn/maint-rev-list-doc (2012-02-28) 1 commit

61 - (merged to 'next' on 2012-02-28 at f21c627)

62 - + Documentation: use {asterisk} in rev-list-options.txt when needed

89 +"fsck" learns "--no-dangling".

90

64 -Documentation fix.

91 +* jc/am-3-nonstandard-popt (2012-02-26) 2 commits

92 + (merged to 'next' on 2012-02-26 at 62a6ddf)

93 + + test: "am -3" can accept non-standard -p<num>

94 + (merged to 'next' on 2012-02-26 at 1363bd6)

95 + + am -3: allow nonstandard -p<num> option

96

66 -* jb/required-filter (2012-02-17) 1 commit

67 - (merged to 'next' on 2012-02-26 at e9ba88a)

68 - + Add a setting to require a filter to be successful

97 +The code to synthesize the fake ancestor tree used by 3-way merge

98 +fallback in "git am" was not prepared to read a patch created with a

99 +non-standard -p<num> value.

100

70 -A content filter used to be a way to make the recorded contents "more

71 -useful", but this defines a way to optionally mark a filter "required".

101 +* jk/symbolic-ref-short (2012-02-27) 1 commit

102 + (merged to 'next' on 2012-02-28 at d00f766)

103 + + symbolic-ref --short: abbreviate the output unambiguously

104

73 -* jn/maint-gitweb-invalid-regexp (2012-02-28) 1 commit

74 - (merged to 'next' on 2012-02-28 at 6789570)

75 - + gitweb: Handle invalid regexp in regexp search

105 +"git symbolic-ref" learned the "--short" option to abbreviate the

106 +refname it shows unambiguously.

107

77 -An invalid regular expression pattern given by an end user made "gitweb"

78 -to return garbled response.

108 +* jn/gitweb-hilite-regions (2012-02-26) 4 commits

109 + (merged to 'next' on 2012-02-28 at 3244f30)

110 + + gitweb: Highlight matched part of shortened project description

111 + + gitweb: Highlight matched part of project description when searching projects

112 + + gitweb: Highlight matched part of project name when searching projects

113 + + gitweb: Introduce esc_html_match_hl and esc_html_hl_regions

114

80 -* nd/maint-verify-objects (2012-02-28) 2 commits

81 - (merged to 'next' on 2012-02-28 at a5e9b09)

82 - + rev-list: fix --verify-objects --quiet becoming --objects

83 - + rev-list: remove BISECT_SHOW_TRIED flag

115 +Project search in "gitweb" shows the substring that matched in the

116 +project name and description highlighted. The highlighting logic is

117 +meant to be reused later for other kinds of searches e.g. grep and

118 +commit log search.

119

85 -"git rev-list --verify-objects -q" omitted the extra verification it

86 -needs to do over "git rev-list --objects -q" by mistake.

120 +* rs/no-no-no-parseopt (2012-02-28) 3 commits

121 + (merged to 'next' on 2012-02-29 at 94e60d0)

122 + + parse-options: remove PARSE_OPT_NEGHELP

123 + + parse-options: allow positivation of options starting, with no-

124 + + test-parse-options: convert to OPT_BOOL()

125

88 -* ph/cherry-pick-advice-refinement (2012-02-22) 1 commit

89 - (merged to 'next' on 2012-02-26 at 1c930c3)

90 - + cherry-pick: No advice to commit if --no-commit

126 +Options that use PARSE_OPT_NEGHELP needed to word their help text in

127 +a strange way, and this gets rid of the uses of them.

128

92 -The advice given by a conflicted "cherry-pick --no-commit" told the user

93 -to make a commit after resolving conflicts.

129 +* th/git-diffall (2012-02-27) 1 commit

130 + (merged to 'next' on 2012-02-28 at 4ba7a15)

131 + + contrib: add git-diffall script

132

95 -* pj/completion-remote-set-url-branches (2012-02-22) 2 commits

96 - (merged to 'next' on 2012-02-26 at 0062008)

97 - + completion: normalize increment/decrement style

98 - + completion: remote set-* <name> and <branch>

133 +A sample script that drives an external tool that compares two

134 +directories, by populating two temporary directories with contents

135 +of two revisions in Git.

136

137 --------------------------------------------------

138 [Stalled]

139

140 +* nd/optim-connected (2012-02-29) 1 commit

141 + - Perform cheaper connectivity check when pack is used as medium

142 +

143 +Cheats the local connectivity check performed by "git fetch"

144 +slightly to gain some performance. This is a bit iffy.

145 +

146 +* jc/diff-ignore-mode (2012-03-01) 1 commit

147 + - diff --ignore-mode-change

148 + (this branch uses jc/maint-diff-patch-header.)

149 +

150 +Will discard.

151 +

152 +* nd/columns (2012-02-28) 10 commits

153 + - tag: add --column

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

155 + - status: add --column

156 + - branch: add --column

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

158 + - column: add column.ui for default column output settings

159 + - column: add dense layout support

160 + - column: add columnar layout

161 + - Stop starting pager recursively

162 + - Add git-column for columnar display

163 +

164 +Rerolled; the configuration handling looked iffy, but otherwise well

165 +explained.

166 +

167 * jc/diff-ignore-case (2012-02-28) 6 commits

104 - . diff: -i is "--ignore-case" but means a bit more in "log"

105 - . diff: --ignore-case

106 - . xdiff: introduce XDF_IGNORE_CASE

107 - . xdiff: introduce XDF_INEXACT_MATCH

108 - . xdiff: PATIENCE/HISTOGRAM are not independent option bits

109 - . xdiff: remove XDL_PATCH_* macros

168 + - diff: -i is "--ignore-case" but means a bit more in "log"

169 + - diff: --ignore-case

170 + - xdiff: introduce XDF_IGNORE_CASE

171 + - xdiff: introduce XDF_INEXACT_MATCH

172 + - xdiff: PATIENCE/HISTOGRAM are not independent option bits

173 + - xdiff: remove XDL_PATCH_* macros

174

175 "git diff" learns "--ignore-case" option.

176 Will discard, as nobody seems to need this.

177

114 -* jl/maint-submodule-relative (2012-02-09) 2 commits

115 - - submodules: always use a relative path from gitdir to work tree

116 - - submodules: always use a relative path to gitdir

117 -

118 -The second one looked iffy.

119 -

178 * hv/submodule-recurse-push (2012-02-13) 3 commits

179 - push: teach --recurse-submodules the on-demand option

180 - Refactor submodule push check to use string list instead of integer

@@ -127,18 +185,19 @@ The bottom one was not clearly explained and needs a reroll.

185 * jc/advise-push-default (2011-12-18) 1 commit

186 - push: hint to use push.default=upstream when appropriate

187

130 -Peff had a good suggestion outlining an updated code structure so that

131 -somebody new can try to dip his or her toes in the development. Any

132 -takers?

188 +Peff had a good suggestion outlining an updated code structure so

189 +that somebody new can try to dip his or her toes in the

190 +development. Any takers?

191

192 * ss/git-svn-prompt-sans-terminal (2012-01-04) 3 commits

193 - fixup! 15eaaf4

194 - git-svn, perl/Git.pm: extend Git::prompt helper for querying users

195 - perl/Git.pm: "prompt" helper to honor GIT_ASKPASS and SSH_ASKPASS

196

139 -The bottom one has been replaced with a rewrite based on comments from

140 -Ævar. The second one needs more work, both in perl/Git.pm and prompt.c, to

141 -give precedence to tty over SSH_ASKPASS when terminal is available.

197 +The bottom one has been replaced with a rewrite based on comments

198 +from Ævar. The second one needs more work, both in perl/Git.pm and

199 +prompt.c, to give precedence to tty over SSH_ASKPASS when terminal

200 +is available.

201

202 * jc/split-blob (2012-02-23) 7 commits

203 - fixup?

@@ -151,60 +210,78 @@ give precedence to tty over SSH_ASKPASS when terminal is available.

210

211 Not ready.

212

154 -I finished the streaming checkout codepath, but as explained in 127b177

155 -(bulk-checkin: support chunked-object encoding, 2011-11-30), these are

156 -still early steps of a long and painful journey. At least pack-objects and

157 -fsck need to learn the new encoding for the series to be usable locally,

158 -and then index-pack/unpack-objects needs to learn it to be used remotely.

159 -

160 -Given that I heard a lot of noise that people want large files, and that I

161 -was asked by somebody at GitTogether'11 privately for an advice on how to

162 -pay developers (not me) to help adding necessary support, I am somewhat

163 -dissapointed that the original patch series that was sent almost two

164 -months ago still remains here without much comments and updates from the

165 -developer community. I even made the interface to the logic that decides

166 -where to split chunks easily replaceable, and I deliberately made the

167 -logic in the original patch extremely stupid to entice others, especially

168 -the "bup" fanboys, to come up with a better logic, thinking that giving

169 -people an easy target to shoot for, they may be encouraged to help

170 -out. The plan is not working :-(.

213 +I finished the streaming checkout codepath, but as explained in

214 +127b177 (bulk-checkin: support chunked-object encoding, 2011-11-30),

215 +these are still early steps of a long and painful journey. At least

216 +pack-objects and fsck need to learn the new encoding for the series

217 +to be usable locally, and then index-pack/unpack-objects needs to

218 +learn it to be used remotely.

219 +

220 +Given that I heard a lot of noise that people want large files, and

221 +that I was asked by somebody at GitTogether'11 privately for an

222 +advice on how to pay developers (not me) to help adding necessary

223 +support, I am somewhat dissapointed that the original patch series

224 +that was sent almost two months ago still remains here without much

225 +comments and updates from the developer community. I even made the

226 +interface to the logic that decides where to split chunks easily

227 +replaceable, and I deliberately made the logic in the original patch

228 +extremely stupid to entice others, especially the "bup" fanboys, to

229 +come up with a better logic, thinking that giving people an easy

230 +target to shoot for, they may be encouraged to help out. The plan is

231 +not working :-(.

232

233 --------------------------------------------------

234 [Cooking]

235

175 -* jc/pickaxe-ignore-case (2012-02-28) 2 commits

176 - - pickaxe: allow -i to search in patch case-insensitively

177 - - grep: use static trans-case table

236 +* jl/maint-submodule-relative (2012-03-04) 4 commits

237 + - submodules: fix ambiguous absolute paths under Windows

238 + - submodules: refactor computation of relative gitdir path

239 + - submodules: always use a relative path from gitdir to work tree

240 + - submodules: always use a relative path to gitdir

241

179 -"git log -G/-S" pays attention to the "-i" option.

242 +Rerolled and resurrected from Stalled category.

243

181 -* rs/no-no-no-parseopt (2012-02-28) 3 commits

182 - (merged to 'next' on 2012-02-29 at 94e60d0)

183 - + parse-options: remove PARSE_OPT_NEGHELP

184 - + parse-options: allow positivation of options starting, with no-

185 - + test-parse-options: convert to OPT_BOOL()

244 +I would love to have this in 1.7.10; a couple of Acks from different

245 +platforms and success reports would be very helpful.

246

187 -Options that use PARSE_OPT_NEGHELP needed to word their help text in

188 -a strange way, and this gets rid of the uses of them.

247 +* nd/threaded-index-pack (2012-03-02) 2 commits

248 + - index-pack: support multithreaded delta resolving

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

250

190 -* jc/am-3-nonstandard-popt (2012-02-26) 2 commits

191 - (merged to 'next' on 2012-02-26 at 62a6ddf)

192 - + test: "am -3" can accept non-standard -p<num>

193 - (merged to 'next' on 2012-02-26 at 1363bd6)

194 - + am -3: allow nonstandard -p<num> option

251 +Rerolled to fix a bug that was discovered with a trivial test, and

252 +resurrected from Stalled category, but I am reluctant to advance a

253 +topic that can easily break many people's repositories at this late

254 +in the cycle.

255

196 -The code to synthesize the fake ancestor tree used by 3-way merge

197 -fallback in "git am" was not prepared to read a patch created with

198 -a non-standard -p<num> value.

256 +* jc/maint-diff-patch-header (2012-03-01) 3 commits

257 + (merged to 'next' on 2012-03-02 at 2cd2059)

258 + + diff -p: squelch "diff --git" header for stat-dirty paths

259 + + t4011: illustrate "diff-index -p" on stat-dirty paths

260 + + t4011: modernise style

261 + (this branch is used by jc/diff-ignore-mode.)

262

200 -* cb/fsck-squelch-dangling (2012-02-28) 1 commit

201 - (merged to 'next' on 2012-02-29 at 9057e12)

202 - + fsck: --no-dangling omits "dangling object" information

263 +"diff-index" and friends showed "diff --git" header and nothing else

264 +for a path that is only stat-dirty.

265 +

266 +Should be safe, but is not urgent.

267 +

268 +* tr/maint-bundle-boundary (2012-03-01) 3 commits

269 + (merged to 'next' on 2012-03-02 at c25692f)

270 + + bundle: keep around names passed to add_pending_object()

271 + + t5510: ensure we stay in the toplevel test dir

272 + + t5510: refactor bundle->pack conversion

273 +

274 +"git bundle" did not record boundary commits correctly when there

275 +are many of them.

276

204 -I've butchered Clemens's patch and added "--no-dangling", and reverted

205 -the part that flips the default. I also took the authorship blame, as

206 -I do not share the final goal with him, but our first steps should be

207 -in the same direction, which is this patch.

277 +* jc/pickaxe-ignore-case (2012-03-04) 3 commits

278 + (merged to 'next' on 2012-03-04 at 1ad3a39)

279 + + ctype.c: Fix a sparse warning

280 + (merged to 'next' on 2012-03-02 at 73a632b)

281 + + pickaxe: allow -i to search in patch case-insensitively

282 + + grep: use static trans-case table

283 +

284 +"git log -G/-S" pays attention to the "-i" option.

285

286 * zj/diff-stat-dyncol (2012-03-01) 10 commits

287 (merged to 'next' on 2012-03-01 at 79b4152)

@@ -220,36 +297,3 @@ in the same direction, which is this patch.

297 + Merge branches zj/decimal-width, zj/term-columns and jc/diff-stat-scaler

298

299 Rerolled again and looking good.

223 -

224 -* nd/columns (2012-02-28) 10 commits

225 - - tag: add --column

226 - - column: support piping stdout to external git-column process

227 - - status: add --column

228 - - branch: add --column

229 - - help: reuse print_columns() for help -a

230 - - column: add column.ui for default column output settings

231 - - column: add dense layout support

232 - - column: add columnar layout

233 - - Stop starting pager recursively

234 - - Add git-column for columnar display

235 -

236 -Rerolled, but the configuration handling looked iffy.

237 -

238 -* th/git-diffall (2012-02-27) 1 commit

239 - (merged to 'next' on 2012-02-28 at 4ba7a15)

240 - + contrib: add git-diffall script

241 -

242 -A sample script that drives an external tool that compares two

243 -directories, by populating two temporary directories with contents of

244 -two revisions in Git.

245 -

246 -* jn/gitweb-hilite-regions (2012-02-26) 4 commits

247 - (merged to 'next' on 2012-02-28 at 3244f30)

248 - + gitweb: Highlight matched part of shortened project description

249 - + gitweb: Highlight matched part of project description when searching projects

250 - + gitweb: Highlight matched part of project name when searching projects

251 - + gitweb: Introduce esc_html_match_hl and esc_html_hl_regions

252 -

253 -Project search in "gitweb" shows the substring that matched in the project

254 -name and description highlighted. The highlighting logic is meant to be

255 -reused later for other kinds of searches e.g. grep and commit log search.

What's cooking (2012/03 #02)