029a94052b · matheusbsbs/matheus-bagliano

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

1 To: git@vger.kernel.org

2 -Subject: What's cooking in git.git (Dec 2010, #04; Mon, 13)

3 -X-master-at: b5c178143088350c49129acbedb864d70c666215

4 -X-next-at: 7dc56dda544e82bf53b1f2c717157a78f946c464

2 +Subject: What's cooking in git.git (Dec 2010, #05; Thu, 16)

3 +X-master-at: 1b9743462d9ef3c0e73a3c439de45c0c16b6c938

4 +X-next-at: 987cddb87165104f919f3287f393191042955364

5

6 -What's cooking in git.git (Dec 2010, #04; Mon, 13)

6 +What's cooking in git.git (Dec 2010, #05; Thu, 16)

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

8

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

@@ -14,124 +14,138 @@ still holding onto them.

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

15 [New Topics]

16

17 -* nd/oneline-sha1-name-from-specific-ref (2010-12-13) 3 commits

18 - - get_sha1: support $commit^{/regex} syntax

19 - - get_sha1_oneline: make callers prepare the commit list to traverse

20 - - get_sha1_oneline: fix lifespan rule of temp_commit_buffer variable

17 +* jn/maint-gitweb-pathinfo-fix (2010-12-14) 1 commit

18 + (merged to 'next' on 2010-12-14 at 1af8cca)

19 + + gitweb: Fix handling of whitespace in generated links

20 +

21 +* rj/maint-difftool-cygwin-workaround (2010-12-14) 1 commit

22 + - difftool: Fix failure on Cygwin

23 +

24 +* rj/maint-test-fixes (2010-12-14) 5 commits

25 + - t9501-*.sh: Fix a test failure on Cygwin

26 + - lib-git-svn.sh: Add check for mis-configured web server variables

27 + - lib-git-svn.sh: Avoid setting web server variables unnecessarily

28 + - t9142: Move call to start_httpd into the setup test

29 + - t3600-rm.sh: Don't pass a non-existent prereq to test #15

30 +

31 +* rj/test-fixes (2010-12-14) 4 commits

32 + - t4135-*.sh: Skip the "backslash" tests on cygwin

33 + - t3032-*.sh: Do not strip CR from line-endings while grepping on MinGW

34 + - t3032-*.sh: Pass the -b (--binary) option to sed on cygwin

35 + - t6038-*.sh: Pass the -b (--binary) option to sed on cygwin

36 +

37 +* tr/maint-branch-no-track-head (2010-12-14) 1 commit

38 + - branch: do not attempt to track HEAD implicitly

39 +

40 +Probably needs a re-roll to exclude either (1) any ref outside the

41 +hierarchies for branches (i.e. refs/{heads,remotes}/), or (2) only refs

42 +outside refs/ hierarchies (e.g. HEAD, ORIG_HEAD, ...). The latter feels

43 +safer and saner.

44 +

45 +* by/log-l (2010-12-14) 8 commits

46 + . log -L: implement move/copy detection (-M/-C)

47 + . log -L: add --full-line-diff option

48 + . log -L: add --graph prefix before output

49 + . log -L: support parent rewriting

50 + . Implement line-history search (git log -L)

51 + . Export rewrite_parents() for 'log -L'

52 + . Export three functions from diff.c

53 + . Refactor parse_loc

54 +

55 +Seems to have some bad interactions with nd/struct-pathspec.

56 +

57 +* hv/mingw-fs-funnies (2010-12-14) 5 commits

58 + - mingw_rmdir: set errno=ENOTEMPTY when appropriate

59 + - mingw: add fallback for rmdir in case directory is in use

60 + - mingw: make failures to unlink or move raise a question

61 + - mingw: work around irregular failures of unlink on windows

62 + - mingw: move unlink wrapper to mingw.c

63

64 --------------------------------------------------

65 [Graduated to "master"]

66

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

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

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

28 -

29 -* ef/win32-dirent (2010-11-23) 6 commits

30 - (merged to 'next' on 2010-12-08 at 1a7169d)

31 - + win32: use our own dirent.h

32 - + msvc: opendir: handle paths ending with a slash

33 - + win32: dirent: handle errors

34 - + msvc: opendir: do not start the search

35 - + msvc: opendir: allocate enough memory

36 - + msvc: opendir: fix malloc-failure

37 -

38 -* gb/web--browse (2010-12-03) 4 commits

39 - (merged to 'next' on 2010-12-08 at cff4009)

40 - + web--browse: better support for chromium

41 - + web--browse: support opera, seamonkey and elinks

42 - + web--browse: split valid_tool list

43 - + web--browse: coding style

44 -

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

46 -wait (or just left for the distro).

47 -

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

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

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

51 -

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

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

54 - + docs: default to more modern toolset

55 -

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

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

58 - + reflogs: clear flags properly in corner case

59 -

60 -* jn/git-cmd-h-bypass-setup (2010-10-22) 7 commits

61 - (merged to 'next' on 2010-12-08 at 0fc3158)

62 - + update-index -h: show usage even with corrupt index

63 - + merge -h: show usage even with corrupt index

64 - + ls-files -h: show usage even with corrupt index

65 - + gc -h: show usage even with broken configuration

66 - + commit/status -h: show usage even with broken configuration

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

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

69 -

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

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

72 - + gitweb: document $per_request_config better

73 - + gitweb: selectable configurations that change with each request

74 -

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

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

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

78 - + setup: save prefix (original cwd relative to toplevel) in startup_info

79 - + parse-options: make resuming easier after PARSE_OPT_STOP_AT_NON_OPTION

80 - + parse-options: allow git commands to invent new option types

81 - + parse-options: never suppress arghelp if LITERAL_ARGHELP is set

82 - + parse-options: do not infer PARSE_OPT_NOARG from option type

83 - + parse-options: sanity check PARSE_OPT_NOARG flag

84 - + parse-options: move NODASH sanity checks to parse_options_check

85 - + parse-options: clearer reporting of API misuse

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

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

88 -

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

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

91 - + Make the tab width used for whitespace checks configurable

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

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

94 -

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

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

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

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

99 -

100 -* mz/maint-rebase-stat-config (2010-11-09) 1 commit

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

102 - + rebase: only show stat if configured to true

103 -

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

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

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

107 -

108 -* mz/rebase-abort-reflog-fix (2010-11-21) 1 commit

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

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

111 -

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

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

114 - + rebase: support --verify

115 -

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

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

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

119 -

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

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

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

123 -

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

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

126 - + http-fetch: rework url handling

127 - + http-push: add trailing slash at arg-parse time, instead of later on

128 - + http-push: check path length before using it

129 - + http-push: Normalise directory names when pushing to some WebDAV servers

130 - + http-backend: use end_url_with_slash()

131 - + url: add str wrapper for end_url_with_slash()

132 - + shift end_url_with_slash() from http.[ch] to url.[ch]

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

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

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

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

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

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

71 + + status: show branchname with a configurable color

72 +

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

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

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

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

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

78 + + describe: Use for_each_rawref

79 +

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

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

82 + + Do not link with -lcrypto under NO_OPENSSL

83 +

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

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

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

87 +

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

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

90 + + fetch_populated_submodules(): document dynamic allocation

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

92 + + Submodules: Add the "fetchRecurseSubmodules" config option

93 + + Add the 'fetch.recurseSubmodules' config setting

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

95 +

96 +* jn/fast-import-blob-access (2010-12-13) 6 commits

97 + (merged to 'next' on 2010-12-12 at 7dc56dd)

98 + + t9300: avoid short reads from dd

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

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

101 + + fast-import: Allow cat-blob requests at arbitrary points in stream

102 + + fast-import: let importers retrieve blobs

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

104 + + fast-import: stricter parsing of integer options

105 +

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

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

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

109 +

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

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

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

113 +

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

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

116 + + t9010 fails when no svn is available

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

118 + + vcs-svn: fix intermittent repo_tree corruption

119 + + treap: make treap_insert return inserted node

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

121 +

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

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

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

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

126 +

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

128 + (merged to 'next' on 2010-12-13 at 13fdbdd)

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

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

131 +

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

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

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

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

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

137 + + Make prefix_path() return char* without const

138 +

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

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

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

142 +

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

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

145 + + msvc: Fix macro redefinition warnings

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

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

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

149

150 --------------------------------------------------

151 [Stalled]

@@ -172,64 +186,12 @@ This unfortunately heavily conflicts with patches in flight...

186 --------------------------------------------------

187 [Cooking]

188

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

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

177 - + msvc: Fix macro redefinition warnings

178 - + msvc: Fix build by adding missing INTMAX_MAX define

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

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

181 -

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

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

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

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

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

187 - + describe: Use for_each_rawref

188 -

189 -Rerolled and looked fine.

190 -

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

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

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

194 -

195 -Will merge to 'master'.

196 -

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

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

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

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

201 -

202 -Will merge to 'master'.

203 -

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

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

206 - + Do not link with -lcrypto under NO_OPENSSL

207 -

208 -Will merge to 'master'.

209 -

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

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

212 - + default color.status.branch to "same as header"

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

214 - + status: show branchname with a configurable color

215 -

216 -Will merge to 'master'.

217 -

218 -* jn/fast-import-blob-access (2010-12-13) 6 commits

219 - (merged to 'next' on 2010-12-12 at 7dc56dd)

220 - + t9300: avoid short reads from dd

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

222 - + t9300: remove unnecessary use of /dev/stdin

223 - + fast-import: Allow cat-blob requests at arbitrary points in stream

224 - + fast-import: let importers retrieve blobs

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

226 - + fast-import: stricter parsing of integer options

227 -

228 -Will merge to 'master'.

189 +* nd/oneline-sha1-name-from-specific-ref (2010-12-13) 3 commits

190 + - get_sha1: support $commit^{/regex} syntax

191 + - get_sha1_oneline: make callers prepare the commit list to traverse

192 + - get_sha1_oneline: fix lifespan rule of temp_commit_buffer variable

193

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

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

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

194 +This should be more or less ready for 'next'.

195

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

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

@@ -246,34 +208,13 @@ not queued here.

208 This churn already introduced an unnecessary conflict. It is not by

209 itself a biggie, but these things tend to add up.

210

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

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

251 - - Introduce functions from bash-completion project.

211 +* pd/bash-4-completion (2010-12-15) 3 commits

212 + - Merge branch 'master' (early part) into pd/bash-4-completion

213 + - bash: simple reimplementation of _get_comp_words_by_ref

214 + - bash: get --pretty=m<tab> completion to work with bash v4

215

253 -There is a "here is a better way to do this" from Jonathan, but I lost

254 -track.

255 -

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

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

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

259 -

260 -Will merge to 'master'.

261 -

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

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

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

265 -

266 -Will merge to 'master'.

267 -

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

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

270 - + t9010 fails when no svn is available

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

272 - + vcs-svn: fix intermittent repo_tree corruption

273 - + treap: make treap_insert return inserted node

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

275 -

276 -Will merge to 'master'.

216 +Updated by Jonathan; this still has some conflicts around "notes"

217 +completion I tried to resolve near the tip of 'pu'.

218

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

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

@@ -297,21 +238,6 @@ Will merge to 'master'.

238

239 Some RFC patches, to give them early and wider exposure.

240

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

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

302 - + get_cwd_relative(): do not misinterpret root path

303 -

304 -Will merge to 'master'.

305 -

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

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

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

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

310 - + get_sha1: support relative path ":path" syntax

311 - + Make prefix_path() return char* without const

312 -

313 -Will merge to 'master'.

314 -

241 * nd/maint-fix-add-typo-detection (2010-11-27) 5 commits

242 - Revert "excluded_1(): support exclude files in index"

243 - unpack-trees: fix sparse checkout's "unable to match directories"

@@ -411,43 +337,36 @@ Need to re-read this series to move it forward.

337

338 Need to re-queue the reroll.

339

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

415 - - ce_path_match: drop prefix matching in favor of match_pathspec

340 +* nd/struct-pathspec (2010-12-15) 21 commits

341 + - t7810: overlapping pathspecs and depth limit

342 + - grep: drop pathspec_matches() in favor of tree_entry_interesting()

343 + - grep: use writable strbuf from caller in grep_tree()

344 + - strbuf: allow "buf" to point to the middle of the allocated buffer

345 + - grep: use match_pathspec_depth() for cache/worktree grepping

346 + - grep: convert to use struct pathspec

347 + - Convert ce_path_match() to use match_pathspec_depth()

348 - Convert ce_path_match() to use struct pathspec

417 - - tree_entry_interesting: turn to match_pathspec if wildcard is present

418 - - pathspec: add tree_recursive_diff parameter

419 - - pathspec: mark wildcard pathspecs from the beginning

349 + - pathspec: add match_pathspec_depth()

350 + - tree_entry_interesting(): optimize wildcard matching when base is matched

351 + - tree_entry_interesting(): support wildcard matching

352 + - tree_entry_interesting(): fix depth limit with overlapping pathspecs

353 + - tree_entry_interesting(): support depth limit

354 + - tree_entry_interesting(): refactor into separate smaller functions

355 + - diff-tree: convert base+baselen to writable strbuf

356 + - glossary: define pathspec

357 - Move tree_entry_interesting() to tree-walk.c and export it

358 - tree_entry_interesting(): remove dependency on struct diff_options

359 - Convert struct diff_options to use struct pathspec

423 - - pathspec: cache string length when initializing pathspec

360 - diff-no-index: use diff_tree_setup_paths()

361 - Add struct pathspec

426 - (this branch is tangled with en/object-list-with-pathspec.)

362 + (this branch is used by en/object-list-with-pathspec.)

363

428 -This is related to something I have long been wanting to see happen.

429 -Wait Nguyen for another round (2010-11-11).

364 +Rerolled again. Getting nicer by the round ;-)

365

431 -* en/object-list-with-pathspec (2010-09-20) 8 commits

366 +* en/object-list-with-pathspec (2010-09-20) 2 commits

367 - Add testcases showing how pathspecs are handled with rev-list --objects

368 - Make rev-list --objects work together with pathspecs

434 - - Move tree_entry_interesting() to tree-walk.c and export it

435 - - tree_entry_interesting(): remove dependency on struct diff_options

436 - - Convert struct diff_options to use struct pathspec

437 - - pathspec: cache string length when initializing pathspec

438 - - diff-no-index: use diff_tree_setup_paths()

439 - - Add struct pathspec

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

441 -

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

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

444 - + fetch_populated_submodules(): document dynamic allocation

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

446 - + Submodules: Add the "fetchRecurseSubmodules" config option

447 - + Add the 'fetch.recurseSubmodules' config setting

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

449 -

450 -Will merge to 'master'.

369 + (this branch uses nd/struct-pathspec.)

370

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

372 - Exhibit merge bug that clobbers index&WT

What's cooking (2010/12 #05)