f0339e0630 · matheusbsbs/matheus-bagliano

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

1 To: git@vger.kernel.org

2 -Subject: What's cooking in git.git (Feb 2012, #09; Sun, 26)

3 -X-master-at: 3724cc7c58df709cffbf6cc0701d1ca6fa5a5ba2

4 -X-next-at: 62a6ddf54b0fda0c3cc0e609af05c6ce3503f51c

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

3 +X-master-at: 797166cfafb516a713fa442bfc0411a7d2e131e3

4 +X-next-at: a05ebf3088f87d3d8ec8c7fa8670b525d16eeede

5

6 -What's cooking in git.git (Feb 2012, #09; Sun, 26)

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

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

8

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

@@ -17,173 +17,99 @@ repositories listed at

17 --------------------------------------------------

18 [New Topics]

19

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

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

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

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

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

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

25

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

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

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

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

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

28

30 -* cb/fsck-squelch-dangling (2012-02-26) 1 commit

31 - - fsck: do not print dangling objects by default

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

32

33 -Introduces "fsck --dangling" and removes the output for dangling objects

34 -from the default output.

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

34 +it shows unambiguously.

35

36 -I personally do not think it is worth risking backward compatibility in

37 -the way this patch implements the squelching of the output. An approach

38 -to add --no-dangling option without changing the default would be OK,

39 -though.

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

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

38

41 -* rf/no-no-no-parseopt (2012-02-26) 3 commits

42 - - parse-options: remove PARSE_OPT_NEGHELP

43 - - parse-options: allow positivation of options starting, with no-

44 - - test-parse-options: convert to OPT_BOOL()

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

43

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

47 -a strange way.

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

47 +

48 +Produces a corrupt pack. Will discard.

49

50 --------------------------------------------------

51 [Graduated to "master"]

52

52 -* fc/push-prune (2012-02-22) 4 commits

53 - (merged to 'next' on 2012-02-23 at 8044055)

54 - + push: add '--prune' option

55 - + remote: refactor code into alloc_delete_ref()

56 - + remote: reorganize check_pattern_match()

57 - + remote: use a local variable in match_push_refs()

58 -

59 -"git push" learned the "--prune" option, similar to "git fetch".

60 -

61 -* jb/filter-ignore-sigpipe (2012-02-21) 1 commit

62 - (merged to 'next' on 2012-02-23 at 605dd39)

63 - + Ignore SIGPIPE when running a filter driver

64 -

65 -When the filter driver exits before reading the content before the main

66 -git process writes the contents to be filtered to the pipe to it, the

67 -latter could be killed with SIGPIPE instead of ignoring such an event as

68 -an error.

69 -

70 -* jc/add-refresh-unmerged (2012-02-17) 1 commit

71 - (merged to 'next' on 2012-02-21 at 09f8721)

72 - + refresh_index: do not show unmerged path that is outside pathspec

73 -

74 -"git add --refresh <pathspec>" warned about unmerged paths outside the

75 -given pathspec.

76 -

77 -* jc/doc-merge-options (2012-02-22) 1 commit

78 - (merged to 'next' on 2012-02-23 at dcf1d13)

79 - + Documentation/merge-options.txt: group "ff" related options together

80 -

81 -Documentation for "git merge" had "--ff-only" far away from other options

82 -related to the handling of fast-forward merges.

83 -

84 -* jk/config-include (2012-02-17) 10 commits

85 - (merged to 'next' on 2012-02-20 at 7b150b7)

86 - + config: add include directive

87 - + config: eliminate config_exclusive_filename

88 - + config: stop using config_exclusive_filename

89 - + config: provide a version of git_config with more options

90 - + config: teach git_config_rename_section a file argument

91 - + config: teach git_config_set_multivar_in_file a default path

92 - + config: copy the return value of prefix_filename

93 - + t1300: add missing &&-chaining

94 - + docs/api-config: minor clarifications

95 - + docs: add a basic description of the config API

96 -

97 -An assignment to the include.path pseudo-variable causes the named file

98 -to be included in-place when Git looks up configuration variables.

99 -

100 -* jk/maint-avoid-streaming-filtered-contents (2012-02-24) 3 commits

101 - (merged to 'next' on 2012-02-26 at 25e014c)

102 - + do not stream large files to pack when filters are in use

103 - + teach dry-run convert_to_git not to require a src buffer

104 - + teach convert_to_git a "dry run" mode

105 -

106 -The bulk check-in codepath streamed contents that needs smudge/clean

107 -filters without running them, instead of punting and delegating to the

108 -codepath to run filters after slurping everything to core.

109 -

110 -* jn/gitweb-search-optim (2012-02-23) 3 commits

111 - (merged to 'next' on 2012-02-23 at 9f9125f)

112 - + gitweb: Faster project search

113 - + gitweb: Option for filling only specified info in fill_project_list_info

114 - + gitweb: Refactor checking if part of project info need filling

115 - (this branch is used by jn/gitweb-hilite-regions.)

116 -

117 -"gitweb" learns to read various pieces of information for the repositories

118 -lazily, instead of reading everything that could be needed (including the

119 -ones that are not necessary for a specific task).

120 -

121 -* js/configure-libintl (2012-02-20) 1 commit

122 - (merged to 'next' on 2012-02-21 at 79d7ccc)

123 - + configure: don't use -lintl when there is no gettext support

124 -

125 -Build fix for autoconf, meant for 'maint' track.

126 -

127 -* ld/git-p4-expanded-keywords (2012-02-14) 1 commit

128 - (merged to 'next' on 2012-02-16 at a9004c5)

129 - + git-p4: add initial support for RCS keywords

130 -

131 -Teach git-p4 to unexpand $RCS$-like keywords that are embedded in

132 -tracked contents in order to reduce unnecessary merge conflicts.

133 -

134 -Replaced with the rerolled patch.

135 -

136 -* pj/remote-set-branches-usage-fix (2012-02-19) 1 commit

137 - (merged to 'next' on 2012-02-21 at cb71d0e)

138 - + remote: fix set-branches usage and documentation

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.

59 +

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

63

64 Documentation fix.

65

142 -* sp/smart-http-failure-to-push (2012-02-23) 1 commit

143 - (merged to 'next' on 2012-02-23 at fe0b2aa)

144 - + disconnect from remote helpers more gently

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

69

146 -When a remote helper exits before reading the blank line from the main git

147 -process to signal the end of commands, the latter could be killed with

148 -SIGPIPE. Instead we should ignore such event as a non-error.

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".

72

150 -* tr/maint-bundle-long-subject (2012-02-23) 4 commits

151 - (merged to 'next' on 2012-02-23 at b2c1605)

152 - + t5704: match tests to modern style

153 - + strbuf: improve strbuf_get*line documentation

154 - + bundle: use a strbuf to scan the log for boundary commits

155 - + bundle: put strbuf_readline_fd in strbuf.c with adjustments

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

76

157 -"git bundle create" produced a corrupt bundle file upon seeing commits

158 -with excessively long subject line.

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

78 +to return garbled response.

79

160 -* tr/perftest (2012-02-17) 3 commits

161 - (merged to 'next' on 2012-02-20 at 4c75ba9)

162 - + Add a performance test for git-grep

163 - + Introduce a performance testing framework

164 - + Move the user-facing test library to test-lib-functions.sh

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

84

166 -The beginning of a new performance benchmark framework.

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

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

87

168 ---------------------------------------------------

169 -[Stalled]

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

91

171 -* jc/diff-ignore-case (2012-02-19) 6 commits

172 - - diff -i

173 - - diff: --ignore-case

174 - - xdiff: introduce XDF_IGNORE_CASE

175 - - xdiff: introduce XDF_INEXACT_MATCH

176 - - xdiff: PATIENCE/HISTOGRAM are not independent option bits

177 - - xdiff: remove XDL_PATCH_* macros

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

93 +to make a commit after resolving conflicts.

94

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

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>

99

181 -Commits near the tip need to be better titled.

100 +--------------------------------------------------

101 +[Stalled]

102

183 -* jc/pickaxe-ignore-case (2012-02-21) 1 commit

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

103 +* 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

110

186 -The original "-S" pickaxe probably needs to be taught about the option.

111 +"git diff" learns "--ignore-case" option.

112 +Will discard, as nobody seems to need this.

113

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

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

@@ -246,69 +172,84 @@ out. The plan is not working :-(.

172 --------------------------------------------------

173 [Cooking]

174

249 -* zj/diff-stat-dyncol (2012-02-24) 10 commits

250 - - diff --stat: add config option to limit graph width

251 - - diff --stat: enable limiting of the graph part

252 - - diff --stat: add a test for output with COLUMNS=40

253 - - diff --stat: use a maximum of 5/8 for the filename part

254 - - merge --stat: use the full terminal width

255 - - log --stat: use the full terminal width

256 - - show --stat: use the full terminal width

257 - - diff --stat: use the full terminal width

258 - - diff --stat: tests for long filenames and big change counts

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

260 -

261 -Rerolled.

262 -

263 -* nd/columns (2012-02-26) 11 commits

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

178 +

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

180 +

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()

186 +

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.

189 +

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

195 +

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.

199 +

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

203 +

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.

208 +

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

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

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

212 + + diff --stat: enable limiting of the graph part

213 + + diff --stat: add a test for output with COLUMNS=40

214 + + diff --stat: use a maximum of 5/8 for the filename part

215 + + merge --stat: use the full terminal width

216 + + log --stat: use the full terminal width

217 + + show --stat: use the full terminal width

218 + + diff --stat: use the full terminal width

219 + + diff --stat: tests for long filenames and big change counts

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

221 +

222 +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

270 - - column: support columns with different widths

231 + - column: add dense layout support

232 - column: add columnar layout

233 - Stop starting pager recursively

273 - - Add git-column and column mode parsing

274 - - column: add API to print items in columns

234 + - Add git-column for columnar display

235

276 -Rerolled.

236 +Rerolled, but the configuration handling looked iffy.

237

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

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

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

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

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

283 -to make a commit after resolving conflicts.

284 -

285 -Will merge to "master".

286 -

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

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

289 - + completion: normalize increment/decrement style

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

291 -

292 -Will merge to "master".

293 -

294 -* th/git-diffall (2012-02-24) 1 commit

295 - - contrib: added git-diffall

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

298 - - gitweb: Highlight matched part of shortened project description

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

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

301 - - gitweb: Introduce esc_html_match_hl and esc_html_hl_regions

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.

306 -

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

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

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

310 -

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

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

313 -

314 -Will merge to "master".

What's cooking (2012/03 #01)