b683d55d46 · matheusbsbs/matheus-bagliano

@@ -1,25 +1,28 @@

1 To: git@vger.kernel.org

2 -Subject: What's cooking in git.git (May 2012, #05; Sun, 20)

3 -X-master-at: aa3bb87176d42f1782c5030fa41e6e62492551c0

4 -X-next-at: 292236e1ac597c1020462c4a16e9603482ac1410

2 +Subject: What's cooking in git.git (May 2012, #06; Wed, 23)

3 +X-master-at: bd578b507fa79f94009ae1c1a436dc14cf7e6002

4 +X-next-at: be95121998f97475e9491ebbe005f08e85f054ef

5

6 -What's cooking in git.git (May 2012, #05; Sun, 20)

6 +What's cooking in git.git (May 2012, #06; Wed, 23)

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 -I haven't tagged 1.7.11-rc0 as some of the late "fixup" patches still

13 -haven't settled yet, but hopefully we can go directly to rc1 by the end of

14 -the week.

15 -

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

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

22 -[New Topics]

18 +[Graduated to "master"]

19 +

20 +* bp/diff-no-index-strbuf-fix (2012-05-16) 2 commits

21 + (merged to 'next' on 2012-05-18 at b2c26bb)

22 + + diff --no-index: don't leak buffers in queue_diff

23 + + diff --no-index: reset temporary buffer lengths on directory iteration

24 +

25 +Fix regressions to "git diff --no-index" when it recurses down.

26

27 * hv/submodule-alt-odb (2012-05-14) 1 commit

28 (merged to 'next' on 2012-05-18 at 2f17ac8)

@@ -28,30 +31,6 @@ repositories listed at

31 When peeking into object stores of submodules, the code forgot that they

32 might borrow objects from alternate object stores on their own.

33

31 -* jk/ident-gecos-strbuf (2012-05-20) 13 commits

32 - - format-patch: refactor get_patch_filename

33 - - ident: use a dynamic strbuf in fmt_ident

34 - - ident: use full dns names to generate email addresses

35 - - ident: report passwd errors with a more friendly message

36 - - drop length limitations on gecos-derived names and emails

37 - - ident: don't write fallback username into git_default_name

38 - - fmt_ident: drop IDENT_WARN_ON_NO_NAME code

39 - - format-patch: use default email for generating message ids

40 - - fmt-merge-msg: don't use static buffer in record_person

41 - - move git_default_* variables to ident.c

42 - - move identity config parsing to ident.c

43 - - http-push: do not access git_default_email directly

44 - - ident: split setup_ident into separate functions

45 -

46 -Fixes quite a lot of brokenness when ident information needs to be taken

47 -from the system and cleans up the code. The series seem to break tests

48 -here and there along the way but at the end everything balances out ;-)

49 -

50 -* bp/diff-no-index-strbuf-fix (2012-05-16) 2 commits

51 - (merged to 'next' on 2012-05-18 at b2c26bb)

52 - + diff --no-index: don't leak buffers in queue_diff

53 - + diff --no-index: reset temporary buffer lengths on directory iteration

54 -

34 * js/rebase-i-p-test-fix (2012-05-18) 1 commit

35 (merged to 'next' on 2012-05-18 at b7482fc)

36 + Fix t3411.3 to actually rebase something

@@ -60,117 +39,123 @@ here and there along the way but at the end everything balances out ;-)

39 (merged to 'next' on 2012-05-18 at c16f1c7)

40 + rev-parse doc: --git-dir does not always show a relative path

41

63 -* js/submodule-relative (2012-05-20) 2 commits

64 - - submodule: fix handling of superproject with relative origin URLs

65 - - submodule: add tests for add,sync,init in presence of relative super origin URL

66 -

67 -* mh/ref-api-lazy-loose (2012-05-20) 1 commit

68 - - free_ref_entry(): do not trigger reading of loose refs

69 -

70 -* mh/test-keep-prove-cache (2012-05-20) 1 commit

71 - - t/Makefile: retain cache t/.prove across prove runs

72 -

73 -* ng/pack-objects-cleanup (2012-05-18) 2 commits

74 - - pack-objects: refactor write_object() into helper functions

75 - - pack-objects, streaming: turn "xx >= big_file_threshold" to ".. > .."

76 -

42 * rs/archive-tree-in-tip-simplify (2012-05-18) 2 commits

43 (merged to 'next' on 2012-05-18 at a8ca614)

44 + archive-tar: keep const in checksum calculation

45 + archive: simplify refname handling

46

82 -* rs/maint-grep-F (2012-05-20) 3 commits

83 - - grep: support newline separated pattern list

84 - - grep: factor out do_append_grep_pat()

85 - - grep: factor out create_grep_pat()

47 +--------------------------------------------------

48 +[New Topics]

49

87 -* rs/xdiff-fast-hash-fix (2012-05-18) 1 commit

88 - - xdiff: signed right shift for 32-bit case of XDL_FAST_HASH

50 +* fc/git-prompt-script (2012-05-22) 5 commits

51 + - completion: split __git_ps1 into a separate script

52 + - completion: remove executable mode

53 + - Merge branch 'fc/git-complete-helper' into fc/git-prompt-script

54 + - tests: add tests for the bash prompt functions in the completion script

55 + - tests: move code to run tests under bash into a helper library

56 + (this branch is tangled with sg/bash-prompt.)

57

90 -* sp/sh-windows-pwd (2012-05-16) 1 commit

91 - - git-sh-setup: define workaround wrappers before they are used

58 +Looked reasonable from my point of view, but I am not familiar with the

59 +direction in which larger "bash completion" project folks are going, so

60 +people more knowledgeable than myself need to help me guiding this topic.

61

93 -* fc/git-complete-helper-fix (2012-05-20) 2 commits

94 - - completion: add support for backwards compatibility

95 - - completion: rename internal helpers _git and _gitk

62 +* jk/fetch-pack-remove-dups-optim (2012-05-22) 5 commits

63 + (merged to 'next' on 2012-05-23 at 6057c21)

64 + + fetch-pack: avoid quadratic loop in filter_refs

65 + + fetch-pack: sort the list of incoming refs

66 + + add sorting infrastructure for list refs

67 + + fetch-pack: avoid quadratic behavior in remove_duplicates

68 + + fetch-pack: sort incoming heads

69

97 -* jc/wip-apply-3way (2012-05-14) 9 commits

98 - . WIP: apply --3way with add/add conflicts

99 - . apply: refactor codepath to check new files

100 - - apply: register conflicted stages to the index

101 - - apply: plug the three-way merge logic in

102 - - apply: fall back on three-way merge

103 - - apply: accept -3/--3way command line option

104 - - apply: split load_preimage() helper function out

105 - - apply: refactor read_file_or_gitlink()

106 - - apply: clear_image() clears things a bit more

107 - (this branch is tangled with jc/apply-3way.)

70 +The way "fetch-pack" taht is given multiple references to fetch tried to

71 +remove duplicates was very inefficient.

72

109 ---------------------------------------------------

110 -[Graduated to "master"]

73 +Will merge to master.

74 +

75 +* jk/ident-split-fix (2012-05-22) 1 commit

76 + (merged to 'next' on 2012-05-23 at 811c9ec)

77 + + fix off-by-one error in split_ident_line

78 +

79 +An author/committer name that is a single character was mishandled as an

80 +invalid name by mistake.

81 +

82 +Will merge to master and later to maint.

83 +

84 +* jk/pretty-commit-header-incomplete-line (2012-05-22) 1 commit

85 + (merged to 'next' on 2012-05-23 at f788433)

86 + + avoid segfault when reading header of malformed commits

87 +

88 +Will merge to master and later to maint.

89 +

90 +* mh/fetch-pack-constness (2012-05-22) 4 commits

91 + (merged to 'next' on 2012-05-23 at be95121)

92 + + cmd_fetch_pack(): respect constness of argv parameter

93 + + cmd_fetch_pack(): combine the loop termination conditions

94 + + cmd_fetch_pack(): handle non-option arguments outside of the loop

95 + + cmd_fetch_pack(): declare dest to be const

96 +

97 +Tighten constness of some local variables in a callchain.

98 +

99 +* rs/refs-string-slice (2012-05-22) 4 commits

100 + (merged to 'next' on 2012-05-23 at d224de1)

101 + + refs: do not create ref_entry when searching

102 + + refs: use strings directly in find_containing_dir()

103 + + refs: convert parameter of create_dir_entry() to length-limited string

104 + + refs: convert parameter of search_ref_dir() to length-limited string

105

112 -* fc/git-complete-helper (2012-05-20) 2 commits

113 - - completion: add support for backwards compatibility

114 - - completion: rename internal helpers _git and _gitk

115 -* fc/git-complete-helper (2012-05-14) 1 commit

116 - (merged to 'next' on 2012-05-14 at 759d5f4)

117 - + completion: add new __git_complete helper

118 -

119 -There is a late fix-up that still need to be merged for backward

120 -compatibility for external users of the unpublished internal API.

121 -

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

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

124 - + completion: simplify __git_complete_revlist_file

125 -

126 -* ld/git-p4-tags-and-labels (2012-05-11) 3 commits

127 - (merged to 'next' on 2012-05-11 at 441bd9a)

128 - + git p4: fix bug when enabling tag import/export via config variables

129 - + git p4: fix bug when verbose enabled with tag export

130 - + git p4: add test for tag import/export enabled via config

131 -

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

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

134 - + i18n: apply: mark parseopt strings for translation

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

136 -

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

138 -

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

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

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

142 - + index-pack: support multithreaded delta resolving

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

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

145 -

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

147 -

148 -* rs/xdiff-lose-emit-func (2012-05-14) 7 commits

149 - (merged to 'next' on 2012-05-14 at 422f328)

150 - + builtin/blame.c: Fix a "Using plain integer as NULL pointer" warning

151 - (merged to 'next' on 2012-05-11 at 1eeb893)

152 - + xdiff: remove unused functions

153 - + xdiff: remove emit_func() and xdi_diff_hunks()

154 - + blame: factor out helper for calling xdi_diff()

155 - + blame: use hunk_func(), part 2

156 - + blame: use hunk_func(), part 1

157 - + xdiff: add hunk_func()

158 -

159 -Simplifies the interface between the implementation of "blame" and

160 -underlying xdiff engine, and removes a lot of unused or unnecessary code

161 -from the latter.

106 +Avoid unnecessary temporary allocations while looking for matching refs

107 +inside refs API.

108 +

109 +* cr/persistent-https (2012-05-23) 1 commit

110 + - Add persistent-https to contrib

111 +

112 +A remote helper that acts as a proxy that caches ssl session for the

113 +https:// transport is added to the contrib/ area.

114 +

115 +* jk/format-person-part-buffer-limit (2012-05-22) 1 commit

116 + (merged to 'next' on 2012-05-23 at ef025b0)

117 + + pretty: avoid buffer overflow in format_person_part

118 +

119 +Will merge to master and later to maint.

120 +

121 +* nd/stream-index-pack (2012-05-23) 6 commits

122 + - sha1_loose_object_info: do not complain out loud on non-existent objects

123 + - index-pack: avoid collision test when verifying in-repo pack

124 + - index-pack: use streaming interface for collision test on large blobs

125 + - index-pack: factor out unpack core from get_data_from_pack

126 + - index-pack: use streaming interface on large blobs (most of the time)

127 + - index-pack: hash non-delta objects while reading from stream

128 +

129 +Use streaming API to read from the object store to avoid having to hold

130 +a large blob object in-core while running index-pack.

131 +

132 +The later 3 patches in the series looked a bit suspect.

133 +

134 +* va/git-p4-test (2012-05-23) 2 commits

135 + - git-p4: Verify detection of "empty" branch creation

136 + - git-p4: Test changelists touching two branches

137

138 --------------------------------------------------

139 [Stalled]

140

141 +* nl/http-proxy-more (2012-05-11) 2 commits

142 + - http: rename HTTP_REAUTH to HTTP_AUTH_RETRY

143 + - http: Avoid limit of retrying request only twice

144 +

145 +I queued only the later two patches from this series, even though they do

146 +not make much sense without the first one that seems to need a bit more

147 +work, so that we won't forget.

148 +

149 * sg/bash-prompt (2012-05-09) 4 commits

150 - completion: respect $GIT_DIR

151 - completion: use __gitdir() in _git_log()

152 - tests: add tests for the bash prompt functions in the completion script

153 - tests: move code to run tests under bash into a helper library

154 + (this branch is tangled with fc/git-prompt-script.)

155

156 This is only the "correction" bits taken from the beginning of a larger

173 -series that is to be rerolled.

157 +series that is to be rerolled. The first two are tangled with Felipe's

158 +topic so a reroll, if comes, should build on top of them.

159

160 * jc/apply-3way (2012-05-16) 12 commits

161 - WIP: the message is bogus in apply:::check_patch()

@@ -244,17 +229,91 @@ not working :-(.

229 --------------------------------------------------

230 [Cooking]

231

247 -* rs/dir-strbuf-read-recursive-fix (2012-05-11) 2 commits

248 - - dir: simplify fill_directory()

249 - - dir: respect string length argument of read_directory_recursive()

232 +* jk/ident-gecos-strbuf (2012-05-22) 15 commits

233 + (merged to 'next' on 2012-05-23 at 6fce816)

234 + + format-patch: refactor get_patch_filename

235 + + ident: trim whitespace from default name/email

236 + + ident: use a dynamic strbuf in fmt_ident

237 + + ident: use full dns names to generate email addresses

238 + + ident: report passwd errors with a more friendly message

239 + + drop length limitations on gecos-derived names and emails

240 + + ident: don't write fallback username into git_default_name

241 + + fmt_ident: drop IDENT_WARN_ON_NO_NAME code

242 + + format-patch: use default email for generating message ids

243 + + ident: trim trailing newline from /etc/mailname

244 + + move git_default_* variables to ident.c

245 + + move identity config parsing to ident.c

246 + + fmt-merge-msg: don't use static buffer in record_person

247 + + http-push: do not access git_default_email directly

248 + + ident: split setup_ident into separate functions

249

251 -* nl/http-proxy-more (2012-05-11) 2 commits

252 - - http: rename HTTP_REAUTH to HTTP_AUTH_RETRY

253 - - http: Avoid limit of retrying request only twice

250 +Fixes quite a lot of brokenness when ident information needs to be taken

251 +from the system and cleans up the code.

252

255 -I queued only the later two patches from this series, even though they do

256 -not make much sense without the first one that seems to need a bit more

257 -work, so that we won't forget.

253 +Will merge to master.

254 +

255 +* js/submodule-relative (2012-05-23) 2 commits

256 + - submodule: fix handling of relative superproject origin URLs

257 + - submodule: document handling of relative superproject origin URLs

258 +

259 +* mh/ref-api-lazy-loose (2012-05-20) 1 commit

260 + (merged to 'next' on 2012-05-23 at c41a30a)

261 + + free_ref_entry(): do not trigger reading of loose refs

262 +

263 +The code to lazily read loose refs by mistake unnecessarily read the refs

264 +in a subhierarchy when we free the data for the subhierarchy.

265 +

266 +Will merge to master.

267 +

268 +* mh/test-keep-prove-cache (2012-05-20) 1 commit

269 + (merged to 'next' on 2012-05-23 at 870d1f9)

270 + + t/Makefile: retain cache t/.prove across prove runs

271 +

272 +* ng/pack-objects-cleanup (2012-05-18) 2 commits

273 + (merged to 'next' on 2012-05-23 at f90b1ba)

274 + + pack-objects: refactor write_object() into helper functions

275 + + pack-objects, streaming: turn "xx >= big_file_threshold" to ".. > .."

276 +

277 +* rs/maint-grep-F (2012-05-21) 4 commits

278 + (merged to 'next' on 2012-05-23 at b24143c)

279 + + grep: stop leaking line strings with -f

280 + + grep: support newline separated pattern list

281 + + grep: factor out do_append_grep_pat()

282 + + grep: factor out create_grep_pat()

283 +

284 +"git grep -F", unlike the case where it reads from a file, did not treat

285 +individual lines in the given pattern argument as separate patterns as it

286 +should.

287 +

288 +Will merge to master and later to maint.

289 +

290 +* rs/xdiff-fast-hash-fix (2012-05-23) 3 commits

291 + (merged to 'next' on 2012-05-23 at 8df26a5)

292 + + xdiff: import new 32-bit version of count_masked_bytes()

293 + + xdiff: avoid more compiler warnings with XDL_FAST_HASH on 32-bit machines

294 + + xdiff: avoid compiler warnings with XDL_FAST_HASH on 32-bit machines

295 +

296 +Will merge to master.

297 +

298 +* sp/sh-windows-pwd (2012-05-16) 1 commit

299 + (merged to 'next' on 2012-05-23 at 63004c3)

300 + + git-sh-setup: define workaround wrappers before they are used

301 +

302 +Will merge to master.

303 +

304 +* fc/git-complete-helper-fix (2012-05-20) 2 commits

305 + (merged to 'next' on 2012-05-23 at 6124da2)

306 + + completion: add support for backwards compatibility

307 + + completion: rename internal helpers _git and _gitk

308 +

309 +Will merge to master.

310 +

311 +* rs/dir-strbuf-read-recursive-fix (2012-05-11) 2 commits

312 + (merged to 'next' on 2012-05-23 at 2e22549)

313 + + dir: simplify fill_directory()

314 + + dir: respect string length argument of read_directory_recursive()

315 +

316 +Will merge to master.

317

318 * mm/push-default-switch-warning (2012-04-26) 2 commits

319 - t5541: warning message is given even with --quiet

What's cooking (2012/05 #06)