4c6ef1d032 · matheusbsbs/matheus-bagliano

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

1 To: git@vger.kernel.org

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

3 -X-master-at: 03276d94bcdb7d463a029936933898948c0669ac

4 -X-next-at: ec7d70969ee62009146d3636340c5e7023f24ff9

2 +Subject: What's cooking in git.git (Nov 2010, #03; Wed, 24)

3 +X-master-at: 7d43de925b2771d295d8fc4341b7bd544e2a74fa

4 +X-next-at: 03864edeab230c99aac705ab795ed9e8b63cc7d3

5

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

6 +What's cooking in git.git (Nov 2010, #03; Wed, 24)

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

8

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

@@ -12,208 +12,157 @@ 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"]

15 +[New Topics]

16

17 -* ak/submodule-sync (2010-10-08) 1 commit

18 - (merged to 'next' on 2010-11-05 at 5a2f940)

19 - + submodule sync: Update "submodule.<name>.url" for empty directories

20 -

21 -* bg/maint-gitweb-test-lib (2010-10-20) 1 commit

22 - (merged to 'next' on 2010-11-05 at 0ead869)

23 - + t/gitweb-lib: Don't pass constant to decode_utf8

24 -

25 -* cb/diff-fname-optim (2010-09-26) 3 commits

26 - (merged to 'next' on 2010-11-05 at b3b09f3)

27 - + diff: avoid repeated scanning while looking for funcname

28 - + do not search functions for patch ID

29 - + add rebase patch id tests

30 -

31 -* dk/maint-blame-el (2010-05-25) 1 commit

32 - (merged to 'next' on 2010-11-05 at 8456c66)

33 - + git-blame.el: Add (require 'format-spec)

34 -

35 -* jk/maint-apply-no-binary (2010-10-18) 1 commit

36 - (merged to 'next' on 2010-11-05 at 8b7543a)

37 - + apply: don't segfault on binary files with missing data

38 -

39 -* jk/maint-rev-list-nul (2010-10-07) 1 commit

40 - (merged to 'next' on 2010-11-05 at 406cba1)

41 - + rev-list: handle %x00 NUL in user format

42 -

43 -* jk/missing-config (2010-10-21) 1 commit

44 - (merged to 'next' on 2010-11-05 at 31fda69)

45 - + config: treat non-existent config files as empty

46 -

47 -* jk/no-textconv-symlink (2010-09-21) 1 commit

48 - (merged to 'next' on 2010-11-05 at 0a99e75)

49 - + diff: don't use pathname-based diff drivers for symlinks

50 - (this branch is used by ks/no-textconv-symlink.)

51 -

52 -* jk/push-progress (2010-10-17) 8 commits

53 - (merged to 'next' on 2010-11-05 at 9207c6d)

54 - + push: pass --progress down to git-pack-objects

55 - + t5523-push-upstream: test progress messages

56 - + t5523-push-upstream: add function to ensure fresh upstream repo

57 - + test_terminal: ensure redirections work reliably

58 - + test_terminal: catch use without TTY prerequisite

59 - + test-lib: allow test code to check the list of declared prerequisites

60 - + tests: test terminal output to both stdout and stderr

61 - + tests: factor out terminal handling from t7006

62 -

63 -* jl/maint-pull-tags-doc (2010-11-03) 1 commit

64 - (merged to 'next' on 2010-11-05 at 861d16a)

65 - + pull: Remove --tags option from manpage

66 -

67 -* jm/mailmap (2010-10-19) 3 commits

68 - (merged to 'next' on 2010-11-05 at ef1e754)

69 - + t4203: do not let "git shortlog" DWIM based on tty

70 - + t4203 (mailmap): stop hardcoding commit ids and dates

71 - + mailmap: fix use of freed memory

72 -

73 -* jn/gitweb-test (2010-09-26) 4 commits

74 - (merged to 'next' on 2010-11-05 at 90b3adf)

75 - + gitweb/Makefile: Include gitweb/config.mak

76 - + gitweb/Makefile: Add 'test' and 'test-installed' targets

77 - + t/gitweb-lib.sh: Add support for GITWEB_TEST_INSTALLED

78 - + gitweb: Move call to evaluate_git_version after evaluate_gitweb_config

79 - (this branch is used by jh/gitweb-caching.)

80 -

81 -* jn/send-pack-error (2010-10-16) 1 commit

82 - (merged to 'next' on 2010-11-05 at ef559d4)

83 - + send-pack: avoid redundant "pack-objects died with strange error"

84 -

85 -* kb/completion-checkout (2010-10-12) 1 commit

86 - (merged to 'next' on 2010-11-05 at 6836d70)

87 - + completion: Support the DWIM mode for git checkout

88 -

89 -* kb/maint-diff-ws-check (2010-10-20) 2 commits

90 - (merged to 'next' on 2010-11-05 at 861b5ac)

91 - + diff: handle lines containing only whitespace and tabs better

92 - + test-lib: extend test_decode_color to handle more color codes

93 -

94 -* kb/maint-submodule-savearg (2010-11-02) 2 commits

95 - (merged to 'next' on 2010-11-05 at 10e1aeb)

96 - + submodule: only preserve flags across recursive status/update invocations

97 - + submodule: preserve all arguments exactly when recursing

98 -

99 -* ks/no-textconv-symlink (2010-09-29) 3 commits

100 - (merged to 'next' on 2010-11-05 at 32f0580)

101 - + blame,cat-file --textconv: Don't assume mode is ``S_IFREF | 0664''

102 - + blame,cat-file: Demonstrate --textconv is wrongly running converter on symlinks

103 - + blame,cat-file: Prepare --textconv tests for correctly-failing conversion program

104 - (this branch uses jk/no-textconv-symlink.)

105 -

106 -* mg/make-prove (2010-10-14) 1 commit

107 - (merged to 'next' on 2010-11-05 at ec4f806)

108 - + test: allow running the tests under "prove"

109 -

110 -* sg/bisect (2010-10-10) 3 commits

111 - (merged to 'next' on 2010-11-05 at 4a8b88d)

112 - + bisect: check for mandatory argument of 'bisect replay'

113 - + bisect: improve error msg of 'bisect reset' when original HEAD is deleted

114 - + bisect: improve error message of 'bisect log' while not bisecting

115 -

116 -* sg/completion (2010-10-11) 4 commits

117 - (merged to 'next' on 2010-11-05 at 4967932)

118 - + bash: support pretty format aliases

119 - + bash: support more 'git notes' subcommands and their options

120 - + bash: not all 'git bisect' subcommands make sense when not bisecting

121 - + bash: offer refs for 'git bisect start'

122 -

123 -* tr/maint-git-repack-tmpfile (2010-10-19) 1 commit

124 - (merged to 'next' on 2010-11-05 at 80ad03a)

125 - + repack: place temporary packs under .git/objects/pack/

126 -

127 -* tr/maint-merge-file-subdir (2010-10-17) 2 commits

128 - (merged to 'next' on 2010-11-05 at a2873a4)

129 - + merge-file: correctly find files when called in subdir

130 - + prefix_filename(): safely handle the case where pfx_len=0

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

18 + - win32: use our own dirent.h

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

20 + - win32: dirent: handle errors

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

22 + - msvc: opendir: allocate enough memory

23 + - msvc: opendir: fix malloc-failure

24 +

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

26 + - docs: default to more modern toolset

27 +

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

29 + - reflogs: clear flags properly in corner case

30 +

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

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

33 +

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

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

36 +

37 +* jn/maint-svn-fe (2010-10-10) 1 commit

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

39 +

40 +* jn/svn-fe (2010-11-19) 17 commits

41 + - vcs-svn: Implement Prop-delta handling

42 + - vcs-svn: Sharpen parsing of property lines

43 + - vcs-svn: Split off function for handling of individual properties

44 + - vcs-svn: Make source easier to read on small screens

45 + - vcs-svn: More dump format sanity checks

46 + - vcs-svn: Reject path nodes without Node-action

47 + - vcs-svn: Delay read of per-path properties

48 + - vcs-svn: Combine repo_replace and repo_modify functions

49 + - vcs-svn: Replace = Delete + Add

50 + - vcs-svn: handle_node: Handle deletion case early

51 + - vcs-svn: Use mark to indicate nodes with included text

52 + - vcs-svn: Unclutter handle_node by introducing have_props var

53 + - vcs-svn: Eliminate node_ctx.mark global

54 + - vcs-svn: Eliminate node_ctx.srcRev global

55 + - vcs-svn: Check for errors from open()

56 + - vcs-svn: Allow simple v3 dumps (no deltas yet)

57 + - vcs-svn: Error out for v3 dumps

58 +

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

60 +

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

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

63 +

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

65 + - rebase: support --verify

66 +

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

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

69 +

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

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

72 +

73 +* tc/http-urls-ends-with-slash (2010-11-22) 7 commits

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

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

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

77 + - http-backend: use end_url_with_slash()

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

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

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

81

82 --------------------------------------------------

133 -[New Topics]

83 +[Graduated to "master"]

84 +

85 +* ao/send-email-irt (2010-11-12) 2 commits

86 + (merged to 'next' on 2010-11-15 at 257c77a)

87 + + git-send-email.perl: make initial In-Reply-To apply only to first email

88 + (merged to 'next' on 2010-11-08 at d103166)

89 + + t9001: send-email interation with --in-reply-to and --chain-reply-to

90

91 * cb/maint-orphan-merge-noclobber (2010-11-14) 1 commit

92 (merged to 'next' on 2010-11-15 at 046c5e5)

93 + do not overwrite untracked during merge from unborn branch

94

139 -Will merge to master soonish.

140 -

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

142 - - git instaweb: enable remote_heads

143 - - gitweb: group remote heads by remote

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

145 - - gitweb: refactor repository URL printing

146 - - gitweb: remotes view for a single remote

147 - - gitweb: allow action specialization in page header

148 - - gitweb: nagivation menu for tags, heads and remotes

149 - - gitweb: separate heads and remotes lists

150 - - gitweb: git_get_heads_list accepts an optional list of refs

151 - - gitweb: introduce remote_heads feature

152 - - gitweb: use fullname as hash_base in heads link

153 -

154 -Acked by Jakub. Will merge to next.

155 -

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

157 - - Fix username and password extraction from HTTP URLs

158 - - t5550: test HTTP authentication and userinfo decoding

159 -

160 -Acked by Tay. Will merge to next.

161 -

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

163 - - log.decorate: accept 0/1 bool values

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

165 -

166 -Looked reasonable. Will merge to next.

167 -

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

169 - - allow command-specific pagers in pager.<cmd>

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

171 -

172 -Looked reasonable. Will merge to next.

173 -

174 -* jn/getenv-poison (2010-11-12) 1 commit

175 - . add GETENV_POISON option to simulate unfriendly getenv()

176 - (this branch uses ks/maint-getenv-fix.)

177 -

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

179 - - gitweb: Time::HiRes is in core for Perl 5.8

180 -

181 -Looked reasonable. Will merge to next.

182 -

183 -* jn/ignore-doc (2010-11-10) 2 commits

184 - - Documentation: point to related commands from gitignore

185 - - Documentation: split gitignore page into sections

186 -

187 -Looked reasonable. Will merge to next.

188 -

189 -* jn/thinner-wrapper (2010-11-06) 7 commits

190 - - Remove pack file handling dependency from wrapper.o

191 - - pack-objects: mark file-local variable static

192 - - wrapper: give zlib wrappers their own translation unit

193 - - strbuf: move strbuf_branchname to sha1_name.c

194 - - path helpers: move git_mkstemp* to wrapper.c

195 - - wrapper: move odb_* to environment.c

196 - - wrapper: move xmmap() to sha1_file.c

197 -

198 -Looked reasonable. Will merge to next.

199 -

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

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

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

203 -

204 -Looked reasonable. Will merge to next.

95 +* ef/mingw-daemon (2010-11-04) 16 commits

96 + (merged to 'next' on 2010-11-17 at 4a295c7)

97 + + daemon: opt-out on features that require posix

98 + + daemon: make --inetd and --detach incompatible

99 + + daemon: use socklen_t

100 + + mingw: use poll-emulation from gnulib

101 + + mingw: import poll-emulation from gnulib

102 + + daemon: get remote host address from root-process

103 + + Improve the mingw getaddrinfo stub to handle more use cases

104 + + daemon: use full buffered mode for stderr

105 + + daemon: use run-command api for async serving

106 + + mingw: add kill emulation

107 + + mingw: support waitpid with pid > 0 and WNOHANG

108 + + mingw: use real pid

109 + + inet_ntop: fix a couple of old-style decls

110 + + compat: add inet_pton and inet_ntop prototypes

111 + + mingw: implement syslog

112 + + mingw: add network-wrappers for daemon

113

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

207 - - get_sha1: support relative path ":path" syntax

208 - - Make prefix_path() return char* without const

209 - (this branch uses jn/parse-options-extra.)

114 +* en/and-cascade-tests (2010-10-31) 25 commits

115 + (merged to 'next' on 2010-11-15 at d51ec77)

116 + + t4124 (apply --whitespace): use test_might_fail

117 + + t3404: do not use 'describe' to implement test_cmp_rev

118 + + t3404 (rebase -i): introduce helper to check position of HEAD

119 + + t3404 (rebase -i): move comment to description

120 + + t3404 (rebase -i): unroll test_commit loops

121 + + t3301 (notes): use test_expect_code for clarity

122 + + t1400 (update-ref): use test_must_fail

123 + + t1502 (rev-parse --parseopt): test exit code from "-h"

124 + + t6022 (renaming merge): chain test commands with &&

125 + + test-lib: introduce test_line_count to measure files

126 + + tests: add missing &&, batch 2

127 + + tests: add missing &&

128 + + Introduce sane_unset and use it to ensure proper && chaining

129 + + t7800 (difftool): add missing &&

130 + + t7601 (merge-pull-config): add missing &&

131 + + t7001 (mv): add missing &&

132 + + t6016 (rev-list-graph-simplify-history): add missing &&

133 + + t5602 (clone-remote-exec): add missing &&

134 + + t4026 (color): remove unneeded and unchained command

135 + + t4019 (diff-wserror): add lots of missing &&

136 + + t4202 (log): Replace '<git-command> || :' with test_might_fail

137 + + t4002 (diff-basic): use test_might_fail for commands that might fail

138 + + t100[12] (read-tree-m-2way, read_tree_m_u_2way): add missing &&

139 + + t4017 (diff-retval): replace manual exit code check with test_expect_code

140 + + test-lib: make test_expect_code a test command

141 + (this branch is used by jn/git-cmd-h-bypass-setup.)

142

211 -Perhaps needs a documentation update.

143 +* jk/add-e-doc (2010-11-08) 2 commits

144 + (merged to 'next' on 2010-11-15 at e971401)

145 + + docs: give more hints about how "add -e" works

146 + (merged to 'next' on 2010-11-05 at 389fee7)

147 + + docs: give more hints about how "add -e" works

148

213 -* nd/maint-fix-add-typo-detection (2010-11-11) 1 commit

214 - - add: do not rely on dtype being NULL behavior

149 +* kb/maint-rebase-autosquash (2010-11-04) 2 commits

150 + (merged to 'next' on 2010-11-15 at 9b8c830)

151 + + rebase: teach --autosquash to match on sha1 in addition to message

152 + + rebase: better rearranging of fixup!/squash! lines with --autosquash

153

216 -Looked reasonable. Will merge to next.

154 +* mm/phrase-remote-tracking (2010-11-02) 10 commits

155 + (merged to 'next' on 2010-11-15 at 07d67f4)

156 + + git-branch.txt: mention --set-upstream as a way to change upstream configuration

157 + + user-manual: remote-tracking can be checked out, with detached HEAD

158 + + user-manual.txt: explain better the remote(-tracking) branch terms

159 + + Change incorrect "remote branch" to "remote tracking branch" in C code

160 + + Change incorrect uses of "remote branch" meaning "remote-tracking"

161 + + Change "tracking branch" to "remote-tracking branch"

162 + + everyday.txt: change "tracking branch" to "remote-tracking branch"

163 + + Change remote tracking to remote-tracking in non-trivial places

164 + + Replace "remote tracking" with "remote-tracking"

165 + + Better "Changed but not updated" message in git-status

166

167 * rs/opt-help-text (2010-11-08) 8 commits

168 (merged to 'next' on 2010-11-15 at 631c222)

@@ -226,8 +175,6 @@ Looked reasonable. Will merge to next.

175 + add description parameter to OPT__DRY_RUN

176 + add description parameter to OPT__VERBOSE

177

229 -Will merge to master soonish.

230 -

178 --------------------------------------------------

179 [Stalled]

180

@@ -258,15 +205,6 @@ flags needs to be rethought, or at least the helper needs to be moved to

205 builtin/tag.c to make it clear that it should not be used outside the

206 current usage context.

207

261 -* jh/gitweb-caching (2010-11-01) 4 commits

262 - . gitweb: Minimal testing of gitweb caching

263 - . gitweb: File based caching layer (from git.kernel.org)

264 - . gitweb: add output buffering and associated functions

265 - . gitweb: Prepare for splitting gitweb

266 -

267 -Temporarily ejected while I shuffled jn/gitweb-testing; will queue the

268 -latest back in pu or perhaps in next.

269 -

208 * tr/config-doc (2010-10-24) 2 commits

209 . Documentation: complete config list from other manpages

210 . Documentation: Move variables from config.txt to separate file

@@ -276,29 +214,81 @@ This unfortunately heavily conflicts with patches in flight...

214 --------------------------------------------------

215 [Cooking]

216

279 -* ef/mingw-daemon (2010-11-04) 16 commits

280 - (merged to 'next' on 2010-11-17 at 4a295c7)

281 - + daemon: opt-out on features that require posix

282 - + daemon: make --inetd and --detach incompatible

283 - + daemon: use socklen_t

284 - + mingw: use poll-emulation from gnulib

285 - + mingw: import poll-emulation from gnulib

286 - + daemon: get remote host address from root-process

287 - + Improve the mingw getaddrinfo stub to handle more use cases

288 - + daemon: use full buffered mode for stderr

289 - + daemon: use run-command api for async serving

290 - + mingw: add kill emulation

291 - + mingw: support waitpid with pid > 0 and WNOHANG

292 - + mingw: use real pid

293 - + inet_ntop: fix a couple of old-style decls

294 - + compat: add inet_pton and inet_ntop prototypes

295 - + mingw: implement syslog

296 - + mingw: add network-wrappers for daemon

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

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

219 + + git instaweb: enable remote_heads

220 + + gitweb: group remote heads by remote

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

222 + + gitweb: refactor repository URL printing

223 + + gitweb: remotes view for a single remote

224 + + gitweb: allow action specialization in page header

225 + + gitweb: nagivation menu for tags, heads and remotes

226 + + gitweb: separate heads and remotes lists

227 + + gitweb: git_get_heads_list accepts an optional list of refs

228 + + gitweb: introduce remote_heads feature

229 + + gitweb: use fullname as hash_base in heads link

230

298 -* jc/abbrev-guard (2010-10-28) 1 commit

299 - - core.abbrevguard: Ensure short object names stay unique a bit longer

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

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

233 + + Fix username and password extraction from HTTP URLs

234 + + t5550: test HTTP authentication and userinfo decoding

235 +

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

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

238 + + log.decorate: accept 0/1 bool values

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

240 +

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

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

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

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

245

301 -Will merge to next.

246 +* jn/getenv-poison (2010-11-12) 1 commit

247 + . add GETENV_POISON option to simulate unfriendly getenv()

248 + (this branch uses ks/maint-getenv-fix.)

249 +

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

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

252 + + gitweb: Time::HiRes is in core for Perl 5.8

253 +

254 +* jn/ignore-doc (2010-11-10) 2 commits

255 + (merged to 'next' on 2010-11-24 at c0a9730)

256 + + Documentation: point to related commands from gitignore

257 + + Documentation: split gitignore page into sections

258 +

259 +* jn/thinner-wrapper (2010-11-06) 7 commits

260 + (merged to 'next' on 2010-11-24 at 3f2227d)

261 + + Remove pack file handling dependency from wrapper.o

262 + + pack-objects: mark file-local variable static

263 + + wrapper: give zlib wrappers their own translation unit

264 + + strbuf: move strbuf_branchname to sha1_name.c

265 + + path helpers: move git_mkstemp* to wrapper.c

266 + + wrapper: move odb_* to environment.c

267 + + wrapper: move xmmap() to sha1_file.c

268 +

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

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

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

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

273 +

274 +* nd/extended-sha1-relpath (2010-11-11) 2 commits

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

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

277 + (this branch uses jn/parse-options-extra.)

278 +

279 +* nd/maint-fix-add-typo-detection (2010-11-11) 1 commit

280 + (merged to 'next' on 2010-11-24 at 6832306)

281 + + add: do not rely on dtype being NULL behavior

282 +

283 +* jh/gitweb-caching (2010-11-01) 4 commits

284 + - gitweb: Minimal testing of gitweb caching

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

286 + - gitweb: add output buffering and associated functions

287 + - gitweb: Prepare for splitting gitweb

288 +

289 +* jc/abbrev-guard (2010-10-28) 1 commit

290 + (merged to 'next' on 2010-11-24 at f26c943)

291 + + core.abbrevguard: Ensure short object names stay unique a bit longer

292

293 * jc/emfile (2010-10-28) 2 commits

294 (merged to 'next' on 2010-11-17 at dac1bc6)

@@ -307,12 +297,11 @@ Will merge to next.

297 (this branch is used by sp/emfile.)

298

299 * sp/emfile (2010-11-01) 2 commits

310 - - Work around EMFILE when there are too many pack files

311 - - Use git_open_noatime when accessing pack data

300 + (merged to 'next' on 2010-11-24 at f46d2ce)

301 + + Work around EMFILE when there are too many pack files

302 + + Use git_open_noatime when accessing pack data

303 (this branch uses jc/emfile.)

304

314 -Will merge to 'next', but might want to restructure the API a bit.

315 -

305 * jl/add-p-reverse-message (2010-10-27) 1 commit

306 (merged to 'next' on 2010-11-17 at db2ce14)

307 + Correct help blurb in checkout -p and friends

@@ -339,21 +328,6 @@ Wait for a reroll from Jonathan (2010-11-09).

328 + Interix: add configure checks

329 + add support for the SUA layer (interix; windows)

330

342 -* mm/phrase-remote-tracking (2010-11-02) 10 commits

343 - (merged to 'next' on 2010-11-15 at 07d67f4)

344 - + git-branch.txt: mention --set-upstream as a way to change upstream configuration

345 - + user-manual: remote-tracking can be checked out, with detached HEAD

346 - + user-manual.txt: explain better the remote(-tracking) branch terms

347 - + Change incorrect "remote branch" to "remote tracking branch" in C code

348 - + Change incorrect uses of "remote branch" meaning "remote-tracking"

349 - + Change "tracking branch" to "remote-tracking branch"

350 - + everyday.txt: change "tracking branch" to "remote-tracking branch"

351 - + Change remote tracking to remote-tracking in non-trivial places

352 - + Replace "remote tracking" with "remote-tracking"

353 - + Better "Changed but not updated" message in git-status

354 -

355 -Will merge to master soonish.

356 -

331 * nd/setup (2010-11-11) 47 commits

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

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

@@ -412,40 +386,22 @@ I have to queue a handful of fixups still in flight.

386 Will merge to master soonish.

387

388 * sn/diff-doc (2010-11-04) 3 commits

415 - - docs: clarify git diff modes of operation

416 - - diff,difftool: Don't use the {0,2} notation in usage strings

417 - - CodingGuidelines: Add a section on writing documentation

418 -

419 -Will merge to next.

420 -

421 -* kb/maint-rebase-autosquash (2010-11-04) 2 commits

422 - (merged to 'next' on 2010-11-15 at 9b8c830)

423 - + rebase: teach --autosquash to match on sha1 in addition to message

424 - + rebase: better rearranging of fixup!/squash! lines with --autosquash

425 -

426 -Will merge to master soonish.

389 + (merged to 'next' on 2010-11-24 at 77190a5)

390 + + docs: clarify git diff modes of operation

391 + + diff,difftool: Don't use the {0,2} notation in usage strings

392 + + CodingGuidelines: Add a section on writing documentation

393

394 * kb/maint-status-cquote (2010-11-08) 1 commit

429 - - status: Quote paths with spaces in short format

430 -

431 -Will merge to next.

395 + (merged to 'next' on 2010-11-24 at e15b73d)

396 + + status: Quote paths with spaces in short format

397

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

434 - - tag: recognize rfc1991 signatures

435 - - tag: factor out sig detection for tag display

436 - - tag: factor out sig detection for body edits

437 - - verify-tag: factor out signature detection

438 - - t/t7004-tag: test handling of rfc1991 signatures

439 -

440 -Will merge to next.

441 -

442 -* ao/send-email-irt (2010-11-12) 2 commits

443 - (merged to 'next' on 2010-11-15 at 257c77a)

444 - + git-send-email.perl: make initial In-Reply-To apply only to first email

445 - (merged to 'next' on 2010-11-08 at d103166)

446 - + t9001: send-email interation with --in-reply-to and --chain-reply-to

447 -

448 -Will merge to master soonish.

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

400 + + tag: recognize rfc1991 signatures

401 + + tag: factor out sig detection for tag display

402 + + tag: factor out sig detection for body edits

403 + + verify-tag: factor out signature detection

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

405

406 * cm/diff-check-at-eol (2010-10-10) 1 commit

407 (merged to 'next' on 2010-11-17 at ad7005a)

@@ -456,14 +412,6 @@ Will merge to master soonish.

412 + test: git-apply -p2 rename/chmod only

413 + Fix git-apply with -p greater than 1

414

459 -* jk/add-e-doc (2010-11-08) 2 commits

460 - (merged to 'next' on 2010-11-15 at e971401)

461 - + docs: give more hints about how "add -e" works

462 - (merged to 'next' on 2010-11-05 at 389fee7)

463 - + docs: give more hints about how "add -e" works

464 -

465 -Will merge to master soonish.

466 -

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

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

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

@@ -485,9 +433,6 @@ Will merge to master soonish.

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

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

435 - branch -h: show usage even in an invalid repository

488 - (this branch uses en/and-cascade-tests.)

489 -

490 -Will merge to next.

436

437 * kb/blame-author-email (2010-10-15) 1 commit

438 (merged to 'next' on 2010-11-17 at 6fd6a2f)

@@ -555,7 +500,9 @@ Yet to be rerolled.

500 + Merge branch 'en/rename-d-f' into en/merge-recursive

501 (this branch uses en/rename-d-f.)

502

558 -* il/remote-fd-ext (2010-10-12) 3 commits

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

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

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

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

507 + git-remote-ext

508 + git-remote-fd

@@ -577,82 +524,50 @@ Yet to be rerolled.

524 + t7607: use test-lib functions and check MERGE_HEAD

525

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

580 - - Provide 'git merge --abort' as a synonym to 'git reset --merge'

581 - - cmd_merge(): Parse options before checking MERGE_HEAD

582 - - Provide 'git notes get-ref' to easily retrieve current notes ref

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

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

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

586 - - git notes merge: List conflicting notes in notes merge commit message

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

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

589 - - Documentation: Preliminary docs on 'git notes merge'

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

591 - - git notes merge: Handle real, non-conflicting notes merges

592 - - builtin/notes.c: Refactor creation of notes commits.

593 - - git notes merge: Initial implementation handling trivial merges only

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

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

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

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

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

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

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

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

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

603 -

604 -Rerolled; will merge to next.

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

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

529 + + cmd_merge(): Parse options before checking MERGE_HEAD

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

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

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

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

534 + + git notes merge: List conflicting notes in notes merge commit message

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

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

537 + + Documentation: Preliminary docs on 'git notes merge'

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

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

540 + + builtin/notes.c: Refactor creation of notes commits.

541 + + git notes merge: Initial implementation handling trivial merges only

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

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

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

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

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

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

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

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

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

551

552 * pn/commit-autosquash (2010-11-02) 6 commits

607 - - add tests of commit --squash

608 - - commit: --squash option for use with rebase --autosquash

609 - - add tests of commit --fixup

610 - - commit: --fixup option for use with rebase --autosquash

611 - - pretty.c: teach format_commit_message() to reencode the output

612 - - commit: helper methods to reduce redundant blocks of code

613 -

614 -Will merge to next.

553 + (merged to 'next' on 2010-11-24 at acc9c78)

554 + + add tests of commit --squash

555 + + commit: --squash option for use with rebase --autosquash

556 + + add tests of commit --fixup

557 + + commit: --fixup option for use with rebase --autosquash

558 + + pretty.c: teach format_commit_message() to reencode the output

559 + + commit: helper methods to reduce redundant blocks of code

560

561 * jj/icase-directory (2010-10-03) 8 commits

617 - - Support case folding in git fast-import when core.ignorecase=true

618 - - Support case folding for git add when core.ignorecase=true

619 - - Add case insensitivity support when using git ls-files

620 - - Add case insensitivity support for directories when using git status

621 - - Case insensitivity support for .gitignore via core.ignorecase

622 - - Add string comparison functions that respect the ignore_case variable.

623 - - Makefile & configure: add a NO_FNMATCH_CASEFOLD flag

624 - - Makefile & configure: add a NO_FNMATCH flag

625 -

626 -Will merge to next.

627 -

628 -* en/and-cascade-tests (2010-10-31) 25 commits

629 - (merged to 'next' on 2010-11-15 at d51ec77)

630 - + t4124 (apply --whitespace): use test_might_fail

631 - + t3404: do not use 'describe' to implement test_cmp_rev

632 - + t3404 (rebase -i): introduce helper to check position of HEAD

633 - + t3404 (rebase -i): move comment to description

634 - + t3404 (rebase -i): unroll test_commit loops

635 - + t3301 (notes): use test_expect_code for clarity

636 - + t1400 (update-ref): use test_must_fail

637 - + t1502 (rev-parse --parseopt): test exit code from "-h"

638 - + t6022 (renaming merge): chain test commands with &&

639 - + test-lib: introduce test_line_count to measure files

640 - + tests: add missing &&, batch 2

641 - + tests: add missing &&

642 - + Introduce sane_unset and use it to ensure proper && chaining

643 - + t7800 (difftool): add missing &&

644 - + t7601 (merge-pull-config): add missing &&

645 - + t7001 (mv): add missing &&

646 - + t6016 (rev-list-graph-simplify-history): add missing &&

647 - + t5602 (clone-remote-exec): add missing &&

648 - + t4026 (color): remove unneeded and unchained command

649 - + t4019 (diff-wserror): add lots of missing &&

650 - + t4202 (log): Replace '<git-command> || :' with test_might_fail

651 - + t4002 (diff-basic): use test_might_fail for commands that might fail

652 - + t100[12] (read-tree-m-2way, read_tree_m_u_2way): add missing &&

653 - + t4017 (diff-retval): replace manual exit code check with test_expect_code

654 - + test-lib: make test_expect_code a test command

655 - (this branch is used by jn/git-cmd-h-bypass-setup.)

562 + (merged to 'next' on 2010-11-24 at 0da9385)

563 + + Support case folding in git fast-import when core.ignorecase=true

564 + + Support case folding for git add when core.ignorecase=true

565 + + Add case insensitivity support when using git ls-files

566 + + Add case insensitivity support for directories when using git status

567 + + Case insensitivity support for .gitignore via core.ignorecase

568 + + Add string comparison functions that respect the ignore_case variable.

569 + + Makefile & configure: add a NO_FNMATCH_CASEFOLD flag

570 + + Makefile & configure: add a NO_FNMATCH flag

571

572 * nd/struct-pathspec (2010-09-20) 5 commits

573 - ce_path_match: drop prefix matching in favor of match_pathspec

What's cooking (2010/11 #03)