138b4c2de6 · matheusbsbs/matheus-bagliano

@@ -1,15 +1,18 @@

1 To: git@vger.kernel.org

2 -Subject: What's cooking in git.git (Oct 2011, #05; Fri, 14)

3 -X-master-at: 463b0ea22b5b9a882e8140d0308433d8cbd0d1fe

4 -X-next-at: b91c5812e819aca51af2c0611009f305f0a29b4f

2 +Subject: What's cooking in git.git (Oct 2011, #06; Tue, 18)

3 +X-master-at: 08cfdbb88cd6225b4fc4b8a3cecd0e01758c835d

4 +X-next-at: 84fb7e6e14c3124e875b0326d84f1a4347e044d5

5

6 -What's cooking in git.git (Oct 2011, #05; Fri, 14)

6 +What's cooking in git.git (Oct 2011, #06; Tue, 18)

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

8

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

10 only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'.

11

12 -The second and third wave of topics have graduated to 'master'.

12 +The fourth batch of topics have graduated to the master branch. This batch

13 +ended up to be mostly fixes, as can be seen in the updates in the RelNotes

14 +file. These topics will be further merged down to the maint branch for the

15 +1.7.7.1 maintenance release.

16

17 Here are the repositories that have my integration branches:

18

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

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

34

35 --------------------------------------------------

33 -[New Topics]

36 +[Graduated to "master"]

37 +

38 +* bc/attr-ignore-case (2011-10-11) 5 commits

39 + (merged to 'next' on 2011-10-11 at daa6b51)

40 + + attr.c: respect core.ignorecase when matching attribute patterns

41 + + attr: read core.attributesfile from git_default_core_config

42 + + builtin/mv.c: plug miniscule memory leak

43 + + cleanup: use internal memory allocation wrapper functions everywhere

44 + + attr.c: avoid inappropriate access to strbuf "buf" member

45 +

46 +* ef/mingw-syslog (2011-10-07) 1 commit

47 + (merged to 'next' on 2011-10-11 at d5d6945)

48 + + mingw: avoid using strbuf in syslog

49 +

50 +* jc/checkout-from-tree-keep-local-changes (2011-09-30) 1 commit

51 + (merged to 'next' on 2011-10-06 at 64061aa)

52 + + checkout $tree $path: do not clobber local changes in $path not in $tree

53 +

54 +Originally merged to 'next' on 2011-10-05.

55

56 * jk/config-test-cleanup (2011-10-12) 2 commits

57 (merged to 'next' on 2011-10-12 at 7c857dd)

58 + t1300: test mixed-case variable retrieval

59 + t1300: put git invocations inside test function

60

40 -Will merge to 'master' in the fourth wave.

41 -

42 -* jm/maint-apply-detects-corrupt-patch-header (2011-10-12) 1 commit

43 - (merged to 'next' on 2011-10-12 at 80d9503)

44 - + fix "git apply --index ..." not to deref NULL

45 -

46 -Will merge to 'master' in the fifth wave.

47 -

48 -* mh/ref-api (2011-10-12) 7 commits

49 - - clear_cached_refs(): inline function

50 - - write_ref_sha1(): only invalidate the loose ref cache

51 - - clear_cached_refs(): extract two new functions

52 - - clear_cached_refs(): rename parameter

53 - - invalidate_ref_cache(): expose this function in refs API

54 - - invalidate_ref_cache(): take the submodule as parameter

55 - - invalidate_ref_cache(): rename function from invalidate_cached_refs()

56 -

57 -The first rename felt somewhat inconsistent in that it reworded the object

58 -of one particular verb "invalidate" to "ref_cache" but otherwise that

59 -entity is left as "cached_refs" throughout the codebase.

60 -

61 -The updated series looked almost all trivial and sensible but they would

62 -depend on this renaming, so I haven't queued them here yet. Personally I

63 -think we should either not rename just the function name (i.e. drop the

64 -first patch in this series) or rename both the function and what it

65 -operates on (i.e. enhance the first patch in this series).

61 +* jk/http-auth (2011-10-15) 6 commits

62 + (merged to 'next' on 2011-10-15 at 2ff0053)

63 + + http_init: accept separate URL parameter

64 + + http: use hostname in credential description

65 + + http: retry authentication failures for all http requests

66 + + remote-curl: don't retry auth failures with dumb protocol

67 + + improve httpd auth tests

68 + + url: decode buffers that are not NUL-terminated

69 + (this branch is tangled with jk/http-auth-keyring and js/cred-macos-x-keychain-2.)

70

67 -* bk/submodule-in-recursive-merge (2011-10-13) 2 commits

68 - - submodule: Search for merges only at end of recursive merge

69 - - submodule: Demonstrate known breakage during recursive merge

71 +Michael helped resurrecting uncontentious bits from the credential series.

72

71 -Brad helped resurrecting good bits earlier tangled in the stalled topic

72 -hv/submodule-merge-search by mistake.

73 -Will merge to 'next'.

73 +* jk/name-hash-dirent (2011-10-07) 1 commit

74 + (merged to 'next' on 2011-10-11 at e2ea68b)

75 + + fix phantom untracked files when core.ignorecase is set

76

77 * jk/pull-rebase-with-work-tree (2011-10-13) 1 commit

76 - - pull,rebase: handle GIT_WORK_TREE better

77 -

78 -Looked reasonable.

79 -Will merge to 'next'.

78 + (merged to 'next' on 2011-10-15 at 2707482)

79 + + pull,rebase: handle GIT_WORK_TREE better

80

81 -* sg/complete-refs (2011-10-12) 10 commits

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

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

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

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

86 - - completion: support full refs from remote repositories

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

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

89 - - completion: optimize refs completion

90 - - completion: document __gitcomp()

91 - - Merge branches 'tm/completion-push-set-upstream', 'tm/completion-commit-fixup-squash' and 'sg/completion' into HEAD

92 - (this branch uses sg/completion, tm/completion-commit-fixup-squash and tm/completion-push-set-upstream.)

93 -

94 -Re-roll expected.

95 -

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

97 - - bundle: add parse_bundle_header() helper function

98 - - bundle: allowing to read from an unseekable fd

81 +* js/bisect-no-checkout (2011-09-21) 1 commit

82 + (merged to 'next' on 2011-10-06 at 0354e94)

83 + + bisect: fix exiting when checkout failed in bisect_start()

84

100 -I am not entirely happy with the first patch but it is not so bad either.

85 +Originally merged to 'next' on 2011-09-21.

86

87 * js/check-ref-format-test-mingw (2011-10-13) 1 commit

103 - - t1402-check-ref-format: skip tests of refs beginning with slash on Windows

88 + (merged to 'next' on 2011-10-15 at fbc2ee6)

89 + + t1402-check-ref-format: skip tests of refs beginning with slash on Windows

90

105 -Will merge to 'next'.

106 -

107 -* jk/daemon-msgs (2011-10-14) 1 commit

108 - - daemon: give friendlier error messages to clients

91 +* mm/maint-config-explicit-bool-display (2011-10-10) 1 commit

92 + (merged to 'next' on 2011-10-11 at 795939f)

93 + + config: display key_delim for config --bool --get-regexp

94

110 -Will merge to 'next'.

95 +* ph/push-to-delete-nothing (2011-09-30) 1 commit

96 + (merged to 'next' on 2011-10-06 at 33ac777)

97 + + receive-pack: don't pass non-existent refs to post-{receive,update} hooks

98

112 -* jk/http-auth (2011-10-14) 6 commits

113 - - http_init: accept separate URL parameter

114 - - http: use hostname in credential description

115 - - http: retry authentication failures for all http requests

116 - - remote-curl: don't retry auth failures with dumb protocol

117 - - improve httpd auth tests

118 - - url: decode buffers that are not NUL-terminated

119 - (this branch is tangled with jk/http-auth-keyring and js/cred-macos-x-keychain-2.)

99 +* sg/completion (2011-10-10) 2 commits

100 + (merged to 'next' on 2011-10-11 at 4724640)

101 + + completion: unite --format and --pretty for 'log' and 'show'

102 + + completion: unite --reuse-message and --reedit-message for 'notes'

103 + (this branch is used by sg/complete-refs; uses tm/completion-commit-fixup-squash.)

104

121 -Michael helped resurrecting uncontentious bits from the credential series.

122 -Will merge to 'next'.

105 +* tc/fetch-leak (2011-10-07) 1 commit

106 + (merged to 'next' on 2011-10-11 at d867153)

107 + + fetch: plug two leaks on error exit in store_updated_refs

108

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

125 - - downgrade "packfile cannot be accessed" errors to warnings

126 - - pack-objects: protect against disappearing packs

109 +* tm/completion-commit-fixup-squash (2011-10-06) 2 commits

110 + (merged to 'next' on 2011-10-11 at 6bb192e)

111 + + completion: commit --fixup and --squash

112 + + completion: unite --reuse-message and --reedit-message handling

113 + (this branch is used by sg/complete-refs and sg/completion.)

114

128 -Will merge to 'next'.

115 +* tm/completion-push-set-upstream (2011-10-06) 1 commit

116 + (merged to 'next' on 2011-10-11 at 85544e5)

117 + + completion: push --set-upstream

118 + (this branch is used by sg/complete-refs.)

119

120 --------------------------------------------------

131 -[Graduated to "master"]

132 -

133 -* bw/grep-no-index-no-exclude (2011-09-15) 2 commits

134 - (merged to 'next' on 2011-10-06 at 325270b)

135 - + grep --no-index: don't use git standard exclusions

136 - + grep: do not use --index in the short usage output

137 - (this branch is used by jc/grep-untracked-exclude and jc/maint-grep-untracked-exclude.)

138 -

139 -Originally merged to 'next' on 2011-09-26.

140 -

141 -* cb/do-not-pretend-to-hijack-long-help (2011-10-05) 1 commit

142 - (merged to 'next' on 2011-10-06 at 46851fe)

143 - + use -h for synopsis and --help for manpage consistently

144 -

145 -* cp/git-web-browse-browsers (2011-10-03) 1 commit

146 - (merged to 'next' on 2011-10-06 at da42ad0)

147 - + git-web--browse: avoid the use of eval

148 -

149 -* cs/perl-config-path-send-email (2011-09-30) 2 commits

150 - (merged to 'next' on 2011-10-06 at 93c00f0)

151 - + use new Git::config_path() for aliasesfile

152 - + Add Git::config_path()

153 -

154 -Originally merged to 'next' on 2011-10-05.

155 -

156 -* di/fast-import-empty-tag-note-fix (2011-09-22) 2 commits

157 - (merged to 'next' on 2011-10-06 at 3a01ef1)

158 - + fast-import: don't allow to note on empty branch

159 - + fast-import: don't allow to tag empty branch

121 +[New Topics]

122

161 -Originally merged to 'next' on 2011-10-05.

123 +* md/smtp-tls-hello-again (2011-10-15) 1 commit

124 + (merged to 'next' on 2011-10-16 at 3e27de4)

125 + + send-email: Honour SMTP domain when using TLS

126 +

127 +Will merge to 'master' soonish.

128 +

129 +* pt/mingw-misc-fixes (2011-10-15) 7 commits

130 + (merged to 'next' on 2011-10-16 at 2dc0b55)

131 + + t9901: fix line-ending dependency on windows

132 + + mingw: ensure sockets are initialized before calling gethostname

133 + + mergetools: use the correct tool for Beyond Compare 3 on Windows

134 + + t9300: do not run --cat-blob-fd related tests on MinGW

135 + + git-svn: On MSYS, escape and quote SVN_SSH also if set by the user

136 + + t9001: do not fail only due to CR/LF issues

137 + + t1020: disable the pwd test on MinGW

138 +

139 +Will merge to 'master' soonish.

140 +

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

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

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

144 + + git-p4: keyword flattening fixes

145 + + git-p4: stop ignoring apple filetype

146 + + git-p4: recognize all p4 filetypes

147 + + git-p4: handle utf16 filetype properly

148 + + git-p4 tests: refactor and cleanup

149

163 -* il/archive-err-signal (2011-10-05) 1 commit

164 - (merged to 'next' on 2011-10-06 at 7e3083f)

165 - + Support ERR in remote archive like in fetch/push

150 +Will merge to 'master' in the fifth wave.

151

167 -* jc/apply-blank-at-eof-fix (2011-09-26) 1 commit

168 - (merged to 'next' on 2011-10-06 at a9dfd8f)

169 - + apply --whitespace=error: correctly report new blank lines at end

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

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

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

155

171 -Originally merged to 'next' on 2011-10-05.

156 +Will merge to 'master' in the fifth wave.

157

173 -* jc/grep-untracked-exclude (2011-10-04) 1 commit

174 - (merged to 'next' on 2011-10-06 at b16cffe)

175 - + Merge branch 'jc/maint-grep-untracked-exclude' into jc/grep-untracked-exclude

176 - (this branch uses bw/grep-no-index-no-exclude and jc/maint-grep-untracked-exclude.)

177 -

178 -* jc/is-url-simplify (2011-10-03) 1 commit

179 - (merged to 'next' on 2011-10-06 at d6c6741)

180 - + url.c: simplify is_url()

181 -

182 -* jc/maint-grep-untracked-exclude (2011-10-04) 1 commit

183 - + grep: teach --untracked and --exclude-standard options

184 - (this branch is used by jc/grep-untracked-exclude; uses bw/grep-no-index-no-exclude.)

185 -

186 -* jc/parse-options-boolean (2011-09-28) 5 commits

187 - (merged to 'next' on 2011-10-06 at dd4936c)

188 - + apply: use OPT_NOOP_NOARG

189 - + revert: use OPT_NOOP_NOARG

190 - + parseopt: add OPT_NOOP_NOARG

191 - + archive.c: use OPT_BOOL()

192 - + parse-options: deprecate OPT_BOOLEAN

193 -

194 -* jn/ident-from-etc-mailname (2011-10-06) 2 commits

195 - (merged to 'next' on 2011-10-06 at a68770d)

196 - + ident: do not retrieve default ident when unnecessary

197 - + ident: check /etc/mailname if email is unknown

198 -

199 -* jn/no-g-plus-s-on-bsd (2011-10-03) 1 commit

200 - (merged to 'next' on 2011-10-06 at 3d85674)

201 - + Makefile: do not set setgid bit on directories on GNU/kFreeBSD

202 -

203 -* js/maint-merge-one-file-osx-expr (2011-10-06) 1 commit

204 - (merged to 'next' on 2011-10-07 at fbb28a2)

205 - + merge-one-file: fix "expr: non-numeric argument"

206 -

207 -* nd/daemon-log-sock-errors (2011-10-03) 1 commit

208 - (merged to 'next' on 2011-10-06 at 5f3630f)

209 - + daemon: log errors if we could not use some sockets

210 -

211 -* nd/document-err-packet (2011-10-03) 1 commit

212 - (merged to 'next' on 2011-10-06 at 0c5f5d0)

213 - + pack-protocol: document "ERR" line

214 -

215 -* nd/git-daemon-error-msgs (2011-10-03) 1 commit

216 - (merged to 'next' on 2011-10-06 at 209126d)

217 - + daemon: return "access denied" if a service is not allowed

218 -

219 -* nd/maint-autofix-tag-in-head (2011-09-18) 4 commits

220 - (merged to 'next' on 2011-10-06 at c083e69)

221 - + Accept tags in HEAD or MERGE_HEAD

222 - + merge: remove global variable head[]

223 - + merge: use return value of resolve_ref() to determine if HEAD is invalid

224 - + merge: keep stash[] a local variable

225 -

226 -Originally merged to 'next' on 2011-09-27.

227 -

228 -* nd/maint-sparse-errors (2011-09-22) 2 commits

229 - (merged to 'next' on 2011-10-06 at e3cbb90)

230 - + Add explanation why we do not allow to sparse checkout to empty working tree

231 - + sparse checkout: show error messages when worktree shaping fails

232 -

233 -Originally merged to 'next' on 2011-09-22.

234 -

235 -* rs/diff-cleanup-records-fix (2011-10-03) 2 commits

236 - (merged to 'next' on 2011-10-06 at 91f035f)

237 - + diff: resurrect XDF_NEED_MINIMAL with --minimal

238 - + Revert removal of multi-match discard heuristic in 27af01

239 -

240 -* rs/name-rev-usage (2011-10-03) 1 commit

241 - (merged to 'next' on 2011-10-06 at e51878e)

242 - + name-rev: split usage string

158 +* cb/daemon-permission-errors (2011-10-17) 2 commits

159 + - daemon: report permission denied error to clients

160 + - daemon: add tests

161 + (this branch uses jk/daemon-msgs.)

162 +

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

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

165 +

166 +* cb/httpd-test-fix-port (2011-10-17) 1 commit

167 + (merged to 'next' on 2011-10-17 at 84fb7e6)

168 + + use test number as port number

169 +

170 +Will merge to 'master' soonish.

171 +

172 +* jc/verbose-checkout (2011-10-16) 2 commits

173 + - checkout -v: give full status output after switching branches

174 + - checkout: move the local changes report to the end

175 +

176 +This is just to leave a record that the reason why we do not do this not

177 +because we are incapable of coding this, but because it is not a good idea

178 +to do this. I suspect people who are new to git that might think they need

179 +it would soon realize the don't.

180 +

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

182 +

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

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

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

186 +

187 +Fun.

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

189 +

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

191 + - resolve_gitlink_ref_recursive(): change to work with struct ref_cache

192 + - Pass a (ref_cache *) to the resolve_gitlink_*() helper functions

193 + - resolve_gitlink_ref(): improve docstring

194 + - get_ref_dir(): change signature

195 + - refs: change signatures of get_packed_refs() and get_loose_refs()

196 + - is_dup_ref(): extract function from sort_ref_array()

197 + - add_ref(): add docstring

198 + - parse_ref_line(): add docstring

199 + - is_refname_available(): remove the "quiet" argument

200 + - clear_ref_array(): rename from free_ref_array()

201 + - refs: rename parameters result -> sha1

202 + - refs: rename "refname" variables

203 + - struct ref_entry: document name member

204 + - cache.h: add comments for git_path() and git_path_submodule()

205 + (this branch uses mh/ref-api.)

206

244 -Originally merged to 'next' on 2011-10-05.

207 +Will merge to 'next'.

208

246 -* rs/pending (2011-10-03) 8 commits

247 - (merged to 'next' on 2011-10-06 at 998462b)

248 - + commit: factor out clear_commit_marks_for_object_array

249 - + checkout: use leak_pending flag

250 - + bundle: use leak_pending flag

251 - + bisect: use leak_pending flag

252 - + revision: add leak_pending flag

253 - + checkout: use add_pending_{object,sha1} in orphan check

254 - + revision: factor out add_pending_sha1

255 - + checkout: check for "Previous HEAD" notice in t2020

256 -

257 -* rs/test-ctype (2011-10-03) 2 commits

258 - (merged to 'next' on 2011-10-06 at b8c26d2)

259 - + test-ctype: add test for is_pathspec_magic

260 - + test-ctype: macrofy

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

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

211

262 -Originally merged to 'next' on 2011-10-05.

212 +Will merge to 'next'.

213

264 -* sp/smart-http-failure (2011-10-04) 1 commit

265 - (merged to 'next' on 2011-10-06 at 02f9982)

266 - + remote-curl: Fix warning after HTTP failure

214 +* dm/pack-objects-update (2011-10-18) 4 commits

215 + - pack-objects: don't traverse objects unnecessarily

216 + - pack-objects: rewrite add_descendants_to_write_order() iteratively

217 + - pack-objects: use unsigned int for counter and offset values

218 + - pack-objects: mark add_to_write_order() as inline

219

268 -* zj/send-email-authen-sasl (2011-09-29) 1 commit

269 - (merged to 'next' on 2011-10-06 at 78b31cd)

270 - + send-email: auth plain/login fix

220 +* jk/git-tricks (2011-10-18) 3 commits

221 + - completion: match ctags symbol names in grep patterns

222 + - contrib: add git-jump script

223 + - contrib: add diff highlight script

224

272 -Originally merged to 'next' on 2011-10-05.

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

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

227

228 --------------------------------------------------

229 [Stalled]

@@ -293,25 +247,6 @@ moved to this topic.

247 Perhaps 281eee4 (revision: keep track of the end-user input from the

248 command line, 2011-08-25) would help.

249

296 -* cn/fetch-prune (2011-10-07) 4 commits

297 - - fetch: treat --tags like refs/tags/*:refs/tags/* when pruning

298 - - fetch: honor the user-provided refspecs when pruning refs

299 - - t5510: add tests for fetch --prune

300 - - fetch: free all the additional refspecs

301 -

302 -Probably needs a little bit more polish to reduce code duplication between

303 -existing remote_find_tracking() and new find_in_refs().

304 -

305 -* jn/gitweb-manpages (2011-10-10) 6 commits

306 - . gitweb: Add gitweb manpages to 'gitweb' package in git.spec

307 - . Documentation: Add gitweb config variables to git-config(1)

308 - . Documentation: Link to gitweb(1) and gitweb.conf(5) in other manpages

309 - . gitweb: Add manpage for gitweb

310 - . gitweb: Add manpage for gitweb configuration files

311 - . Documentation: Preparation for gitweb manpages

312 -

313 -A re-roll already being discussed.

314 -

250 * rr/revert-cherry-pick (2011-10-12) 7 commits

251 - revert: further simplify parsing of a line in insn sheet

252 - revert: Simplify passing command-line arguments around

@@ -351,17 +286,92 @@ particular workload.

286 --------------------------------------------------

287 [Cooking]

288

354 -* ef/mingw-syslog (2011-10-07) 1 commit

355 - (merged to 'next' on 2011-10-11 at d5d6945)

356 - + mingw: avoid using strbuf in syslog

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

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

291 + + clear_ref_cache(): inline function

292 + + write_ref_sha1(): only invalidate the loose ref cache

293 + + clear_ref_cache(): extract two new functions

294 + + clear_ref_cache(): rename parameter

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

296 + + invalidate_ref_cache(): take the submodule as parameter

297 + + invalidate_ref_cache(): rename function from invalidate_cached_refs()

298 + (this branch is used by mh/ref-api-2.)

299 +

300 +Will merge to 'master' in the sixth wave.

301 +

302 +* jn/gitweb-manpages (2011-10-16) 5 commits

303 + (merged to 'next' on 2011-10-16 at 6555a07)

304 + + gitweb: Add gitweb manpages to 'gitweb' package in git.spec

305 + + Documentation: Add gitweb config variables to git-config(1)

306 + + Documentation: Link to gitweb(1) and gitweb.conf(5) in other manpages

307 + + gitweb: Add gitweb(1) manpage for gitweb itself

308 + + gitweb: Add gitweb.conf(5) manpage for gitweb configuration files

309 +

310 +Will merge to 'master' soonish.

311

358 -Will merge to 'master' in the fourth wave.

312 +* jm/maint-apply-detects-corrupt-patch-header (2011-10-12) 1 commit

313 + (merged to 'next' on 2011-10-12 at 80d9503)

314 + + fix "git apply --index ..." not to deref NULL

315

360 -* jk/name-hash-dirent (2011-10-07) 1 commit

361 - (merged to 'next' on 2011-10-11 at e2ea68b)

362 - + fix phantom untracked files when core.ignorecase is set

316 +Will merge to 'master' soonish.

317 +

318 +* bk/submodule-in-recursive-merge (2011-10-13) 2 commits

319 + (merged to 'next' on 2011-10-15 at e02205c)

320 + + submodule: Search for merges only at end of recursive merge

321 + + submodule: Demonstrate known breakage during recursive merge

322 +

323 +Brad helped resurrecting good bits earlier tangled in the stalled topic

324 +hv/submodule-merge-search by mistake.

325 +

326 +Will merge to 'master' soonish.

327 +

328 +* sg/complete-refs (2011-10-15) 10 commits

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

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

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

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

333 + - completion: support full refs from remote repositories

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

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

336 + - completion: optimize refs completion

337 + - completion: document __gitcomp()

338 + - Merge branches 'tm/completion-push-set-upstream', 'tm/completion-commit-fixup-squash' and 'sg/completion' into HEAD

339 +

340 +Rerolled.

341 +

342 +Will keep in 'pu' until an Ack or two from people who have worked on the

343 +completion in the past comes.

344 +

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

346 + - bundle: add parse_bundle_header() helper function

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

348

364 -Will merge to 'master' in the fourth wave.

349 +I am not entirely happy with the first patch but it is not so bad either.

350 +Will merge to 'next'.

351 +

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

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

354 + + daemon: give friendlier error messages to clients

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

356 +

357 +Will merge to 'master' in the fifth wave.

358 +

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

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

361 + + downgrade "packfile cannot be accessed" errors to warnings

362 + + pack-objects: protect against disappearing packs

363 +

364 +Will merge to 'master' in the fifth wave.

365 +

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

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

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

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

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

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

372 + + fetch: free all the additional refspecs

373 +

374 +Will merge to 'master' in the sixth wave.

375

376 * js/merge-edit-option (2011-10-12) 1 commit

377 (merged to 'next' on 2011-10-12 at db28da3)

@@ -369,12 +379,6 @@ Will merge to 'master' in the fourth wave.

379

380 Will merge to 'master' in the fifth wave.

381

372 -* mm/maint-config-explicit-bool-display (2011-10-10) 1 commit

373 - (merged to 'next' on 2011-10-11 at 795939f)

374 - + config: display key_delim for config --bool --get-regexp

375 -

376 -Will merge to 'master' in the fourth wave.

377 -

382 * rs/diff-whole-function (2011-10-10) 2 commits

383 (merged to 'next' on 2011-10-11 at 6196752)

384 + diff: add option to show whole functions as context

@@ -402,50 +406,23 @@ Will merge to 'master' in the fifth wave.

406

407 Will merge to 'master' in the fifth wave.

408

405 -* sg/completion (2011-10-10) 2 commits

406 - (merged to 'next' on 2011-10-11 at 4724640)

407 - + completion: unite --format and --pretty for 'log' and 'show'

408 - + completion: unite --reuse-message and --reedit-message for 'notes'

409 - (this branch is used by sg/complete-refs; uses tm/completion-commit-fixup-squash.)

410 -

411 -Will merge to 'master' in the fourth wave.

412 -

413 -* tc/fetch-leak (2011-10-07) 1 commit

414 - (merged to 'next' on 2011-10-11 at d867153)

415 - + fetch: plug two leaks on error exit in store_updated_refs

416 -

417 -Will merge to 'master' in the fourth wave.

418 -

409 * jc/check-ref-format-fixup (2011-10-12) 2 commits

420 - - Restrict ref-like names immediately below $GIT_DIR

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

410 + (merged to 'next' on 2011-10-15 at 8e89bc5)

411 + + Restrict ref-like names immediately below $GIT_DIR

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

413

414 An attempt to fix-up unfortunate side effect of mh/check-ref-format-3

415 topic. "git show -s config" is never meant to refer to $GIT_DIR/config

416 and treat it as a file that records an object name.

417

427 -Will merge to 'next'.

418 +Will merge to 'master' soonish so that we can have enough time to deal

419 +with possible fall-outs.

420

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

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

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

424

433 -Will merge to 'master' in the fifth wave.

434 -

435 -* tm/completion-commit-fixup-squash (2011-10-06) 2 commits

436 - (merged to 'next' on 2011-10-11 at 6bb192e)

437 - + completion: commit --fixup and --squash

438 - + completion: unite --reuse-message and --reedit-message handling

439 - (this branch is used by sg/complete-refs and sg/completion.)

440 -

441 -Will merge to 'master' in the fourth wave.

442 -

443 -* tm/completion-push-set-upstream (2011-10-06) 1 commit

444 - (merged to 'next' on 2011-10-11 at 85544e5)

445 - + completion: push --set-upstream

446 - (this branch is used by sg/complete-refs.)

447 -

448 -Will merge to 'master' in the fourth wave.

425 +Will merge to 'master' in the sixth wave.

426

427 * js/no-cherry-pick-head-after-punted (2011-10-06) 1 commit

428 (merged to 'next' on 2011-10-10 at acb29ee)

@@ -478,27 +455,9 @@ Will merge to 'master' in the fifth wave.

455

456 Will merge to 'master' in the fifth wave.

457

481 -* jc/checkout-from-tree-keep-local-changes (2011-09-30) 1 commit

482 - (merged to 'next' on 2011-10-06 at 64061aa)

483 - + checkout $tree $path: do not clobber local changes in $path not in $tree

484 -

485 -Originally merged to 'next' on 2011-10-05.

486 -Will merge to 'master' in the fourth wave.

487 -

488 -* ph/push-to-delete-nothing (2011-09-30) 1 commit

489 - (merged to 'next' on 2011-10-06 at 33ac777)

490 - + receive-pack: don't pass non-existent refs to post-{receive,update} hooks

491 -

492 -Will merge to 'master' in the fourth wave.

493 -

494 -* js/bisect-no-checkout (2011-09-21) 1 commit

495 - (merged to 'next' on 2011-10-06 at 0354e94)

496 - + bisect: fix exiting when checkout failed in bisect_start()

497 -

498 -Originally merged to 'next' on 2011-09-21.

499 -Will merge to 'master' in the fourth wave.

500 -

501 -* jc/request-pull-show-head-4 (2011-10-09) 10 commits

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

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

460 + + fmt-merge-msg.c: Fix an "dubious one-bit signed bitfield" sparse error

461 (merged to 'next' on 2011-10-10 at 092175e)

462 + environment.c: Fix an sparse "symbol not declared" warning

463 + builtin/log.c: Fix an "Using plain integer as NULL pointer" warning

@@ -513,22 +472,12 @@ Will merge to 'master' in the fourth wave.

472 + branch: add read_branch_desc() helper function

473 + Merge branch 'bk/ancestry-path' into jc/branch-desc

474

516 -Will merge to 'master' in the fifth wave.

517 -

518 -* bc/attr-ignore-case (2011-10-11) 5 commits

519 - (merged to 'next' on 2011-10-11 at daa6b51)

520 - + attr.c: respect core.ignorecase when matching attribute patterns

521 - + attr: read core.attributesfile from git_default_core_config

522 - + builtin/mv.c: plug miniscule memory leak

523 - + cleanup: use internal memory allocation wrapper functions everywhere

524 - + attr.c: avoid inappropriate access to strbuf "buf" member

525 -

526 -Will merge to 'master' in the fourth wave.

475 +Will merge to 'master' in the sixth wave.

476

477 --------------------------------------------------

478 [Discarded]

479

531 -* jk/http-auth-keyring (2011-10-12) 23 commits

480 +* jk/http-auth-keyring (2011-10-12) 19 commits

481 . http_init: accept separate URL parameter

482 . credential-cache: don't cache items without context

483 . check_expirations: don't copy over same element

@@ -548,18 +497,14 @@ Will merge to 'master' in the fourth wave.

497 . look for credentials in config before prompting

498 . http: use credential API to get passwords

499 . introduce credentials API

551 - - http: retry authentication failures for all http requests

552 - - remote-curl: don't retry auth failures with dumb protocol

553 - - improve httpd auth tests

554 - - url: decode buffers that are not NUL-terminated

555 - (this branch is used by js/cred-macos-x-keychain-2; is tangled with jk/http-auth.)

500 + (this branch is used by js/cred-macos-x-keychain-2.)

501

502 Discarded without prejudice to allow design level discussions to continue.

503 Expecting a re-roll based on jk/http-auth

504

505 * js/cred-macos-x-keychain-2 (2011-10-12) 1 commit

506 . contrib: add a pair of credential helpers for Mac OS X's keychain

562 - (this branch uses jk/http-auth-keyring; is tangled with jk/http-auth.)

507 + (this branch uses jk/http-auth-keyring.)

508

509 Discarded without prejudice to allow design level discussions to continue.

510 Expecting a re-roll based on jk/http-auth

What's cooking (2011/10 #06)