7fd4796b0f · matheusbsbs/matheus-bagliano

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

1 To: git@vger.kernel.org

2 -Subject: What's cooking in git.git (Dec 2010, #02; Wed, 8)

3 -X-master-at: f80b6de4eca9c4c4abfe9407736311de27726e53

4 -X-next-at: e348a8704e9acfb4ce3956593fbefdb9bd0ba893

2 +Subject: What's cooking in git.git (Dec 2010, #03; Fri, 10)

3 +X-master-at: 4443091d961e91041e64c1675940f0585eeba456

4 +X-next-at: 018bc80d140aff02f61e3a5100dd1367311d38ff

5

6 -What's cooking in git.git (Dec 2010, #02; Wed, 8)

6 +What's cooking in git.git (Dec 2010, #03; Fri, 10)

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

8

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

@@ -11,114 +11,39 @@ only in 'pu' while commits prefixed with '+' are in 'next'. The ones

11 marked with '.' do not appear in any of the integration branches, but I am

12 still holding onto them.

13

14 ---------------------------------------------------

15 -[Graduated to "master"]

16 -

17 -* gb/gitweb-remote-heads (2010-11-11) 11 commits

18 - (merged to 'next' on 2010-11-24 at 6fb4a6f)

19 - + git instaweb: enable remote_heads

20 - + gitweb: group remote heads by remote

21 - + gitweb: provide a routine to display (sub)sections

22 - + gitweb: refactor repository URL printing

23 - + gitweb: remotes view for a single remote

24 - + gitweb: allow action specialization in page header

25 - + gitweb: nagivation menu for tags, heads and remotes

26 - + gitweb: separate heads and remotes lists

27 - + gitweb: git_get_heads_list accepts an optional list of refs

28 - + gitweb: introduce remote_heads feature

29 - + gitweb: use fullname as hash_base in heads link

30 -

31 -* gc/http-with-non-ascii-username-url (2010-11-14) 2 commits

32 - (merged to 'next' on 2010-11-24 at 08f317f)

33 - + Fix username and password extraction from HTTP URLs

34 - + t5550: test HTTP authentication and userinfo decoding

35 -

36 -* il/remote-fd-ext (2010-11-17) 4 commits

37 - (merged to 'next' on 2010-11-24 at ef80cf1)

38 - + remote-fd/ext: finishing touches after code review

39 - (merged to 'next' on 2010-11-05 at 7413413)

40 - + git-remote-ext

41 - + git-remote-fd

42 - + Add bidirectional_transfer_loop()

43 -

44 -* jh/notes-merge (2010-11-09) 23 commits

45 - (merged to 'next' on 2010-11-24 at 6218115)

46 - + Provide 'git merge --abort' as a synonym to 'git reset --merge'

47 - + cmd_merge(): Parse options before checking MERGE_HEAD

48 - + Provide 'git notes get-ref' to easily retrieve current notes ref

49 - + git notes merge: Add testcases for merging notes trees at different fanouts

50 - + git notes merge: Add another auto-resolving strategy: "cat_sort_uniq"

51 - + git notes merge: --commit should fail if underlying notes ref has moved

52 - + git notes merge: List conflicting notes in notes merge commit message

53 - + git notes merge: Manual conflict resolution, part 2/2

54 - + git notes merge: Manual conflict resolution, part 1/2

55 - + Documentation: Preliminary docs on 'git notes merge'

56 - + git notes merge: Add automatic conflict resolvers (ours, theirs, union)

57 - + git notes merge: Handle real, non-conflicting notes merges

58 - + builtin/notes.c: Refactor creation of notes commits.

59 - + git notes merge: Initial implementation handling trivial merges only

60 - + builtin/notes.c: Split notes ref DWIMmery into a separate function

61 - + notes.c: Use two newlines (instead of one) when concatenating notes

62 - + (trivial) t3303: Indent with tabs instead of spaces for consistency

63 - + notes.h/c: Propagate combine_notes_fn return value to add_note() and beyond

64 - + notes.h/c: Allow combine_notes functions to remove notes

65 - + notes.c: Reorder functions in preparation for next commit

66 - + notes.h: Make default_notes_ref() available in notes API

67 - + (trivial) notes.h: Minor documentation fixes to copy_notes()

68 - + notes.c: Hexify SHA1 in die() message from init_notes()

69 -

70 -* jk/diff-CBM (2010-10-21) 1 commit

71 - (merged to 'next' on 2010-11-05 at 9d1ec14)

72 - + diff: report bogus input to -C/-M/-B

73 -

74 -* jk/maint-decorate-01-bool (2010-11-17) 1 commit

75 - (merged to 'next' on 2010-11-24 at 347f73b)

76 - + log.decorate: accept 0/1 bool values

77 - (this branch is used by jk/pager-per-command.)

78 -

79 -* jk/pager-per-command (2010-11-17) 1 commit

80 - (merged to 'next' on 2010-11-24 at 9ebcffc)

81 - + allow command-specific pagers in pager.<cmd>

82 - (this branch uses jk/maint-decorate-01-bool.)

83 -

84 -* jn/gitweb-time-hires-comes-with-5.8 (2010-11-09) 1 commit

85 - (merged to 'next' on 2010-11-24 at 6b91b41)

86 - + gitweb: Time::HiRes is in core for Perl 5.8

87 -

88 -* ks/maint-getenv-fix (2010-11-11) 1 commit

89 - (merged to 'next' on 2010-11-24 at fa89826)

90 - + setup: make sure git_dir path is in a permanent buffer, getenv(3) case

91 - (this branch is used by jn/getenv-poison.)

92 -

93 -* mg/maint-tag-rfc1991 (2010-11-10) 5 commits

94 - (merged to 'next' on 2010-11-24 at 03864ed)

95 - + tag: recognize rfc1991 signatures

96 - + tag: factor out sig detection for tag display

97 - + tag: factor out sig detection for body edits

98 - + verify-tag: factor out signature detection

99 - + t/t7004-tag: test handling of rfc1991 signatures

100 -

14 --------------------------------------------------

15 [New Topics]

16

104 -* ak/describe-exact (2010-12-07) 4 commits

105 - - describe: Delay looking up commits until searching for an inexact match

106 - - describe: Store commit_names in a hash table by commit SHA1

107 - - describe: Do not use a flex array in struct commit_name

108 - - describe: Use for_each_rawref

17 +* jh/gitweb-caching-8 (2010-12-09) 18 commits

18 + . gitweb: Add better error handling for gitweb caching

19 + . gitweb: Prepare for cached error pages & better error page handling

20 + . gitweb: When changing output (STDOUT) change STDERR as well

21 + . gitweb: Add show_warning() to display an immediate warning, with refresh

22 + . gitweb: add print_transient_header() function for central header printing

23 + . gitweb: Add commented url & url hash to page footer

24 + . gitweb: Change file handles (in caching) to lexical variables as opposed to globs

25 + . gitweb: add isDumbClient() check

26 + . gitweb: Adding isBinaryAction() and isFeedAction() to determine the action type

27 + . gitweb: Revert reset_output() back to original code

28 + . gitweb: Change is_cacheable() to return true always

29 + . gitweb: Revert back to $cache_enable vs. $caching_enabled

30 + . gitweb: Add more explicit means of disabling 'Generating...' page

31 + . gitweb: Regression fix concerning binary output of files

32 + . gitweb: Minimal testing of gitweb caching

33 + . gitweb: File based caching layer (from git.kernel.org)

34 + . gitweb: add output buffering and associated functions

35 + . gitweb: Prepare for splitting gitweb

36

110 -* jc/maint-svn-info-test-fix (2010-12-06) 1 commit

111 - (merged to 'next' on 2010-12-08 at f821694)

112 - + t9119: do not compare "Text Last Updated" line from "svn info"

37 +It appears that John and Jakub are finally working together to help

38 +producing something that we can ship in-tree, finally. I am looking

39 +forward to seeing the conclusion of the discussion.

40

114 -* jn/submodule-b-current (2010-12-05) 2 commits

115 - (merged to 'next' on 2010-12-08 at 33423f3)

116 - + git submodule: Remove now obsolete tests before cloning a repo

117 - + git submodule -b ... of current HEAD fails

118 -

119 -* jc/maint-no-openssl-build-fix (2010-12-08) 1 commit

120 - (merged to 'next' on 2010-12-08 at e348a87)

121 - + Do not link with -lcrypto under NO_OPENSSL

41 +* rj/msvc-fix (2010-12-04) 4 commits

42 + (merged to 'next' on 2010-12-10 at 7a2c2c6)

43 + + msvc: Fix macro redefinition warnings

44 + + msvc: Fix build by adding missing INTMAX_MAX define

45 + + msvc: git-daemon.exe: Fix linker "unresolved externals" error

46 + + msvc: Fix compilation errors in compat/win32/sys/poll.c

47

48 --------------------------------------------------

49 [Stalled]

@@ -159,17 +84,42 @@ This unfortunately heavily conflicts with patches in flight...

84 --------------------------------------------------

85 [Cooking]

86

162 -* aa/status-hilite-branch (2010-11-18) 1 commit

87 +* ak/describe-exact (2010-12-09) 4 commits

88 + (merged to 'next' on 2010-12-10 at 33497db)

89 + + describe: Delay looking up commits until searching for an inexact match

90 + + describe: Store commit_names in a hash table by commit SHA1

91 + + describe: Do not use a flex array in struct commit_name

92 + + describe: Use for_each_rawref

93 +

94 +Rerolled and looked fine.

95 +

96 +* jc/maint-svn-info-test-fix (2010-12-06) 1 commit

97 + (merged to 'next' on 2010-12-08 at f821694)

98 + + t9119: do not compare "Text Last Updated" line from "svn info"

99 +

100 +* jn/submodule-b-current (2010-12-05) 2 commits

101 + (merged to 'next' on 2010-12-08 at 33423f3)

102 + + git submodule: Remove now obsolete tests before cloning a repo

103 + + git submodule -b ... of current HEAD fails

104 +

105 +* jc/maint-no-openssl-build-fix (2010-12-08) 1 commit

106 + (merged to 'next' on 2010-12-08 at e348a87)

107 + + Do not link with -lcrypto under NO_OPENSSL

108 +

109 +* aa/status-hilite-branch (2010-12-09) 2 commits

110 + (merged to 'next' on 2010-12-10 at d00551d)

111 + + default color.status.branch to "same as header"

112 (merged to 'next' on 2010-12-08 at 0291858)

113 + status: show branchname with a configurable color

114

166 -I am indifferent/uninterested; I don't see anything wrong with it, but I

167 -do not find coloring the field particularly useful myself.

115 +Will merge to 'master'.

116

117 * ef/help-cmd-prefix (2010-11-26) 1 commit

118 (merged to 'next' on 2010-12-08 at c92752e)

119 + help: always suggest common-cmds if prefix of cmd

120

121 +Will merge to 'master'.

122 +

123 * jn/fast-import-blob-access (2010-12-03) 5 commits

124 (merged to 'next' on 2010-12-08 at a42f0b3)

125 + t9300: remove unnecessary use of /dev/stdin

@@ -178,16 +128,18 @@ do not find coloring the field particularly useful myself.

128 + fast-import: clarify documentation of "feature" command

129 + fast-import: stricter parsing of integer options

130

131 +Will merge to 'master'.

132 +

133 * jn/gitweb-per-request-config (2010-11-28) 2 commits

134 (merged to 'next' on 2010-12-08 at 44be9e5)

135 + gitweb: document $per_request_config better

136 + gitweb: selectable configurations that change with each request

137

186 -* kb/diff-C-M-synonym (2010-11-29) 1 commit

187 - - diff: add --detect-copies-harder as a synonym for --find-copies-harder

138 +Will merge to 'master'.

139

189 -I am not married to the approach and actually am fine with renaming the

190 -recent "detect" to "find", which I tend to think is probably nicer.

140 +* kb/diff-C-M-synonym (2010-11-10) 2 commits

141 + - diff: use "find" instead of "detect" as prefix for long forms of -M and -C

142 + - diff: add --detect-copies-harder as a synonym for --find-copies-harder

143

144 * mg/cvsimport (2010-11-28) 3 commits

145 - cvsimport.txt: document the mapping between config and options

@@ -202,14 +154,20 @@ not queued here.

154 (merged to 'next' on 2010-12-08 at 97d4912)

155 + rebase: only show stat if configured to true

156

157 +Will merge to 'master'.

158 +

159 * mz/pull-rebase-rebased (2010-11-13) 1 commit

160 (merged to 'next' on 2010-12-08 at 99c1762)

161 + Use reflog in 'pull --rebase . foo'

162

163 +Will merge to 'master'.

164 +

165 * nd/maint-hide-checkout-index-from-error (2010-11-28) 1 commit

166 (merged to 'next' on 2010-12-08 at 1869996)

167 + entry.c: remove "checkout-index" from error messages

168

169 +Will merge to 'master'.

170 +

171 * tf/commit-list-prefix (2010-11-26) 1 commit

172 - commit: Add commit_list prefix in two function names.

173

@@ -223,21 +181,29 @@ not queued here.

181 The remainder of the series, which is mostly Debian specific addition, can

182 wait (or just left for the distro).

183

184 +Will merge to 'master'.

185 +

186 * ja/maint-pull-rebase-doc (2010-12-03) 1 commit

187 (merged to 'next' on 2010-12-08 at 211bf89)

188 + git-pull.txt: Mention branch.autosetuprebase

189

190 +Will merge to 'master'.

191 +

192 * js/configurable-tab (2010-11-30) 2 commits

193 (merged to 'next' on 2010-12-08 at 3257365)

194 + Make the tab width used for whitespace checks configurable

195 + Merge branch 'js/maint-apply-tab-in-indent-fix' into HEAD

196 (this branch uses js/maint-apply-tab-in-indent-fix.)

197

198 +Will merge to 'master'.

199 +

200 * js/maint-apply-tab-in-indent-fix (2010-11-30) 1 commit

201 (merged to 'next' on 2010-12-08 at 02aedd5)

202 + apply --whitespace=fix: fix tab-in-indent

203 (this branch is used by js/configurable-tab.)

204

205 +Will merge to 'master'.

206 +

207 * pd/bash-4-completion (2010-12-01) 2 commits

208 - Use the new functions to get the current cword.

209 - Introduce functions from bash-completion project.

@@ -254,28 +220,42 @@ track.

220 + msvc: opendir: allocate enough memory

221 + msvc: opendir: fix malloc-failure

222

223 +Will merge to 'master'.

224 +

225 * jk/asciidoc-update (2010-11-19) 1 commit

226 (merged to 'next' on 2010-12-08 at 72ffafe)

227 + docs: default to more modern toolset

228

229 +Will merge to 'master'.

230 +

231 * jk/maint-reflog-bottom (2010-11-21) 1 commit

232 (merged to 'next' on 2010-12-08 at f5ca80a)

233 + reflogs: clear flags properly in corner case

234

235 +Will merge to 'master'.

236 +

237 * jn/fast-import-ondemand-checkpoint (2010-11-22) 1 commit

238 (merged to 'next' on 2010-12-08 at f538396)

239 + fast-import: treat SIGUSR1 as a request to access objects early

240

241 +Will merge to 'master'.

242 +

243 * jn/maint-fast-import-object-reuse (2010-11-23) 1 commit

244 (merged to 'next' on 2010-12-08 at 5d29c08)

245 + fast-import: insert new object entries at start of hash bucket

246

273 -* jn/maint-svn-fe (2010-12-05) 3 commits

247 +Will merge to 'master'.

248 +

249 +* jn/maint-svn-fe (2010-12-08) 4 commits

250 + (merged to 'next' on 2010-12-09 at 98beb7c)

251 + + t9010 fails when no svn is available

252 (merged to 'next' on 2010-12-08 at e25350b)

253 + vcs-svn: fix intermittent repo_tree corruption

254 + treap: make treap_insert return inserted node

255 + t9010 (svn-fe): Eliminate dependency on svn perl bindings

256

257 +Will merge to 'master'.

258 +

259 * jn/svn-fe (2010-12-06) 18 commits

260 - vcs-svn: Allow change nodes for root of tree (/)

261 - vcs-svn: Implement Prop-delta handling

@@ -302,21 +282,23 @@ Some RFC patches, to give them early and wider exposure.

282 (merged to 'next' on 2010-12-08 at adce2e1)

283 + rebase --abort: do not update branch ref

284

285 +Will merge to 'master'.

286 +

287 * mz/rebase-i-verify (2010-11-22) 1 commit

288 (merged to 'next' on 2010-12-08 at 18275df)

289 + rebase: support --verify

290

309 -* nd/maint-relative (2010-11-20) 1 commit

310 - - get_cwd_relative(): do not misinterpret root path

291 +Will merge to 'master'.

292

312 -Will merge to 'next' soon.

293 +* nd/maint-relative (2010-11-20) 1 commit

294 + (merged to 'next' on 2010-12-10 at 018bc80)

295 + + get_cwd_relative(): do not misinterpret root path

296

297 * tc/format-patch-p (2010-11-23) 1 commit

298 (merged to 'next' on 2010-12-08 at e8bff23)

299 + format-patch: page output with --stdout

300

318 -I am indifferent/uninterested; I don't see anything wrong with it,

319 -though.

301 +Will merge to 'master'.

302

303 * tc/http-urls-ends-with-slash (2010-11-25) 9 commits

304 (merged to 'next' on 2010-12-08 at b9a878a)

@@ -330,7 +312,11 @@ though.

312 + t5550-http-fetch: add test for http-fetch

313 + t5550-http-fetch: add missing '&&'

314

333 -* nd/extended-sha1-relpath (2010-11-28) 2 commits

315 +Will merge to 'master'.

316 +

317 +* nd/extended-sha1-relpath (2010-12-09) 3 commits

318 + (merged to 'next' on 2010-12-10 at 0018aa6)

319 + + get_sha1: teach ":$n:<path>" the same relative path logic

320 (merged to 'next' on 2010-12-08 at 940e5e2)

321 + get_sha1: support relative path ":path" syntax

322 + Make prefix_path() return char* without const

@@ -352,6 +338,8 @@ have been merged to 'master' (it was a no-op fix).

338 . gitweb: add output buffering and associated functions

339 . gitweb: Prepare for splitting gitweb

340

341 +Previous iteration; dropped.

342 +

343 * jn/parse-options-extra (2010-12-01) 10 commits

344 (merged to 'next' on 2010-12-08 at 3a3e3ac)

345 + update-index: migrate to parse-options API

@@ -366,6 +354,8 @@ have been merged to 'master' (it was a no-op fix).

354 + parse-options: Don't call parse_options_check() so much

355 (this branch is used by nd/extended-sha1-relpath.)

356

357 +Will merge to 'master'.

358 +

359 * nd/setup (2010-11-26) 47 commits

360 - git.txt: correct where --work-tree path is relative to

361 - Revert "Documentation: always respect core.worktree if set"

@@ -425,6 +415,8 @@ have been merged to 'master' (it was a no-op fix).

415 + checkout-index -h: show usage even in an invalid repository

416 + branch -h: show usage even in an invalid repository

417

418 +Will merge to 'master'.

419 +

420 * yd/dir-rename (2010-10-29) 5 commits

421 - Allow hiding renames of individual files involved in a directory rename.

422 - Unified diff output format for bulk moves.

@@ -432,7 +424,7 @@ have been merged to 'master' (it was a no-op fix).

424 - Raw diff output format for bulk moves.

425 - Introduce bulk-move detection in diffcore.

426

435 -Yet to be rerolled.

427 +Need to re-queue the reroll.

428

429 * nd/struct-pathspec (2010-09-20) 11 commits

430 - ce_path_match: drop prefix matching in favor of match_pathspec

@@ -462,12 +454,19 @@ Wait Nguyen for another round (2010-11-11).

454 - Add struct pathspec

455 (this branch is tangled with nd/struct-pathspec.)

456

465 -* jl/fetch-submodule-recursive (2010-11-11) 3 commits

457 +* jl/fetch-submodule-recursive (2010-12-09) 4 commits

458 + (merged to 'next' on 2010-12-10 at edd0bf0)

459 + + fetch_populated_submodules(): document dynamic allocation

460 (merged to 'next' on 2010-12-08 at 676c4f5)

461 + Submodules: Add the "fetchRecurseSubmodules" config option

462 + Add the 'fetch.recurseSubmodules' config setting

463 + fetch/pull: Add the --recurse-submodules option

464

465 +After giving another look, I think this is Ok, although I didn't quite get

466 +where the magic number 5 in fetch_populated_submodules() came from.

467 +

468 +Will merge to 'master'.

469 +

470 * tr/merge-unborn-clobber (2010-08-22) 1 commit

471 - Exhibit merge bug that clobbers index&WT

472

What's cooking (2010/12 #03)