4bf60a9004 · matheusbsbs/matheus-bagliano

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

1 To: git@vger.kernel.org

2 -Subject: What's cooking in git.git (Oct 2011, #09; Sun, 23)

3 -X-master-at: 10b2a48113b8ab6b8f48229eb40fc3637ce025ae

4 -X-next-at: 03eec2553f5bdf546687f47517181ada4484cae8

2 +Subject: What's cooking in git.git (Oct 2011, #10; Wed, 26)

3 +X-master-at: 997a1946a55cafb992c4ba8e5e0795aa73f5a4a9

4 +X-next-at: 6fac2d64191d3ca19e7d16d40b0fc18aeeed373b

5

6 -What's cooking in git.git (Oct 2011, #09; Sun, 23)

6 +What's cooking in git.git (Oct 2011, #10; Wed, 26)

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

8

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

@@ -14,14 +14,14 @@ switching our focus to fixing bugs in the topics already in 'master'.

14

15 Here are the repositories that have my integration branches:

16

17 -With maint, master, next, pu, todo, html and man:

17 +With maint, master, next, pu, todo:

18

19 git://git.kernel.org/pub/scm/git/git.git

20 git://repo.or.cz/alt-git.git

21 https://code.google.com/p/git-core/

22 https://github.com/git/git

23

24 -With only maint, master, html and man:

24 +With only maint and master:

25

26 git://git.sourceforge.jp/gitroot/git-core/git.git

27 git://git-core.git.sourceforge.net/gitroot/git-core/git-core

@@ -30,14 +30,14 @@ With all the topics and integration branches but not todo, html or man:

30

31 https://github.com/gitster/git

32

33 -By the way, I am planning to stop pushing the generated documentation

34 -branches to the above repositories in the near term, as they are not

35 -sources. The only reason the source repository at k.org has hosted these

36 -branches was because it was the only repository over there that was

37 -writable by me; it was an ugly historical and administrative workaround

38 -and not a demonstration of the best practice.

33 +I will stop pushing the generated documentation branches to the above

34 +repositories, as they are not sources. The only reason the source

35 +repository at k.org has hosted these branches was because it was the only

36 +repository over there that was writable by me; it was an ugly historical

37 +and administrative workaround and not a demonstration of the best

38 +practice.

39

40 -They are pushed to their own separate repositories instead:

40 +These branches are pushed to their own separate repositories instead:

41

42 git://git.kernel.org/pub/scm/git/git-{htmldocs,manpages}.git/

43 git://repo.or.cz/git-{htmldocs,manpages}.git/

@@ -47,97 +47,80 @@ They are pushed to their own separate repositories instead:

47 --------------------------------------------------

48 [New Topics]

49

50 -* nd/pretty-commit-log-message (2011-10-23) 2 commits

51 - - pretty.c: use original commit message if reencoding fails

52 - - pretty.c: free get_header() return value

50 +* ef/mingw-upload-archive (2011-10-26) 3 commits

51 + - upload-archive: use start_command instead of fork

52 + - compat/win32/poll.c: upgrade from upstream

53 + - mingw: move poll out of sys-folder

54 +

55 +* js/grep-mutex (2011-10-26) 3 commits

56 + (merged to 'next' on 2011-10-26 at 6fac2d6)

57 + + builtin/grep: simplify lock_and_read_sha1_file()

58 + + builtin/grep: make lock/unlock into static inline functions

59 + + git grep: be careful to use mutexes only when they are initialized

60 +

61 +Will merge to "master" shortly.

62 +

63 +* rj/gitweb-clean-js (2011-10-26) 1 commit

64 + (merged to 'next' on 2011-10-26 at db36a24)

65 + + gitweb/Makefile: Remove static/gitweb.js in the clean target

66 +

67 +Will merge to "master" shortly.

68 +

69 +* rs/allocate-cache-entry-individually (2011-10-26) 2 commits

70 + - cache.h: put single NUL at end of struct cache_entry

71 + - read-cache.c: allocate index entries individually

72 +

73 +* rs/maint-estimate-cache-size (2011-10-26) 1 commit

74 + (merged to 'next' on 2011-10-26 at 2f11375)

75 + + read-cache.c: fix index memory allocation

76 +

77 +Will merge to "master" shortly.

78 +

79 +* sn/complete-bash-wo-process-subst (2011-10-26) 1 commit

80 + (merged to 'next' on 2011-10-26 at 8662ed6)

81 + + completion: fix issue with process substitution not working on Git for Windows

82 +

83 +Will merge to "master" shortly.

84

85 --------------------------------------------------

86 [Graduated to "master"]

87

57 -* cn/doc-config-bare-subsection (2011-10-16) 1 commit

58 - (merged to 'next' on 2011-10-17 at a6412d4)

59 - + Documentation: update [section.subsection] to reflect what git does

60 -

61 -* jc/broken-ref-dwim-fix (2011-10-19) 3 commits

62 - (merged to 'next' on 2011-10-19 at 40cad95)

63 - + resolve_ref(): report breakage to the caller without warning

64 - + resolve_ref(): expose REF_ISBROKEN flag

65 - + refs.c: move dwim_ref()/dwim_log() from sha1_name.c

66 - (this branch is tangled with jc/check-ref-format-fixup.)

67 -

68 -This only takes good bits from the failed jc/check-ref-format-fixup topic

69 -and implements saner workaround for the recent breakage on the 'master'.

70 -

71 -* jc/maint-remove-renamed-ref (2011-10-12) 1 commit

72 - (merged to 'next' on 2011-10-12 at 819c3e4)

73 - + branch -m/-M: remove undocumented RENAMED-REF

74 -

75 -* jc/make-tags (2011-10-18) 1 commit

76 - (merged to 'next' on 2011-10-19 at b0b91bf)

77 - + Makefile: ask "ls-files" to list source files if available

78 -

79 -* jc/match-refs-clarify (2011-09-12) 2 commits

80 - (merged to 'next' on 2011-10-19 at b295e1e)

81 - + rename "match_refs()" to "match_push_refs()"

82 - + send-pack: typofix error message

83 -

84 -* jc/unseekable-bundle (2011-10-13) 2 commits

85 - (merged to 'next' on 2011-10-19 at 2978ee0)

86 - + bundle: add parse_bundle_header() helper function

87 - + bundle: allowing to read from an unseekable fd

88 -

89 -* jk/daemon-msgs (2011-10-15) 1 commit

90 - (merged to 'next' on 2011-10-15 at 415cf53)

91 - + daemon: give friendlier error messages to clients

92 - (this branch is used by cb/daemon-permission-errors.)

93 -

94 -* jk/maint-pack-objects-compete-with-delete (2011-10-14) 2 commits

95 - (merged to 'next' on 2011-10-15 at 49479e4)

96 - + downgrade "packfile cannot be accessed" errors to warnings

97 - + pack-objects: protect against disappearing packs

98 -

99 -* mh/ref-api (2011-10-16) 7 commits

100 - (merged to 'next' on 2011-10-17 at 219000f)

101 - + clear_ref_cache(): inline function

102 - + write_ref_sha1(): only invalidate the loose ref cache

103 - + clear_ref_cache(): extract two new functions

104 - + clear_ref_cache(): rename parameter

105 - + invalidate_ref_cache(): expose this function in the refs API

106 - + invalidate_ref_cache(): take the submodule as parameter

107 - + invalidate_ref_cache(): rename function from invalidate_cached_refs()

108 - (this branch is used by mh/ref-api-2 and mh/ref-api-3.)

109 -

110 -* ph/transport-with-gitfile (2011-10-11) 5 commits

111 - (merged to 'next' on 2011-10-12 at 6d58417)

112 - + Fix is_gitfile() for files too small or larger than PATH_MAX to be a gitfile

113 - (merged to 'next' on 2011-10-06 at 891b8b6)

114 - + Add test showing git-fetch groks gitfiles

115 - + Teach transport about the gitfile mechanism

116 - + Learn to handle gitfiles in enter_repo

117 - + enter_repo: do not modify input

118 -

119 -* po/insn-editor (2011-10-17) 1 commit

120 - (merged to 'next' on 2011-10-19 at cbf5e0b)

121 - + "rebase -i": support special-purpose editor to edit insn sheet

122 -

123 -* pw/p4-update (2011-10-17) 6 commits

124 - (merged to 'next' on 2011-10-17 at f69f6cc)

125 - + git-p4: handle files with shell metacharacters

126 - + git-p4: keyword flattening fixes

127 - + git-p4: stop ignoring apple filetype

128 - + git-p4: recognize all p4 filetypes

129 - + git-p4: handle utf16 filetype properly

130 - + git-p4 tests: refactor and cleanup

131 -

132 -* sc/difftool-skip (2011-10-14) 2 commits

133 - (merged to 'next' on 2011-10-14 at b91c581)

134 - + t7800: avoid arithmetic expansion notation

135 - (merged to 'next' on 2011-10-11 at 38d7e84)

136 - + git-difftool: allow skipping file by typing 'n' at prompt

137 -

138 -* ss/inet-ntop (2011-10-18) 1 commit

139 - (merged to 'next' on 2011-10-19 at 85469f6)

140 - + inet_ntop.c: Work around GCC 4.6's detection of uninitialized variables

88 +* cn/fetch-prune (2011-10-15) 5 commits

89 + (merged to 'next' on 2011-10-16 at 02a449e)

90 + + fetch: treat --tags like refs/tags/*:refs/tags/* when pruning

91 + + fetch: honor the user-provided refspecs when pruning refs

92 + + remote: separate out the remote_find_tracking logic into query_refspecs

93 + + t5510: add tests for fetch --prune

94 + + fetch: free all the additional refspecs

95 +

96 +"git fetch --prune" used to prune remote tracking branches by comparing

97 +what was actually fetched and what was configured to be fetched, which was

98 +wrong.

99 +

100 +* jm/maint-gitweb-filter-forks-fix (2011-10-21) 1 commit

101 + (merged to 'next' on 2011-10-21 at debedcd)

102 + + gitweb: fix regression when filtering out forks

103 +

104 +* jn/libperl-git-config (2011-10-21) 2 commits

105 + (merged to 'next' on 2011-10-21 at 76e2d4b)

106 + + Add simple test for Git::config_path() in t/t9700-perl-git.sh

107 + + libperl-git: refactor Git::config_*

108 +

109 +* lh/gitweb-site-html-head (2011-10-21) 1 commit

110 + (merged to 'next' on 2011-10-23 at 65075df)

111 + + gitweb: provide a way to customize html headers

112 +

113 +* mm/mediawiki-author-fix (2011-10-20) 1 commit

114 + (merged to 'next' on 2011-10-23 at 9f85b67)

115 + + git-remote-mediawiki: don't include HTTP login/password in author

116 +

117 +* tc/submodule-clone-name-detection (2011-10-21) 2 commits

118 + (merged to 'next' on 2011-10-23 at c18af03)

119 + + submodule::module_clone(): silence die() message from module_name()

120 + + submodule: whitespace fix

121 +

122 +"git submodule clone" used to show unnecessary error message when

123 +submodule mapping from name to path is not found in .gitmodules file.

124

125 --------------------------------------------------

126 [Stalled]

@@ -151,9 +134,6 @@ and implements saner workaround for the recent breakage on the 'master'.

134 What the topic aims to achieve may make sense, but the implementation

135 looked somewhat suboptimal.

136

154 -The fix-up at the tip queued on fg/submodule-auto-push topic has been

155 -moved to this topic.

156 -

137 * sr/transport-helper-fix-rfc (2011-07-19) 2 commits

138 - t5800: point out that deleting branches does not work

139 - t5800: document inability to push new branch with old content

@@ -184,30 +164,19 @@ it would soon realize the don't.

164

165 Will keep in 'pu' as a showcase for a while and then will drop.

166

187 ---------------------------------------------------

188 -[Cooking]

189 -

190 -* tc/submodule-clone-name-detection (2011-10-21) 2 commits

191 - (merged to 'next' on 2011-10-23 at c18af03)

192 - + submodule::module_clone(): silence die() message from module_name()

193 - + submodule: whitespace fix

194 -

195 -"git submodule clone" used to show unnecessary error message when

196 -submodule mapping from name to path is not found in .gitmodules file.

197 -

198 -Will merge to 'master'.

199 -

200 -* jm/maint-gitweb-filter-forks-fix (2011-10-21) 1 commit

201 - (merged to 'next' on 2011-10-21 at debedcd)

202 - + gitweb: fix regression when filtering out forks

167 +* kk/gitweb-side-by-side-diff (2011-10-17) 2 commits

168 + - gitweb: add a feature to show side-by-side diff

169 + - gitweb: change format_diff_line() to remove leading SP from $diff_class

170

204 -Will merge to 'master' shortly.

171 +Fun.

172 +Will keep in 'pu' until the planned re-roll comes.

173

206 -* lh/gitweb-site-html-head (2011-10-21) 1 commit

207 - (merged to 'next' on 2011-10-23 at 65075df)

208 - + gitweb: provide a way to customize html headers

174 +--------------------------------------------------

175 +[Cooking]

176

210 -Will merge to 'master' shortly.

177 +* nd/pretty-commit-log-message (2011-10-23) 2 commits

178 + - pretty.c: use original commit message if reencoding fails

179 + - pretty.c: free get_header() return value

180

181 * mh/ref-api-3 (2011-10-19) 11 commits

182 (merged to 'next' on 2011-10-23 at 92e2d35)

@@ -224,30 +193,18 @@ Will merge to 'master' shortly.

193 + Rename another local variable name -> refname

194 (this branch uses mh/ref-api-2.)

195

227 -* mm/mediawiki-author-fix (2011-10-20) 1 commit

228 - (merged to 'next' on 2011-10-23 at 9f85b67)

229 - + git-remote-mediawiki: don't include HTTP login/password in author

230 -

231 -Will merge to 'master' shortly.

232 -

196 * rr/revert-cherry-pick (2011-10-23) 5 commits

234 - - revert: simplify communicating command-line arguments

235 - - revert: allow mixed pick and revert instructions

236 - - revert: make commit subjects in insn sheet optional

237 - - revert: simplify getting commit subject in format_todo()

238 - - revert: free msg in format_todo()

197 + (merged to 'next' on 2011-10-26 at 27b7496)

198 + + revert: simplify communicating command-line arguments

199 + + revert: allow mixed pick and revert instructions

200 + + revert: make commit subjects in insn sheet optional

201 + + revert: simplify getting commit subject in format_todo()

202 + + revert: free msg in format_todo()

203

204 The internals of "git revert/cherry-pick" has been further refactored to

205 serve as the basis for the sequencer.

206

243 -Will merge to 'next'.

244 -

245 -* jn/libperl-git-config (2011-10-21) 2 commits

246 - (merged to 'next' on 2011-10-21 at 76e2d4b)

247 - + Add simple test for Git::config_path() in t/t9700-perl-git.sh

248 - + libperl-git: refactor Git::config_*

249 -

250 -Will merge to 'master' shortly.

207 +Will keep in 'next' during this cycle.

208

209 * jc/check-ref-format-fixup (2011-10-19) 2 commits

210 (merged to 'next' on 2011-10-19 at 98981be)

@@ -266,13 +223,6 @@ Will discard once the other topic graduates to 'master'.

223 The tip commit might be loosening things a bit too much.

224 Will keep in 'pu' until hearing a convincing argument for the patch.

225

269 -* kk/gitweb-side-by-side-diff (2011-10-17) 2 commits

270 - - gitweb: add a feature to show side-by-side diff

271 - - gitweb: change format_diff_line() to remove leading SP from $diff_class

272 -

273 -Fun.

274 -Will keep in 'pu' until the planned re-roll comes.

275 -

226 * mh/ref-api-2 (2011-10-17) 14 commits

227 (merged to 'next' on 2011-10-19 at cc89f0e)

228 + resolve_gitlink_ref_recursive(): change to work with struct ref_cache

@@ -312,6 +262,9 @@ system.

262 + contrib: add git-jump script

263 + contrib: add diff highlight script

264

265 +As this stuff is in contrib/ I do not care too much about the stability.

266 +Will merge to 'master' unless there is strong objection.

267 +

268 * jc/signed-commit (2011-10-21) 7 commits

269 (merged to 'next' on 2011-10-23 at 03eec25)

270 + pretty: %G[?GS] placeholders

@@ -326,32 +279,18 @@ This is to replace the earlier "signed push" experiments.

279 Will keep in 'next' during this cycle.

280

281 * sg/complete-refs (2011-10-21) 9 commits

329 - - completion: remove broken dead code from __git_heads() and __git_tags()

330 - - completion: fast initial completion for config 'remote.*.fetch' value

331 - - completion: improve ls-remote output filtering in __git_refs_remotes()

332 - - completion: query only refs/heads/ in __git_refs_remotes()

333 - - completion: support full refs from remote repositories

334 - - completion: improve ls-remote output filtering in __git_refs()

335 - - completion: make refs completion consistent for local and remote repos

336 - - completion: optimize refs completion

337 - - completion: document __gitcomp()

338 -

339 -Will merge to 'next' but won't merge further until an Ack or two from

340 -people who have worked on the completion in the past comes.

341 -

342 -* cn/fetch-prune (2011-10-15) 5 commits

343 - (merged to 'next' on 2011-10-16 at 02a449e)

344 - + fetch: treat --tags like refs/tags/*:refs/tags/* when pruning

345 - + fetch: honor the user-provided refspecs when pruning refs

346 - + remote: separate out the remote_find_tracking logic into query_refspecs

347 - + t5510: add tests for fetch --prune

348 - + fetch: free all the additional refspecs

349 -

350 -"git fetch --prune" used to prune remote tracking branches by comparing

351 -what was actually fetched and what was configured to be fetched, which was

352 -wrong.

353 -

354 -Will merge to 'master' shortly.

282 + (merged to 'next' on 2011-10-26 at d65e2b4)

283 + + completion: remove broken dead code from __git_heads() and __git_tags()

284 + + completion: fast initial completion for config 'remote.*.fetch' value

285 + + completion: improve ls-remote output filtering in __git_refs_remotes()

286 + + completion: query only refs/heads/ in __git_refs_remotes()

287 + + completion: support full refs from remote repositories

288 + + completion: improve ls-remote output filtering in __git_refs()

289 + + completion: make refs completion consistent for local and remote repos

290 + + completion: optimize refs completion

291 + + completion: document __gitcomp()

292 +

293 +Will keep in 'next' until an Ack or two from completion folks.

294

295 * jc/request-pull-show-head-4 (2011-10-15) 11 commits

296 (merged to 'next' on 2011-10-15 at 7e340ff)

What's cooking (2011/10 #10)