85f90cf773 · matheusbsbs/matheus-bagliano

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

1 To: git@vger.kernel.org

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

3 -X-master-at: 4a92a1721483d6a109cf0993843b20159f8d3387

4 -X-next-at: 2cd1508a8dbb08e076d7fa1a12757da6a0d65d53

2 +Subject: What's cooking in git.git (Mar 2012, #03; Mon, 5)

3 +X-master-at: 2980b0de1b387e4f9a63c50ca741271990c849d5

4 +X-next-at: 38de349d595af3563cafab5297cbad2f3e920499

5

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

6 +What's cooking in git.git (Mar 2012, #03; Mon, 5)

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

8

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

@@ -27,112 +27,38 @@ repositories listed at

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

28 [New Topics]

29

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 -

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

35 -to merge was overly long.

36 -

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

38 - - Support out-of-tree Valgrind tests

39 - - Allow overriding GIT_BUILD_DIR

40 -

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

42 -

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

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

45 -

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.

30 +* jc/fmt-merge-msg-people (2012-03-05) 1 commit

31 + (merged to 'next' on 2012-03-05 at 38de349)

32 + + fmt-merge-msg: show those involved in a merged series

33

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.

34 +The "fmt-merge-msg" command learns to list the primary contributors

35 +involved in the side topic you are merging.

36

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.

37 +* nl/http-proxy-more (2012-03-05) 3 commits

38 + - http: handle proxy authentication failure (error 407)

39 + - http: handle proxy proactive authentication

40 + - http: try http_proxy env var when http.proxy config option is not set

41 + (this branch uses nl/http-proxy-auth.)

42

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

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

73 - + t0000: modernise style

43 +The code to talk to http proxies learn to use the same credential

44 +API used to talk to the final http destinations.

45

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

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

46 +* nd/stream-more (2012-03-05) 6 commits

47 + - fsck: use streaming API for writing lost-found blobs

48 + - show: use streaming API for showing blobs

49 + - parse_object: avoid putting whole blob in core

50 + - cat-file: use streaming API to print blobs

51 + - Add more large blob test cases

52 + - streaming: make streaming-write-entry to be more reusable

53

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

54 +As I do not think changes in the original larger series that touch

55 +index-pack and unpack-objects will be ready for the upcoming 1.7.10,

56 +I've picked up only bits that deal with "use streaming API instead

57 +of reading things in core" and minimally fixed them up. These we

58 +should be able to polish in time.

59

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

81 -

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

83 -[Graduated to "master"]

84 -

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 -

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

90 -

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 -

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 -

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 -

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

106 -refname it shows unambiguously.

107 -

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 -

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 -

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 -

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 -

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 -

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.

60 +The "test cases" patch needs to be trimmed to cover only these, I

61 +would think.

62

63 --------------------------------------------------

64 [Stalled]

@@ -189,6 +115,11 @@ Peff had a good suggestion outlining an updated code structure so

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

116 development. Any takers?

117

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

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

120 +

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

122 +

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

124 - fixup! 15eaaf4

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

@@ -233,6 +164,60 @@ not working :-(.

164 --------------------------------------------------

165 [Cooking]

166

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

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

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

170 +

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

172 +to merge was overly long.

173 +Will merge to 'master'.

174 +

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

176 + - Support out-of-tree Valgrind tests

177 + - Allow overriding GIT_BUILD_DIR

178 +

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

180 +

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

182 + (merged to 'next' on 2012-03-05 at fdd667c)

183 + + Add threaded versions of functions in symlinks.c.

184 +

185 +It probably is "threadble" not "threaded" but in any case this

186 +should not regress the current callers.

187 +

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

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

190 +

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

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

193 +used the user-supplied string instead.

194 +

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

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

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

198 +but please double check.

199 +

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

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

202 + + http: support proxies that require authentication

203 + (this branch is used by nl/http-proxy-more.)

204 +

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

206 +Will merge to 'master'.

207 +

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

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

210 + + t0000: modernise style

211 +

212 +Will merge to 'master'.

213 +

214 +* th/mergetools-deltawalker (2012-03-05) 1 commit

215 + (merged to 'next' on 2012-03-05 at 167c74f)

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

217 +

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

219 +Will merge to 'master'.

220 +

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

222 - submodules: fix ambiguous absolute paths under Windows

223 - submodules: refactor computation of relative gitdir path

@@ -274,6 +259,8 @@ Should be safe, but is not urgent.

259 "git bundle" did not record boundary commits correctly when there

260 are many of them.

261

262 +Will merge to 'master'.

263 +

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

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

266 + ctype.c: Fix a sparse warning

@@ -283,6 +270,8 @@ are many of them.

270

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

272

273 +Will merge to 'master'.

274 +

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

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

277 + diff --stat: add config option to limit graph width

@@ -297,3 +286,4 @@ are many of them.

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

287

288 Rerolled again and looking good.

289 +Will merge to 'master'.

What's cooking (2012/03 #03)