5bdd63cee5 · matheusbsbs/matheus-bagliano

@@ -1,10 +1,10 @@

1 To: git@vger.kernel.org

2 Bcc: lwn@lwn.net

3 -Subject: What's cooking in git.git (Jan 2013, #08; Tue, 22)

4 -X-master-at: 9591fcc6d66fd213c8c9f73553b7684b73daf4cb

5 -X-next-at: 9bc26b8f63ccfb0316023621731bc14191a8b436

3 +Subject: What's cooking in git.git (Jan 2013, #09; Fri, 25)

4 +X-master-at: 50a6b54c03219ad74b9f3f839e0321be18daeaf6

5 +X-next-at: acf9419c4c1775dd98c80ac4ecc3b5dd89df9fb4

6

7 -What's cooking in git.git (Jan 2013, #08; Tue, 22)

7 +What's cooking in git.git (Jan 2013, #09; Fri, 25)

8 --------------------------------------------------

9

10 Here are the topics that have been cooking. Commits prefixed with

@@ -20,273 +20,211 @@ repositories listed at

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

21

22 --------------------------------------------------

23 -[New Topics]

24 -

25 -* bc/fix-array-syntax-for-3.0-in-completion-bash (2013-01-18) 1 commit

26 - - git-completion.bash: replace zsh notation that breaks bash 3.X

27 -

28 - Fix use of an array notation that older versions of bash do not

29 - understand.

30 -

31 - Will merge to 'next'.

32 -

33 -

34 -* jc/help (2013-01-18) 1 commit

35 - - help: include <common-cmds.h> only in one file

36 -

37 - A header file that has the definition of a static array was

38 - included in two places, wasting the space.

39 -

40 - Will merge to 'next'.

41 -

42 -

43 -* jc/hidden-refs (2013-01-18) 2 commits

44 - - upload-pack: allow hiding ref hiearchies

45 - - upload-pack: share more code

46 -

47 - Allow the server side to unclutter the refs/ namespace it shows by

48 - default, while still allowing requests for histories leading to the

49 - tips of hidden refs by updated clients (which are not written yet).

50 -

51 -

52 -* jk/update-install-for-p4 (2013-01-20) 1 commit

53 - - INSTALL: git-p4 doesn't support Python 3

54 -

55 - Will merge to 'next'.

56 -

57 -

58 -* tb/t0050-maint (2013-01-21) 3 commits

59 - - t0050: Use TAB for indentation

60 - - t0050: honor CASE_INSENSITIVE_FS in add (with different case)

61 - - t0050: known breakage vanished in merge (case change)

62 -

63 - Will merge to 'next'.

64 -

65 -

66 -* nd/magic-pathspec-from-root (2013-01-21) 2 commits

67 - - grep: avoid accepting ambiguous revision

68 - - Update :/abc ambiguity check

69 -

70 - Will merge to 'next'.

71 -

72 -

73 -* ta/doc-no-small-caps (2013-01-21) 7 commits

74 - - Add rule for when to use 'git' and when to use 'Git'

75 - - Change 'git' to 'Git' whenever the whole system is referred to #4

76 - - Change 'git' to 'Git' whenever the whole system is referred to #3

77 - - Change 'git' to 'Git' whenever the whole system is referred to #2

78 - - Change 'git' to 'Git' whenever the whole system is referred to #1

79 - - Documentation: update two leftover small caps

80 - - Documentation: avoid poor-man's small caps

81 -

82 - Update documentation to change "GIT" which was a poor-man's small

83 - caps to "Git" which was the intended spelling. Also change "git"

84 - spelled in all-lowercase to "Git" when it refers to the system as

85 - the whole or the concept it embodies, as opposed to the command the

86 - end users would type.

87 -

88 -

89 -* rr/minimal-stat (2013-01-22) 1 commit

90 - - Enable minimal stat checking

23 +[Graduated to "master"]

24

92 - Some reimplementations of Git does not write all the stat info back

93 - to the index due to their implementation limitations (e.g. jgit

94 - running on Java). A configuration option can tell Git to ignore

95 - changes to most of the stat fields and only pay attention to mtime

96 - and size, which these implementations can reliably update. This

97 - avoids excessive revalidation of contents.

25 +* as/check-ignore (2013-01-16) 13 commits

26 + (merged to 'next' on 2013-01-18 at ef45aff)

27 + + clean.c, ls-files.c: respect encapsulation of exclude_list_groups

28 + (merged to 'next' on 2013-01-14 at 9df2afc)

29 + + t0008: avoid brace expansion

30 + + add git-check-ignore sub-command

31 + + setup.c: document get_pathspec()

32 + + add.c: extract new die_if_path_beyond_symlink() for reuse

33 + + add.c: extract check_path_for_gitlink() from treat_gitlinks() for reuse

34 + + pathspec.c: rename newly public functions for clarity

35 + + add.c: move pathspec matchers into new pathspec.c for reuse

36 + + add.c: remove unused argument from validate_pathspec()

37 + + dir.c: improve docs for match_pathspec() and match_pathspec_depth()

38 + + dir.c: provide clear_directory() for reclaiming dir_struct memory

39 + + dir.c: keep track of where patterns came from

40 + + dir.c: use a single struct exclude_list per source of excludes

41

99 - Will merge to 'next'.

42 + Add a new command "git check-ignore" for debugging .gitignore

43 + files. The variable names may want to get cleaned up but that can

44 + be done in-tree.

45

101 ---------------------------------------------------

102 -[Graduated to "master"]

46

104 -* ap/log-mailmap (2013-01-10) 11 commits

105 - (merged to 'next' on 2013-01-10 at 8544084)

106 - + log --use-mailmap: optimize for cases without --author/--committer search

107 - + log: add log.mailmap configuration option

108 - + log: grep author/committer using mailmap

109 - + test: add test for --use-mailmap option

110 - + log: add --use-mailmap option

111 - + pretty: use mailmap to display username and email

112 - + mailmap: add mailmap structure to rev_info and pp

113 - + mailmap: simplify map_user() interface

114 - + mailmap: remove email copy and length limitation

115 - + Use split_ident_line to parse author and committer

116 - + string-list: allow case-insensitive string list

47 +* as/pre-push-hook (2013-01-18) 3 commits

48 + (merged to 'next' on 2013-01-18 at 37fc4e8)

49 + + Add sample pre-push hook script

50 + + push: Add support for pre-push hooks

51 + + hooks: Add function to check if a hook exists

52

118 - Teach commands in the "log" family to optionally pay attention to

119 - the mailmap.

53 + Add an extra hook so that "git push" that is run without making

54 + sure what is being pushed is sane can be checked and rejected (as

55 + opposed to the user deciding not pushing).

56

57

122 -* ds/completion-silence-in-tree-path-probe (2013-01-11) 1 commit

123 - (merged to 'next' on 2013-01-15 at 7542d21)

124 - + git-completion.bash: silence "not a valid object" errors

58 +* ch/add-auto-submitted-in-sample-post-receive-email (2013-01-17) 1 commit

59 + (merged to 'next' on 2013-01-18 at e3205db)

60 + + Add Auto-Submitted header to post-receive-email

61

126 - An internal ls-tree call made by completion code only to probe if

127 - a path exists in the tree recorded in a commit object leaked error

128 - messages when the path is not there. It is not an error at all and

129 - should not be shown to the end user.

62 + Mark e-mails coming from automated processes should be marked as

63 + such; update a sample hook to do so.

64

65

132 -* fc/remote-hg-fixup-url (2013-01-15) 1 commit

133 - (merged to 'next' on 2013-01-15 at d2acb2d)

134 - + remote-hg: store converted URL

66 +* cr/push-force-tag-update (2013-01-16) 1 commit

67 + (merged to 'next' on 2013-01-18 at c9091d5)

68 + + push: fix "refs/tags/ hierarchy cannot be updated without --force"

69 + (this branch is used by jc/push-reject-reasons.)

70

136 - Update to the Hg remote helper (in contrib/).

71 + Regression fix, not to say "already exists" when we traditionally

72 + said "non fast-forward'.

73

74

139 -* jn/maint-trim-vim-contrib (2013-01-10) 1 commit

140 - (merged to 'next' on 2013-01-15 at ad80a9d)

141 - + contrib/vim: simplify instructions for old vim support

75 +* jc/doc-maintainer (2013-01-03) 2 commits

76 + (merged to 'next' on 2013-01-11 at f35d582)

77 + + howto/maintain: mark titles for asciidoc

78 + + Documentation: update "howto maintain git"

79

143 - Remove stale insn to support older versions of vim and point users

144 - to the upstream resources.

80 + Describe tools for automation that were invented since this

81 + document was originally written.

82

83

147 -* mh/remote-hg-mode-bits-fix (2013-01-15) 1 commit

148 - (merged to 'next' on 2013-01-15 at ad57d9f)

149 - + remote-hg: fix handling of file perms when pushing

84 +* jk/suppress-clang-warning (2013-01-16) 1 commit

85 + (merged to 'next' on 2013-01-18 at 7c0bda7)

86 + + fix clang -Wunused-value warnings for error functions

87

151 - Update to the Hg remote helper (in contrib/).

88

89 +* mh/imap-send-shrinkage (2013-01-15) 14 commits

90 + (merged to 'next' on 2013-01-18 at 1b7c5ba)

91 + + imap-send.c: simplify logic in lf_to_crlf()

92 + + imap-send.c: fold struct store into struct imap_store

93 + + imap-send.c: remove unused field imap_store::uidvalidity

94 + + imap-send.c: use struct imap_store instead of struct store

95 + + imap-send.c: remove unused field imap_store::trashnc

96 + + imap-send.c: remove namespace fields from struct imap

97 + + imap-send.c: remove struct imap argument to parse_imap_list_l()

98 + + imap-send.c: inline parse_imap_list() in parse_list()

99 + + imap-send.c: remove some unused fields from struct store

100 + + imap-send.c: remove struct message

101 + + imap-send.c: remove struct store_conf

102 + + iamp-send.c: remove unused struct imap_store_conf

103 + + imap-send.c: remove struct msg_data

104 + + imap-send.c: remove msg_data::flags, which was always zero

105

154 -* mk/complete-tcsh (2013-01-07) 1 commit

155 - (merged to 'next' on 2013-01-11 at b8b30b1)

156 - + Prevent space after directories in tcsh completion

106 + Remove a lot of unused code from "git imap-send".

107

158 - Update tcsh command line completion so that an unwanted space is

159 - not added to a single directory name.

108

109 +* mo/cvs-server-updates (2012-12-09) 18 commits

110 + (merged to 'next' on 2013-01-08 at 75e2d11)

111 + + t9402: Use TABs for indentation

112 + + t9402: Rename check.cvsCount and check.list

113 + + t9402: Simplify git ls-tree

114 + + t9402: Add missing &&; Code style

115 + + t9402: No space after IO-redirection

116 + + t9402: Dont use test_must_fail cvs

117 + + t9402: improve check_end_tree() and check_end_full_tree()

118 + + t9402: sed -i is not portable

119 + + cvsserver Documentation: new cvs ... -r support

120 + + cvsserver: add t9402 to test branch and tag refs

121 + + cvsserver: support -r and sticky tags for most operations

122 + + cvsserver: Add version awareness to argsfromdir

123 + + cvsserver: generalize getmeta() to recognize commit refs

124 + + cvsserver: implement req_Sticky and related utilities

125 + + cvsserver: add misc commit lookup, file meta data, and file listing functions

126 + + cvsserver: define a tag name character escape mechanism

127 + + cvsserver: cleanup extra slashes in filename arguments

128 + + cvsserver: factor out git-log parsing logic

129

162 -* mz/reset-misc (2013-01-16) 20 commits

163 - (merged to 'next' on 2013-01-16 at 937bc20)

164 - + reset: update documentation to require only tree-ish with paths

165 - (merged to 'next' on 2013-01-15 at a93b394)

166 - + reset [--mixed]: use diff-based reset whether or not pathspec was given

167 - + reset: allow reset on unborn branch

168 - + reset $sha1 $pathspec: require $sha1 only to be treeish

169 - + reset.c: inline update_index_refresh()

170 - + reset.c: finish entire cmd_reset() whether or not pathspec is given

171 - + reset [--mixed]: only write index file once

172 - + reset.c: move lock, write and commit out of update_index_refresh()

173 - + reset.c: move update_index_refresh() call out of read_from_tree()

174 - + reset.c: replace switch by if-else

175 - + reset: avoid redundant error message

176 - + reset --keep: only write index file once

177 - + reset.c: share call to die_if_unmerged_cache()

178 - + reset.c: extract function for updating {ORIG_,}HEAD

179 - + reset.c: remove unnecessary variable 'i'

180 - + reset.c: extract function for parsing arguments

181 - + reset: don't allow "git reset -- $pathspec" in bare repo

182 - + reset.c: pass pathspec around instead of (prefix, argv) pair

183 - + reset $pathspec: exit with code 0 if successful

184 - + reset $pathspec: no need to discard index

130 + Various git-cvsserver updates.

131

186 - Various 'reset' optimizations and clean-ups, followed by a change

187 - to allow "git reset" to work even on an unborn branch.

132

133 +* nd/retire-fnmatch (2013-01-01) 7 commits

134 + (merged to 'next' on 2013-01-07 at ab31f9b)

135 + + Makefile: add USE_WILDMATCH to use wildmatch as fnmatch

136 + + wildmatch: advance faster in <asterisk> + <literal> patterns

137 + + wildmatch: make a special case for "*/" with FNM_PATHNAME

138 + + test-wildmatch: add "perf" command to compare wildmatch and fnmatch

139 + + wildmatch: support "no FNM_PATHNAME" mode

140 + + wildmatch: make dowild() take arbitrary flags

141 + + wildmatch: rename constants and update prototype

142

190 -* nd/attr-debug-fix (2013-01-15) 1 commit

191 - (merged to 'next' on 2013-01-15 at 8460acf)

192 - + attr: make it build with DEBUG_ATTR again

143 + Replace our use of fnmatch(3) with a more feature-rich wildmatch.

144 + A handful patches at the bottom have been moved to nd/wildmatch to

145 + graduate as part of that branch, before this series solidifies.

146

194 - Fix debugging support that was broken in earlier change.

147

148 +* rs/clarify-entry-cmp-sslice (2013-01-16) 1 commit

149 + (merged to 'next' on 2013-01-18 at d584dc6)

150 + + refs: use strncmp() instead of strlen() and memcmp()

151

197 -* nd/clone-no-separate-git-dir-with-bare (2013-01-10) 1 commit

198 - (merged to 'next' on 2013-01-15 at 64f441a)

199 - + clone: forbid --bare --separate-git-dir <dir>

152 +--------------------------------------------------

153 +[New Topics]

154

201 - Forbid a useless combination of options to "git clone".

155 +* jc/push-reject-reasons (2013-01-24) 4 commits

156 + - push: finishing touches to explain REJECT_ALREADY_EXISTS better

157 + - push: introduce REJECT_FETCH_FIRST and REJECT_NEEDS_FORCE

158 + - push: further simplify the logic to assign rejection reason

159 + - push: further clean up fields of "struct ref"

160

161 + Improve error and advice messages given locally when "git push"

162 + refuses when it cannot compute fast-forwardness by separating these

163 + cases from the normal "not a fast-forward; merge first and push

164 + again" case.

165

204 -* nd/fix-directory-attrs-off-by-one (2013-01-16) 2 commits

205 - (merged to 'next' on 2013-01-16 at bd63e61)

206 - + attr: avoid calling find_basename() twice per path

207 - (merged to 'next' on 2013-01-15 at e0a0129)

208 - + attr: fix off-by-one directory component length calculation

166 + Will merge to 'next'.

167

210 - Fix performance regression introduced by an earlier change to let

211 - attributes apply to directories.

168

169 +* as/test-cleanup (2013-01-24) 1 commit

170 + - t7102 (reset): don't hardcode SHA-1 in expected outputs

171

214 -* nd/fix-perf-parameters-in-tests (2013-01-15) 1 commit

215 - (merged to 'next' on 2013-01-15 at fedbdb9)

216 - + test-lib.sh: unfilter GIT_PERF_*

172 + Will merge to 'next'.

173

218 - Allow GIT_PERF_* environment variables to be passed through the

219 - test framework.

174

175 +* jc/do-not-let-random-file-interfere-with-completion-tests (2013-01-24) 1 commit

176 + - t9902: protect test from stray build artifacts

177

222 -* pe/doc-email-env-is-trumped-by-config (2013-01-10) 1 commit

223 - (merged to 'next' on 2013-01-14 at 6b4d555)

224 - + git-commit-tree(1): correct description of defaults

178 + Scripts to test bash completion was inherently flaky as it was

179 + affected by whatever random things the user may have on $PATH.

180

226 - In the precedence order, the environment variable $EMAIL comes

227 - between the built-in default (i.e. taking value by asking the

228 - system's gethostname() etc.) and the user.email configuration

229 - variable; the documentation implied that it is stronger than the

230 - configuration like $GIT_COMMITTER_EMAIL is, which is wrong.

181 + Will merge to 'next'.

182

183

233 -* ph/rebase-preserve-all-merges (2013-01-14) 1 commit

234 - (merged to 'next' on 2013-01-15 at 3a67878)

235 - + rebase --preserve-merges: keep all merge commits including empty ones

184 +* jk/cvsimport-does-not-work-with-cvsps3 (2013-01-24) 1 commit

185 + - git-cvsimport.txt: cvsps-2 is deprecated

186

237 - An earlier change to add --keep-empty option broke "git rebase

238 - --preserve-merges" and lost merge commits that end up being the

239 - same as its parent.

187 + Warn people that other tools are more recommendable over

188 + cvsimport+cvsps2 combo when doing a one-shot import, and cvsimport

189 + will not work with cvsps3.

190

191 + Will merge to 'next'.

192

242 -* pw/p4-branch-fixes (2013-01-15) 14 commits

243 - (merged to 'next' on 2013-01-15 at 1ee379e)

244 - + git p4: fix submit when no master branch

245 - + git p4 test: keep P4CLIENT changes inside subshells

246 - + git p4: fix sync --branch when no master branch

247 - + git p4: fail gracefully on sync with no master branch

248 - + git p4: rearrange self.initialParent use

249 - + git p4: allow short ref names to --branch

250 - + git p4 doc: fix branch detection example

251 - + git p4: clone --branch should checkout master

252 - + git p4: verify expected refs in clone --bare test

253 - + git p4: create p4/HEAD on initial clone

254 - + git p4: inline listExistingP4GitBranches

255 - + git p4: add comments to p4BranchesInGit

256 - + git p4: rearrange and simplify hasOrigin handling

257 - + git p4: test sync/clone --branch behavior

193

259 - Fix "git p4" around branch handling.

194 +* jk/mergetool (2013-01-25) 6 commits

195 + - mergetool--lib: Improve show_tool_help() output

196 + - mergetools/vim: Remove redundant diff command

197 + - git-difftool: use git-mergetool--lib for "--tool-help"

198 + - git-mergetool: don't hardcode 'mergetool' in show_tool_help

199 + - git-mergetool: remove redundant assignment

200 + - git-mergetool: move show_tool_help to mergetool--lib

201

202 + Cleans up mergetool/difftool combo.

203

262 -* rs/pretty-use-prefixcmp (2013-01-14) 1 commit

263 - (merged to 'next' on 2013-01-15 at d76452d)

264 - + pretty: use prefixcmp instead of memcmp on NUL-terminated strings

204 + It seems John Keeping has some more updates but the version posted

205 + breaks the tests rather badly.

206

207 + Expecting some follow-ups.

208

267 -* rt/commit-cleanup-config (2013-01-10) 1 commit

268 - (merged to 'next' on 2013-01-15 at c4742ae)

269 - + commit: make default of "cleanup" option configurable

209

271 - Add a configuration variable to set default clean-up mode other

272 - than "strip".

210 +* jn/do-not-drop-username-when-reading-from-etc-mailname (2013-01-25) 1 commit

211 + - ident: do not drop username when reading from /etc/mailname

212

213 + We used to stuff "user@" and then append what we read from

214 + /etc/mailname to come up with a default e-mail ident, but a bug

215 + lost the "user@" part. This is to fix it.

216

275 -* ss/help-htmlpath-config-doc (2013-01-15) 1 commit

276 - (merged to 'next' on 2013-01-17 at 99bfae2)

277 - + config.txt: Document help.htmlpath config parameter

217 + Will merge to 'next'.

218

279 - Add missing doc.

219

220 +* mm/add-u-A-sans-pathspec (2013-01-25) 1 commit

221 + - add: warn when -u or -A is used without pathspec

222

282 -* zk/clean-report-failure (2013-01-14) 1 commit

283 - (merged to 'next' on 2013-01-15 at 5b31614)

284 - + git-clean: Display more accurate delete messages

223 + Forbid "git add -u" and "git add -A" without pathspec run from a

224 + subdirectory, to train people to type "." (or ":/") to make the

225 + choice of default does not matter.

226

286 - "git clean" states what it is going to remove and then goes on to

287 - remove it, but sometimes it only discovers things that cannot be

288 - removed after recursing into a directory, which makes the output

289 - confusing and even wrong.

227 + Will merge to 'next'.

228

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

230 [Stalled]

@@ -396,64 +334,125 @@ repositories listed at

334 "The first remote becomes the default" bit is better done as a

335 separate step.

336

337 +

338 +* nd/parse-pathspec (2013-01-11) 20 commits

339 + . Convert more init_pathspec() to parse_pathspec()

340 + . Convert add_files_to_cache to take struct pathspec

341 + . Convert {read,fill}_directory to take struct pathspec

342 + . Convert refresh_index to take struct pathspec

343 + . Convert report_path_error to take struct pathspec

344 + . checkout: convert read_tree_some to take struct pathspec

345 + . Convert unmerge_cache to take struct pathspec

346 + . Convert read_cache_preload() to take struct pathspec

347 + . add: convert to use parse_pathspec

348 + . archive: convert to use parse_pathspec

349 + . ls-files: convert to use parse_pathspec

350 + . rm: convert to use parse_pathspec

351 + . checkout: convert to use parse_pathspec

352 + . rerere: convert to use parse_pathspec

353 + . status: convert to use parse_pathspec

354 + . commit: convert to use parse_pathspec

355 + . clean: convert to use parse_pathspec

356 + . Export parse_pathspec() and convert some get_pathspec() calls

357 + . Add parse_pathspec() that converts cmdline args to struct pathspec

358 + . pathspec: save the non-wildcard length part

359 +

360 + Uses the parsed pathspec structure in more places where we used to

361 + use the raw "array of strings" pathspec.

362 +

363 + Ejected from 'pu' for now; will take a look at the rerolled one

364 + later ($gmane/213340).

365 +

366 --------------------------------------------------

367 [Cooking]

368

402 -* mh/imap-send-shrinkage (2013-01-15) 14 commits

403 - (merged to 'next' on 2013-01-18 at 1b7c5ba)

404 - + imap-send.c: simplify logic in lf_to_crlf()

405 - + imap-send.c: fold struct store into struct imap_store

406 - + imap-send.c: remove unused field imap_store::uidvalidity

407 - + imap-send.c: use struct imap_store instead of struct store

408 - + imap-send.c: remove unused field imap_store::trashnc

409 - + imap-send.c: remove namespace fields from struct imap

410 - + imap-send.c: remove struct imap argument to parse_imap_list_l()

411 - + imap-send.c: inline parse_imap_list() in parse_list()

412 - + imap-send.c: remove some unused fields from struct store

413 - + imap-send.c: remove struct message

414 - + imap-send.c: remove struct store_conf

415 - + iamp-send.c: remove unused struct imap_store_conf

416 - + imap-send.c: remove struct msg_data

417 - + imap-send.c: remove msg_data::flags, which was always zero

369 +* bc/fix-array-syntax-for-3.0-in-completion-bash (2013-01-18) 1 commit

370 + (merged to 'next' on 2013-01-25 at d113c1a)

371 + + git-completion.bash: replace zsh notation that breaks bash 3.X

372

419 - Remove a lot of unused code from "git imap-send".

373 + Fix use of an array notation that older versions of bash do not

374 + understand.

375

421 - Will merge to 'master'.

376

377 +* jc/help (2013-01-18) 1 commit

378 + (merged to 'next' on 2013-01-25 at b2b087e)

379 + + help: include <common-cmds.h> only in one file

380

424 -* cr/push-force-tag-update (2013-01-21) 4 commits

425 - - push: further simplify the logic to assign rejection status

426 - - push: introduce REJECT_FETCH_FIRST and REJECT_NEEDS_FORCE

427 - - push: further clean up fields of "struct ref"

428 - (merged to 'next' on 2013-01-18 at c9091d5)

429 - + push: fix "refs/tags/ hierarchy cannot be updated without --force"

381 + A header file that has the definition of a static array was

382 + included in two places, wasting the space.

383

431 - Regression fix (the bottom one), and error/advice message

432 - improvements (the rest).

384

434 - Will merge to 'master' the bottom one soonish.

435 - The remainder can cook in 'next' like any other topic.

385 +* jc/hidden-refs (2013-01-18) 2 commits

386 + - upload-pack: allow hiding ref hiearchies

387 + - upload-pack: share more code

388

389 + Allow the server side to unclutter the refs/ namespace it shows by

390 + default, while still allowing requests for histories leading to the

391 + tips of hidden refs by updated clients (which are not written yet).

392

438 -* jk/suppress-clang-warning (2013-01-16) 1 commit

439 - (merged to 'next' on 2013-01-18 at 7c0bda7)

440 - + fix clang -Wunused-value warnings for error functions

393

442 - Will merge to 'master'.

394 +* jk/update-install-for-p4 (2013-01-20) 1 commit

395 + - INSTALL: git-p4 doesn't support Python 3

396

397 + Will merge to 'next'.

398

445 -* rs/clarify-entry-cmp-sslice (2013-01-16) 1 commit

446 - (merged to 'next' on 2013-01-18 at d584dc6)

447 - + refs: use strncmp() instead of strlen() and memcmp()

399

449 - Will merge to 'master'.

400 +* tb/t0050-maint (2013-01-21) 3 commits

401 + (merged to 'next' on 2013-01-25 at 682b1e2)

402 + + t0050: Use TAB for indentation

403 + + t0050: honor CASE_INSENSITIVE_FS in add (with different case)

404 + + t0050: known breakage vanished in merge (case change)

405

406 + Update tests that were expecting to fail due to a bug that was

407 + fixed earlier.

408

452 -* ch/add-auto-submitted-in-sample-post-receive-email (2013-01-17) 1 commit

453 - (merged to 'next' on 2013-01-18 at e3205db)

454 - + Add Auto-Submitted header to post-receive-email

409

456 - Will merge to 'master'.

410 +* nd/magic-pathspec-from-root (2013-01-21) 2 commits

411 + (merged to 'next' on 2013-01-25 at b056b57)

412 + + grep: avoid accepting ambiguous revision

413 + + Update :/abc ambiguity check

414 +

415 + When giving arguments without "--" disambiguation, object names

416 + that come earlier on the command line must not be interpretable as

417 + pathspecs and pathspecs that come later on the command line must

418 + not be interpretable as object names. Tweak the disambiguation

419 + rule so that ":/" (no other string before or after) is always

420 + interpreted as a pathspec, to avoid having to say "git cmd -- :/".

421 +

422 +

423 +* ta/doc-no-small-caps (2013-01-22) 10 commits

424 + - fixup! Change 'git' to 'Git' whenever the whole system is referred to #4

425 + - Change 'git' to 'Git' whenever the whole system is referred to #4

426 + - fixup! Change 'git' to 'Git' whenever the whole system is referred to #3

427 + - Change 'git' to 'Git' whenever the whole system is referred to #3

428 + - fixup! Change 'git' to 'Git' whenever the whole system is referred to #2

429 + - Change 'git' to 'Git' whenever the whole system is referred to #2

430 + - fixup! fixup! Change 'git' to 'Git' whenever the whole system is referred to #1

431 + - fixup! Change 'git' to 'Git' whenever the whole system is referred to #1

432 + - Change 'git' to 'Git' whenever the whole system is referred to #1

433 + - Documentation: avoid poor-man's small caps

434 +

435 + Update documentation to change "GIT" which was a poor-man's small

436 + caps to "Git" which was the intended spelling. Also change "git"

437 + spelled in all-lowercase to "Git" when it refers to the system as

438 + the whole or the concept it embodies, as opposed to the command the

439 + end users would type.

440 +

441 + Will wait for a week or so (say, til end of January) for Thomas to

442 + collect fix-ups, squash the result into two patches and then merge

443 + to 'next'.

444 +

445 +

446 +* rr/minimal-stat (2013-01-22) 1 commit

447 + (merged to 'next' on 2013-01-25 at 11c4453)

448 + + Enable minimal stat checking

449 +

450 + Some reimplementations of Git does not write all the stat info back

451 + to the index due to their implementation limitations (e.g. jgit

452 + running on Java). A configuration option can tell Git to ignore

453 + changes to most of the stat fields and only pay attention to mtime

454 + and size, which these implementations can reliably update. This

455 + avoids excessive revalidation of contents.

456

457

458 * jc/remove-treesame-parent-in-simplify-merges (2013-01-17) 1 commit

@@ -467,80 +466,47 @@ repositories listed at

466 infrastructure, it is appreciated to have an extra set of eyes for

467 sanity check.

468

470 - Waiting for comments.

469 + Waiting for reviews and comments.

470

471

473 -* jk/remote-helpers-in-python-3 (2013-01-20) 8 commits

474 - - git-remote-testpy: call print as a function

475 - - git-remote-testpy: don't do unbuffered text I/O

476 - - git-remote-testpy: hash bytes explicitly

477 - - svn-fe: allow svnrdump_sim.py to run with Python 3

478 - - git_remote_helpers: use 2to3 if building with Python 3

479 - - git_remote_helpers: force rebuild if python version changes

480 - - git_remote_helpers: fix input when running under Python 3

481 - - git_remote_helpers: allow building with Python 3

472 +* jk/remote-helpers-in-python-3 (2013-01-24) 8 commits

473 + (merged to 'next' on 2013-01-25 at acf9419)

474 + + git-remote-testpy: call print as a function

475 + + git-remote-testpy: don't do unbuffered text I/O

476 + + git-remote-testpy: hash bytes explicitly

477 + + svn-fe: allow svnrdump_sim.py to run with Python 3

478 + + git_remote_helpers: use 2to3 if building with Python 3

479 + + git_remote_helpers: force rebuild if python version changes

480 + + git_remote_helpers: fix input when running under Python 3

481 + + git_remote_helpers: allow building with Python 3

482

483 Prepare remote-helper test written in Python to be run with Python3.

484

485 - Will merge to 'next'.

486 -

487 -

488 -* jc/cvsimport-upgrade (2013-01-14) 8 commits

489 - - t9600: adjust for new cvsimport

490 - - t9600: further prepare for sharing

491 - - cvsimport-3: add a sample test

492 - - cvsimport: make tests reusable for cvsimport-3

493 - - cvsimport: start adding cvsps 3.x support

494 - - cvsimport: introduce a version-switch wrapper

495 - - cvsimport: allow setting a custom cvsps (2.x) program name

496 - - Makefile: add description on PERL/PYTHON_PATH

497 -

498 - The most important part of this series is the addition of the new

499 - cvsimport by Eric Raymond that works with cvsps 3.x. Given some

500 - distros have inertia to be conservative, Git with cvsimport that

501 - does not work with both 3.x will block adoption of cvsps 3.x by

502 - them, and shipping Git with cvsimport that does not work with cvsps

503 - 2.x will block such a version of Git, so we'll do the proven "both

504 - old and new are available, but we aim to deprecate and remove the

505 - old one in due time" strategy that we used successfully in the

506 - past.

507 -

508 - Will merge to 'next'.

509 -

510 -

511 -* as/pre-push-hook (2013-01-18) 3 commits

512 - (merged to 'next' on 2013-01-18 at 37fc4e8)

513 - + Add sample pre-push hook script

514 - + push: Add support for pre-push hooks

515 - + hooks: Add function to check if a hook exists

516 -

517 - Add an extra hook so that "git push" that is run without making

518 - sure what is being pushed is sane can be checked and rejected (as

519 - opposed to the user deciding not pushing).

520 -

521 - Will merge to 'master'.

522 -

485

486 * dl/am-hg-locale (2013-01-18) 1 commit

525 - - am: invoke perl's strftime in C locale

487 + (merged to 'next' on 2013-01-25 at 3419019)

488 + + am: invoke perl's strftime in C locale

489

490 Datestamp recorded in "Hg" format patch was reformatted incorrectly

491 to an e-mail looking date using locale dependant strftime, causing

492 patch application to fail.

493

531 - Will merge to 'next'.

532 -

494

534 -* jk/config-parsing-cleanup (2013-01-14) 7 commits

535 - - [DONTMERGE] reroll coming

495 +* jk/config-parsing-cleanup (2013-01-23) 8 commits

496 + - reflog: use parse_config_key in config callback

497 + - help: use parse_config_key for man config

498 - submodule: simplify memory handling in config parsing

537 - - submodule: use match_config_key when parsing config

499 + - submodule: use parse_config_key when parsing config

500 - userdiff: drop parse_driver function

539 - - convert some config callbacks to match_config_key

540 - - archive-tar: use match_config_key when parsing config

501 + - convert some config callbacks to parse_config_key

502 + - archive-tar: use parse_config_key when parsing config

503 - config: add helper function for parsing key names

504

543 - Expecting a reroll.

505 + Configuration parsing for tar.* configuration variables were

506 + broken. Introduce a new config-keyname parser API to make the

507 + callers much less error prone.

508 +

509 + Will merge to 'next'.

510

511

512 * mp/diff-algo-config (2013-01-16) 3 commits

@@ -554,21 +520,12 @@ repositories listed at

520 Looking better; may want tests to protect it from future breakages,

521 but otherwise it looks ready for 'next'.

522

557 - Waiting for a follow-up to add tests.

558 -

559 -

560 -* rs/archive-tar-config-parsing-fix (2013-01-14) 1 commit

561 - - archive-tar: fix sanity check in config parsing

562 -

563 - Configuration parsing for tar.* configuration variables were

564 - broken; Peff's config parsing clean-up topic will address the same

565 - breakage, so this may be superseded by that other topic.

566 -

567 - Waiting for the other topic to make this unneeded.

523 + Expecting a follow-up to add tests.

524

525

526 * jc/custom-comment-char (2013-01-16) 1 commit

571 - - Allow custom "comment char"

527 + (merged to 'next' on 2013-01-25 at 91d8a5d)

528 + + Allow custom "comment char"

529

530 An illustration to show codepaths that need to be touched to change

531 the hint lines in the edited text to begin with something other

@@ -582,8 +539,6 @@ repositories listed at

539

540 I don't know how useful this will be in real life, though.

541

585 - Will merge to 'next'.

586 -

542

543 * nd/fetch-depth-is-broken (2013-01-11) 3 commits

544 (merged to 'next' on 2013-01-15 at 70a5ca7)

@@ -647,115 +602,6 @@ repositories listed at

602 Will cook in 'next' until Git 2.0 ;-).

603

604

650 -* nd/parse-pathspec (2013-01-11) 20 commits

651 - . Convert more init_pathspec() to parse_pathspec()

652 - . Convert add_files_to_cache to take struct pathspec

653 - . Convert {read,fill}_directory to take struct pathspec

654 - . Convert refresh_index to take struct pathspec

655 - . Convert report_path_error to take struct pathspec

656 - . checkout: convert read_tree_some to take struct pathspec

657 - . Convert unmerge_cache to take struct pathspec

658 - . Convert read_cache_preload() to take struct pathspec

659 - . add: convert to use parse_pathspec

660 - . archive: convert to use parse_pathspec

661 - . ls-files: convert to use parse_pathspec

662 - . rm: convert to use parse_pathspec

663 - . checkout: convert to use parse_pathspec

664 - . rerere: convert to use parse_pathspec

665 - . status: convert to use parse_pathspec

666 - . commit: convert to use parse_pathspec

667 - . clean: convert to use parse_pathspec

668 - . Export parse_pathspec() and convert some get_pathspec() calls

669 - . Add parse_pathspec() that converts cmdline args to struct pathspec

670 - . pathspec: save the non-wildcard length part

671 -

672 - Uses the parsed pathspec structure in more places where we used to

673 - use the raw "array of strings" pathspec.

674 -

675 - Ejected from 'pu' for now; will take a look at the rerolled one

676 - later ($gmane/213340).

677 -

678 -

679 -* jc/doc-maintainer (2013-01-03) 2 commits

680 - (merged to 'next' on 2013-01-11 at f35d582)

681 - + howto/maintain: mark titles for asciidoc

682 - + Documentation: update "howto maintain git"

683 -

684 - Describe tools for automation that were invented since this

685 - document was originally written.

686 -

687 -

688 -* mo/cvs-server-updates (2012-12-09) 18 commits

689 - (merged to 'next' on 2013-01-08 at 75e2d11)

690 - + t9402: Use TABs for indentation

691 - + t9402: Rename check.cvsCount and check.list

692 - + t9402: Simplify git ls-tree

693 - + t9402: Add missing &&; Code style

694 - + t9402: No space after IO-redirection

695 - + t9402: Dont use test_must_fail cvs

696 - + t9402: improve check_end_tree() and check_end_full_tree()

697 - + t9402: sed -i is not portable

698 - + cvsserver Documentation: new cvs ... -r support

699 - + cvsserver: add t9402 to test branch and tag refs

700 - + cvsserver: support -r and sticky tags for most operations

701 - + cvsserver: Add version awareness to argsfromdir

702 - + cvsserver: generalize getmeta() to recognize commit refs

703 - + cvsserver: implement req_Sticky and related utilities

704 - + cvsserver: add misc commit lookup, file meta data, and file listing functions

705 - + cvsserver: define a tag name character escape mechanism

706 - + cvsserver: cleanup extra slashes in filename arguments

707 - + cvsserver: factor out git-log parsing logic

708 -

709 - Various git-cvsserver updates.

710 -

711 - Will merge to 'master'.

712 -

713 -

714 -* as/check-ignore (2013-01-16) 13 commits

715 - (merged to 'next' on 2013-01-18 at ef45aff)

716 - + clean.c, ls-files.c: respect encapsulation of exclude_list_groups

717 - (merged to 'next' on 2013-01-14 at 9df2afc)

718 - + t0008: avoid brace expansion

719 - + add git-check-ignore sub-command

720 - + setup.c: document get_pathspec()

721 - + add.c: extract new die_if_path_beyond_symlink() for reuse

722 - + add.c: extract check_path_for_gitlink() from treat_gitlinks() for reuse

723 - + pathspec.c: rename newly public functions for clarity

724 - + add.c: move pathspec matchers into new pathspec.c for reuse

725 - + add.c: remove unused argument from validate_pathspec()

726 - + dir.c: improve docs for match_pathspec() and match_pathspec_depth()

727 - + dir.c: provide clear_directory() for reclaiming dir_struct memory

728 - + dir.c: keep track of where patterns came from

729 - + dir.c: use a single struct exclude_list per source of excludes

730 -

731 - Add a new command "git check-ignore" for debugging .gitignore

732 - files.

733 -

734 - The variable names may want to get cleaned up but that can be done

735 - in-tree.

736 -

737 - Will merge to 'master'.

738 -

739 -

740 -* nd/retire-fnmatch (2013-01-01) 7 commits

741 - (merged to 'next' on 2013-01-07 at ab31f9b)

742 - + Makefile: add USE_WILDMATCH to use wildmatch as fnmatch

743 - + wildmatch: advance faster in <asterisk> + <literal> patterns

744 - + wildmatch: make a special case for "*/" with FNM_PATHNAME

745 - + test-wildmatch: add "perf" command to compare wildmatch and fnmatch

746 - + wildmatch: support "no FNM_PATHNAME" mode

747 - + wildmatch: make dowild() take arbitrary flags

748 - + wildmatch: rename constants and update prototype

749 -

750 - Originally merged to 'next' on 2013-01-04

751 -

752 - Replace our use of fnmatch(3) with a more feature-rich wildmatch.

753 - A handful patches at the bottom have been moved to nd/wildmatch to

754 - graduate as part of that branch, before this series solidifies.

755 -

756 - Will merge to 'master'.

757 -

758 -

605 * mb/gitweb-highlight-link-target (2012-12-20) 1 commit

606 - Highlight the link target line in Gitweb using CSS

607

@@ -777,7 +623,8 @@ repositories listed at

623

624 Rerolled.

625

780 - Seems that we will see another round.

626 + Expecting another reroll.

627 + $gmane/214231

628

629 --------------------------------------------------

630 [Discarded]

@@ -799,3 +646,27 @@ repositories listed at

646

647 Squelch false positive in valgrind tests; made unnecessary by

648 rewriting the callsite that confuses the tool.

649 +

650 +

651 +* rs/archive-tar-config-parsing-fix (2013-01-14) 1 commit

652 + . archive-tar: fix sanity check in config parsing

653 +

654 + jk/config-parsing-cleanup made this topic unneeded.

655 +

656 +

657 +* jc/cvsimport-upgrade (2013-01-14) 8 commits

658 + - t9600: adjust for new cvsimport

659 + - t9600: further prepare for sharing

660 + - cvsimport-3: add a sample test

661 + - cvsimport: make tests reusable for cvsimport-3

662 + - cvsimport: start adding cvsps 3.x support

663 + - cvsimport: introduce a version-switch wrapper

664 + - cvsimport: allow setting a custom cvsps (2.x) program name

665 + - Makefile: add description on PERL/PYTHON_PATH

666 +

667 + People involved in cvsimport-3 say that the combination of it and

668 + cvsps3 does not work with incremental import all that well. For

669 + now, let's discard this and replace it with a documeentation update

670 + that says "cvsimport will not work if you do not have cvsps2".

671 +

672 + Will discard.

What's cooking (2013/01 #09)