be1bd0874e · matheusbsbs/matheus-bagliano

@@ -1,16 +1,17 @@

1 To: git@vger.kernel.org

2 -Subject: What's cooking in git.git (May 2012, #04; Fri, 11)

3 -X-master-at: cd07cc53125fb2ca77a644831d4e5d9517bb7a05

4 -X-next-at: 441bd9a9d602910692074224920f8049ef81ea99

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

3 +X-master-at: aa3bb87176d42f1782c5030fa41e6e62492551c0

4 +X-next-at: 292236e1ac597c1020462c4a16e9603482ac1410

5

6 -What's cooking in git.git (May 2012, #04; Fri, 11)

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

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 tenth and eleventh batch of topics are now in 'master', and there is

13 -the second maintenance release on the 1.7.10.x track out.

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

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

17 repositories listed at

@@ -18,153 +19,135 @@ repositories listed at

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

20

21 --------------------------------------------------

21 -[Graduated to "master"]

22 +[New Topics]

23

23 -* ah/maint-grep-double-init (2012-05-07) 1 commit

24 - (merged to 'next' on 2012-05-08 at 51f84c5)

25 - + grep.c: remove redundant line of code

26 -

27 -* ef/checkout-empty (2012-05-08) 1 commit

28 - (merged to 'next' on 2012-05-08 at fc4d754)

29 - + checkout: do not corrupt HEAD on empty repo

30 -

31 -Running "git checkout" on an unborn branch used to corrupt HEAD

32 -(regression in 1.7.10); this makes it error out.

33 -

34 -* ef/maint-1.7.6-clone-progress-fix (2012-05-07) 1 commit

35 - + clone: fix progress-regression

36 - (this branch is used by ef/maint-clone-progress-fix.)

37 -

38 -* ef/maint-clone-progress-fix (2012-05-07) 1 commit

39 - (merged to 'next' on 2012-05-08 at b9a6cad)

40 - + Merge branch 'ef/maint-1.7.6-clone-progress-fix' into ef/maint-clone-progress-fix

41 - (this branch uses ef/maint-1.7.6-clone-progress-fix.)

42 -

43 -Some time ago, "git clone" lost the progress output for its "checkout"

44 -phase; when run without any "--quiet" option, it should give progress to

45 -the lengthy operation.

46 -

47 -* fa/maint-config-doc (2012-05-07) 1 commit

48 - (merged to 'next' on 2012-05-08 at 54cc478)

49 - + Documentation/git-config: describe and clarify "--local <file>" option

50 -

51 -* jc/install-no-hardlinks (2012-05-04) 1 commit

52 - (merged to 'next' on 2012-05-07 at b69e132)

53 - + Makefile: NO_INSTALL_HARDLINKS

54 -

55 -Your build platform may support hardlinks but you may prefer not to use

56 -them, e.g. when installing to DESTDIR to make a tarball and untarring on

57 -a filesystem that has poor support for hardlinks.

58 -

59 -The Makefile in git-gui project may need to learn to honor the same

60 -setting; it unconditionally creates git-citool by hardlinking git-gui.

61 -

62 -* jk/maint-reflog-walk-count-vs-time (2012-05-07) 5 commits

63 - (merged to 'next' on 2012-05-08 at b1a9987)

64 - + reflog-walk: tell explicit --date=default from not having --date at all

65 - (merged to 'next' on 2012-05-07 at 3652958)

66 - + reflog-walk: always make HEAD@{0} show indexed selectors

67 - + reflog-walk: clean up "flag" field of commit_reflog struct

68 - + log: respect date_mode_explicit with --format:%gd

69 - + t1411: add more selector index/date tests

70 -

71 -Gives a better DWIM behaviour for --pretty=format:%gd, "stash list", and

72 -"log -g", depending on how the starting point ("master" vs "master@{0}" vs

73 -"master@{now}") and date formatting options (e.g. "--date=iso") are given

74 -on the command line.

75 -

76 -* jk/maint-status-porcelain-z-b (2012-05-08) 4 commits

77 - + status: respect "-b" for porcelain format

78 - + status: fix null termination with "-b"

79 - + status: refactor null_termination option

80 - + commit: refactor option parsing

81 - (this branch is used by jk/status-porcelain-z-b.)

82 -

83 -* jk/status-porcelain-z-b (2012-05-08) 2 commits

84 - (merged to 'next' on 2012-05-08 at 31172dd)

85 - + status: refactor colopts handling

86 - + Merge branch 'jk/maint-status-porcelain-z-b' into HEAD

87 - (this branch uses jk/maint-status-porcelain-z-b.)

88 -

89 -"git status --porcelain" ignored "--branch" option by mistake. The output

90 -for "git status --branch -z" was also incorrect and did not terminate the

91 -record for the current branch name with NUL as asked.

92 -

93 -* js/checkout-detach-count (2012-05-04) 2 commits

94 - (merged to 'next' on 2012-05-07 at 2957590)

95 - + checkout (detached): truncate list of orphaned commits at the new HEAD

96 - + t2020-checkout-detach: check for the number of orphaned commits

97 -

98 -When checking out another commit from an already detached state, we used

99 -to report all commits that are not reachable from any of the refs as

100 -lossage, but some of them might be reachable from the new HEAD, and there

101 -is no need to warn about them.

102 -

103 -* mh/ref-api-lazy-loose (2012-05-04) 18 commits

104 - (merged to 'next' on 2012-05-04 at a70d858)

105 - + refs: fix find_containing_dir() regression

106 - + refs: read loose references lazily

107 - + read_loose_refs(): eliminate ref_cache argument

108 - + struct ref_dir: store a reference to the enclosing ref_cache

109 - + search_for_subdir(): return (ref_dir *) instead of (ref_entry *)

110 - + get_ref_dir(): add function for getting a ref_dir from a ref_entry

111 - + read_loose_refs(): rename function from get_ref_dir()

112 - + refs: wrap top-level ref_dirs in ref_entries

113 - + find_containing_dir(): use strbuf in implementation of this function

114 - + bisect: copy filename string obtained from git_path()

115 - + do_for_each_reflog(): use a strbuf to hold logfile name

116 - + do_for_each_reflog(): return early on error

117 - + get_ref_dir(): take the containing directory as argument

118 - + refs.c: extract function search_for_subdir()

119 - + get_ref_dir(): require that the dirname argument ends in '/'

120 - + get_ref_dir(): rename "base" parameter to "dirname"

121 - + get_ref_dir(): use a strbuf to hold refname

122 - + get_ref_dir(): return early if directory cannot be read

123 -

124 -Refs API is updated to lazily read sub-hierarchies of refs/ namespace,

125 -so that we do not have to grab everything from the filesystem when we

126 -are only interested in listing branches, for example.

127 -

128 -* nd/i18n-apply-lego (2012-05-08) 1 commit

129 - (merged to 'next' on 2012-05-08 at c2be904)

130 - + apply: remove lego in i18n string in gitdiff_verify_name

131 -

132 -* nd/i18n-branch-lego (2012-05-04) 1 commit

133 - (merged to 'next' on 2012-05-07 at af4e16f)

134 - + branch: remove lego in i18n tracking info strings

135 -

136 -Fix yet another message construction by concatenating pieces of sentenes,

137 -which is unfriendly to i18n.

138 -

139 -* nd/stream-to-archive (2012-05-03) 10 commits

140 - (merged to 'next' on 2012-05-07 at 92f11c4)

141 - + t5000: rationalize unzip tests

142 - + archive-zip: streaming for deflated files

143 - + archive-zip: streaming for stored files

144 - + archive-zip: factor out helpers for writing sizes and CRC

145 - + archive-zip: remove uncompressed_size

146 - + archive-tar: stream large blobs to tar file

147 - + archive: delegate blob reading to backend

148 - + archive-tar: unindent write_tar_entry by one level

149 - + archive-tar: turn write_tar_entry into blob-writing only

150 - + streaming: void pointer instead of char pointer

151 -

152 -Stream large blobs directly out to archive files without slurping

153 -everything in memory first.

154 -

155 -* rs/dir-strbuf (2012-05-08) 1 commit

156 - (merged to 'next' on 2012-05-08 at 0bc94fb)

157 - + Merge branch 'rs/maint-dir-strbuf' into rs/dir-strbuf

158 - (this branch uses rs/maint-dir-strbuf.)

159 -

160 -* rs/maint-dir-strbuf (2012-05-08) 1 commit

161 - + dir: convert to strbuf

162 - (this branch is used by rs/dir-strbuf.)

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

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

26 + + teach add_submodule_odb() to look for alternates

27 +

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

29 +might borrow objects from alternate object stores on their own.

30 +

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 +

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

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

57 + + Fix t3411.3 to actually rebase something

58 +

59 +* js/rev-parse-doc-fix (2012-05-18) 1 commit

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

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

62 +

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 +

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

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

79 + + archive-tar: keep const in checksum calculation

80 + + archive: simplify refname handling

81 +

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

86 +

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

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

89 +

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

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

92 +

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

96 +

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

108

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

165 -[New Topics]

110 +[Graduated to "master"]

111

167 -* rs/xdiff-lose-emit-func (2012-05-09) 6 commits

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

@@ -174,8 +157,11 @@ everything in memory first.

157 + xdiff: add hunk_func()

158

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

177 -underlying xdiff engine, and removes a lot of unnecessary code from

178 -the latter.

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

161 +from the latter.

162 +

163 +--------------------------------------------------

164 +[Stalled]

165

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

167 - completion: respect $GIT_DIR

@@ -186,7 +172,10 @@ the latter.

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

173 series that is to be rerolled.

174

189 -* jc/apply-3way (2012-05-10) 9 commits

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

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

177 + - apply: refactor "previous patch" logic

178 + - apply: a bit more comments on PATH_TO_BE_DELETED

179 - apply: document --3way option

180 - apply: allow rerere() upon --3way results

181 - apply: register conflicted stages to the index

@@ -196,22 +185,15 @@ series that is to be rerolled.

185 - apply: split load_preimage() helper function out

186 - apply: refactor read_file_or_gitlink()

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

188 + (this branch is tangled with jc/wip-apply-3way.)

189

190 "git apply" learns to wiggle the base version and perform three-way merge

191 when a patch does not exactly apply to the version you have.

192

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

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

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

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

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

208 -

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

210 - - dir: simplify fill_directory()

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

212 -

213 ---------------------------------------------------

214 -[Stalled]

193 +It turns out that it is somewhat unpleasant to handle add/add conflicts in

194 +this code, but it seems necessary if we want to use "apply -3" to replace

195 +the use of "apply --build-fake-ancestor" followed by the slow "merge" in

196 +"am -3".

197

198 * jc/maint-push-refs-all (2012-05-04) 2 commits

199 - get_fetch_map(): tighten checks on dest refs

@@ -262,6 +244,10 @@ not working :-(.

244 --------------------------------------------------

245 [Cooking]

246

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

250 +

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

@@ -270,30 +256,6 @@ 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.

258

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

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

275 - + completion: simplify __git_complete_revlist_file

276 -

277 -Will merge to 'master'.

278 -

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

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

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

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

283 -

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

285 -

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

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

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

289 - + index-pack: support multithreaded delta resolving

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

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

292 -

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

294 -

295 -Will merge to 'master'.

296 -

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

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

261 - push: start warning upcoming default change for push.default

@@ -309,7 +271,4 @@ Will squash the two, but this has to wait for a few release cycles.

271 (merged to 'next' on 2012-04-24 at d5c30be)

272 + git-daemon wrapper to wait until daemon is ready

273

312 -Fix race condition between starting and waiting for git-daemon in the

313 -test.

314 -

274 Reverted from 'next' to replace it with js/daemon-test-race-fix.

What's cooking (2012/05 #05)