d1ebe8447e · matheusbsbs/matheus-bagliano

@@ -1,142 +1,66 @@

1 To: git@vger.kernel.org

2 -Subject: What's cooking in git.git (Feb 2012, #07; Mon, 20)

3 -X-master-at: b3a769dc355b32c95783dc07f59e4dfebdd8bdc7

4 -X-next-at: 80e3ff2c99bd723b0dfb64b7283cf92e398c61b6

2 +Subject: What's cooking in git.git (Feb 2012, #08; Wed, 22)

3 +X-master-at: f1f1b96e99fa064ed9f0da263d4b4eb0407b3ceb

4 +X-next-at: b4472eeb9efa715ecf088c254868d80ebfa252fd

5

6 -What's cooking in git.git (Feb 2012, #07; Mon, 20)

6 +What's cooking in git.git (Feb 2012, #08; Wed, 22)

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 first maintenance release v1.7.9.1 ironed out usability kinks in the

13 -new features added in v1.7.9 release. Topics that add new features and

14 -fixes that have been cooking in 'next' start to graduate to 'master'

15 -again.

16 -

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

13 repositories listed at

14

15 http://git-blame.blogspot.com/p/git-public-repositories.html

16

22 ---------------------------------------------------

23 -[Graduated to "master"]

24 -

25 -* cb/maint-rev-list-verify-object (2012-02-13) 1 commit

26 - (merged to 'next' on 2012-02-16 at a407b9a)

27 - + git rev-list: fix invalid typecast

28 -

29 -Fixes an obscure bug in "rev-list --verify" that skipped verification

30 -depending on the phase of the moon, which dates back to 1.7.8.x series.

31 -

32 -* cb/maint-t5541-make-server-port-portable (2012-02-13) 1 commit

33 - (merged to 'next' on 2012-02-16 at 762eefb)

34 - + t5541: check error message against the real port number used

35 -

36 -Test fix.

37 -

38 -* cb/receive-pack-keep-errors (2012-02-13) 1 commit

39 - (merged to 'next' on 2012-02-16 at 9ff846e)

40 - + do not override receive-pack errors

41 -

42 -Sometimes error status detected by a check in an earlier phase of

43 -receive-pack (the other end of 'git push') was lost by later checks,

44 -resulting in false indication of success.

45 -

46 -* cb/transfer-no-progress (2012-02-13) 1 commit

47 - (merged to 'next' on 2012-02-16 at ff17092)

48 - + push/fetch/clone --no-progress suppresses progress output

49 -

50 -The transport programs ignored --no-progress and showed progress when

51 -sending their output to a terminal.

52 -

53 -* jc/diff-stat-scaler (2012-02-14) 1 commit

54 - (merged to 'next' on 2012-02-16 at 404d336)

55 - + diff --stat: show bars of same length for paths with same amount of changes

56 -

57 -The output from "git diff --stat" for two paths that have the same amount

58 -of changes showed graph bars of different length due to the way we handled

59 -rounding errors.

60 -

61 -* tg/tag-points-at (2012-02-13) 2 commits

62 - (merged to 'next' on 2012-02-13 at a8f4046)

63 - + builtin/tag.c: Fix a sparse warning

64 - (merged to 'next' on 2012-02-10 at 4bff88f)

65 - + tag: add --points-at list option

66 -

67 -* zj/decimal-width (2012-02-14) 1 commit

68 - (merged to 'next' on 2012-02-16 at 72805c4)

69 - + make lineno_width() from blame reusable for others

70 - (this branch is used by zj/diff-stat-dyncol.)

71 -

72 -Refactoring.

73 -

74 -* zj/term-columns (2012-02-13) 1 commit

75 - (merged to 'next' on 2012-02-16 at fe70c88)

76 - + pager: find out the terminal width before spawning the pager

77 - (this branch is used by zj/diff-stat-dyncol.)

78 -

79 -Fixes "git -p cmd" for any subcommand that cares about the true terminal

80 -width.

81 -

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

18 [New Topics]

19

85 -* fc/push-prune (2012-02-17) 2 commits

86 - - remote: reorganize check_pattern_match()

87 - - remote: use a local variable in match_push_refs()

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

21 + - Ignore SIGPIPE when running a filter driver

22

89 -The first two of the three-patch RFC series. The second one and the third

90 -one (not queued) both need better explanation, and the third one also had

91 -a handful of minor yuck factors all of which should be straightforward to

92 -improve.

23 +Looked sane.

24 +Will merge to "next".

25

94 -Expecting a reroll.

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

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

28

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

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

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

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

31

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

100 -given pathspec.

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

33 +related to the handling of fast-forward merges.

34

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

103 - - diff -i

104 - - diff: --ignore-case

105 - - xdiff: introduce XDF_IGNORE_CASE

106 - - xdiff: introduce XDF_INEXACT_MATCH

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

108 - - xdiff: remove XDL_PATCH_* macros

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

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

37

110 -"git diff" learned "--ignore-case" option.

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

39 + - completion: normalize increment/decrement style

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

41

112 -* jn/gitweb-hilite-regions (2012-02-19) 5 commits

113 - - gitweb: Use esc_html_match_hl() in 'grep' search

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

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

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

117 - - gitweb: Introduce esc_html_hl_regions

118 - (this branch uses jn/gitweb-search-optim.)

119 -

120 -Not reviewed and do not know what this is about yet ;-).

121 -

122 -* jn/gitweb-search-optim (2012-02-19) 3 commits

123 - - gitweb: Faster project search

124 - - gitweb: Option for filling only specified info in fill_project_list_info

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

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

42 +* th/git-diffall (2012-02-22) 1 commit

43 + - contrib: added git-diffall

44

128 -The API introduced in the second step still has yucky design, but at least

129 -it is more clear than the previous rounds what this is trying to do.

45 +--------------------------------------------------

46 +[Graduated to "master"]

47

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

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

48 +* jk/diff-highlight (2012-02-13) 5 commits

49 + (merged to 'next' on 2012-02-20 at ba040ae)

50 + + diff-highlight: document some non-optimal cases

51 + + diff-highlight: match multi-line hunks

52 + + diff-highlight: refactor to prepare for multi-line hunks

53 + + diff-highlight: don't highlight whole lines

54 + + diff-highlight: make perl strict and warnings fatal

55

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

56 +Updates diff-highlight (in contrib/).

57

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

137 - - remote: fix set-branches usage and documentation

58 +* jn/gitweb-unborn-head (2012-02-17) 1 commit

59 + (merged to 'next' on 2012-02-20 at 80e3ff2)

60 + + gitweb: Fix "heads" view when there is no current branch

61

139 -Documentation fix.

62 +"gitweb" compared non-existent value of HEAD with the names of commit

63 +objects at tips of branches, triggering runtime warnings.

64

65 --------------------------------------------------

66 [Stalled]

@@ -231,22 +155,62 @@ Expecting a reroll on top of zj/term-columns topic.

155 --------------------------------------------------

156 [Cooking]

157

234 -* jk/diff-highlight (2012-02-13) 5 commits

235 - (merged to 'next' on 2012-02-20 at ba040ae)

236 - + diff-highlight: document some non-optimal cases

237 - + diff-highlight: match multi-line hunks

238 - + diff-highlight: refactor to prepare for multi-line hunks

239 - + diff-highlight: don't highlight whole lines

240 - + diff-highlight: make perl strict and warnings fatal

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

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

160 + - remote: refactor code into alloc_delete_ref()

161 + - remote: reorganize check_pattern_match()

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

163

242 -Updates diff-highlight (in contrib/).

164 +Rerolled and looked sane.

165 +Will merge to "next".

166

244 -* jn/gitweb-unborn-head (2012-02-17) 1 commit

245 - (merged to 'next' on 2012-02-20 at 80e3ff2)

246 - + gitweb: Fix "heads" view when there is no current branch

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

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

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

170

248 -"gitweb" compared non-existent value of HEAD with the names of commit

249 -objects at tips of branches, triggering runtime warnings.

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

172 +given pathspec.

173 +

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

175 + - diff -i

176 + - diff: --ignore-case

177 + - xdiff: introduce XDF_IGNORE_CASE

178 + - xdiff: introduce XDF_INEXACT_MATCH

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

180 + - xdiff: remove XDL_PATCH_* macros

181 +

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

183 +

184 +* jn/gitweb-hilite-regions (2012-02-19) 5 commits

185 + - gitweb: Use esc_html_match_hl() in 'grep' search

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

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

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

189 + - gitweb: Introduce esc_html_hl_regions

190 + (this branch uses jn/gitweb-search-optim.)

191 +

192 +Not reviewed and do not know what this is about yet ;-).

193 +

194 +* jn/gitweb-search-optim (2012-02-19) 3 commits

195 + - gitweb: Faster project search

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

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

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

199 +

200 +The API introduced in the second step still has yucky design, but at least

201 +it is more clear than the previous rounds what this is trying to do.

202 +

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

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

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

206 +

207 +Build fix for autoconf, meant for 'maint' track.

208 +

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

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

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

212 +

213 +Documentation fix.

214

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

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

@@ -255,19 +219,11 @@ objects at tips of branches, triggering runtime warnings.

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

220

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

258 - . Add a setting to require a filter to be successful

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

223

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

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

262 -

263 -A few test in t0021 use 'false' as the filter, which can exit without

264 -reading any byte from us, before we start writing and causes us to die

265 -with SIGPIPE, leading to intermittent test failure. I think treating this

266 -as a failure of running the filter (the end user's filter should read what

267 -is fed in full, produce its output and write the result back to us) is the

268 -right thing to do, so this patch needs update the surrounding code to

269 -handle such a situation better, probably by using sigchain_push(SIGPIPE)

270 -or something.

226 +Will merge to "next" after waiting for a few more days for comments.

227

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

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

@@ -294,4 +250,4 @@ Reverted the earlier round from 'next' and then fixed up further.

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

251 tracked contents in order to reduce unnecessary merge conflicts.

252

297 -Is this ready for 'master'?

253 +Waiting for follow-up fix-up patches.

What's cooking (2012/02 #08)