0bb071a821 · matheusbsbs/matheus-bagliano

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

1 To: git@vger.kernel.org

2 -Subject: What's cooking in git.git (Oct 2011, #04; Wed, 12)

3 -X-master-at: 8b0e15fa95e11965f18c8d2585dc8ffd9bfc9356

4 -X-next-at: 6d5841794ba7a676b5918d0bc8cbad836597555b

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

3 +X-master-at: 463b0ea22b5b9a882e8140d0308433d8cbd0d1fe

4 +X-next-at: b91c5812e819aca51af2c0611009f305f0a29b4f

5

6 -What's cooking in git.git (Oct 2011, #04; Wed, 12)

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

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 -As reported earlier, 'next' has been rebuilt with some topics kicked back

13 -to 'pu'. Also, k.org is back.

14 -

15 -The second wave of topics are starting to graduate to 'master'.

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

13

14 Here are the repositories that have my integration branches:

15

@@ -35,277 +32,260 @@ With all the topics and integration branches but not todo, html or man:

32 --------------------------------------------------

33 [New Topics]

34

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

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

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

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

42 - - fetch: free all the additional refspecs

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

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

37 + + t1300: test mixed-case variable retrieval

38 + + t1300: put git invocations inside test function

39

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

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

46 - + mingw: avoid using strbuf in syslog

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

41

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

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

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

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

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

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

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

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

56 - . gitweb: Add manpage for gitweb

57 - . gitweb: Add manpage for gitweb configuration files

58 - . Documentation: Preparation for gitweb manpages

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

47

60 -A re-roll already being discussed.

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

62 -* js/merge-edit-option (2011-10-10) 2 commits

63 - - fixup! 0f6adfe2a26287c5c13366975f621c818bb3214d

64 - - Teach merge the '[-e|--edit]' option

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

66 -The part to tweak builtin/merge.c in the fix-up should be removed but

67 -otherwise ready to be squashed into one and merged to 'next'.

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).

66

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

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

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

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

70

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

74 - - fixup! 82d520bd

75 - - revert: Simplify passing command-line arguments around

76 - - revert: Allow mixed pick and revert instructions

77 - - revert: Make commit descriptions in insn sheet optional

78 - - revert: Fix buffer overflow in insn sheet parser

79 - - revert: Simplify getting commit subject

80 - - revert: Free memory after get_message call

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

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

73 +Will merge to 'next'.

74

82 -Probably needs a little bit more polish.

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

76 + - pull,rebase: handle GIT_WORK_TREE better

77

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

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

86 - + diff: add option to show whole functions as context

87 - + xdiff: factor out get_func_line()

78 +Looked reasonable.

79 +Will merge to 'next'.

80

89 -* rs/pickaxe (2011-10-07) 7 commits

90 - (merged to 'next' on 2011-10-11 at 27d02b2)

91 - + pickaxe: factor out pickaxe

92 - + pickaxe: give diff_grep the same signature as has_changes

93 - + pickaxe: pass diff_options to contains and has_changes

94 - + pickaxe: factor out has_changes

95 - + pickaxe: plug regex/kws leak

96 - + pickaxe: plug regex leak

97 - + pickaxe: plug diff filespec leak with empty needle

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

99 -* sc/difftool-skip (2011-10-10) 1 commit

100 - (merged to 'next' on 2011-10-11 at 38d7e84)

101 - + git-difftool: allow skipping file by typing 'n' at prompt

94 +Re-roll expected.

95

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

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

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

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

107 - (this branch uses tm/completion-commit-fixup-squash.)

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

99

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

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

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

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

101

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

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

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

102 +* 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

104

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

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

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

105 +Will merge to 'next'.

106

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

122 - - branch -m/-M: remove undocumented RENAMED-REF

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

108 + - daemon: give friendlier error messages to clients

109 +

110 +Will merge to 'next'.

111 +

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.)

120 +

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

122 +Will merge to 'next'.

123 +

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

127 +

128 +Will merge to 'next'.

129

130 --------------------------------------------------

131 [Graduated to "master"]

132

127 -* cb/common-prefix-unification (2011-09-12) 3 commits

128 - (merged to 'next' on 2011-10-06 at 8349bca)

129 - + rename pathspec_prefix() to common_prefix() and move to dir.[ch]

130 - + consolidate pathspec_prefix and common_prefix

131 - + remove prefix argument from pathspec_prefix

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

133 -Originally merged to 'next' on 2011-09-14.

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

135 -* dm/tree-walk (2011-09-28) 2 commits

136 - (merged to 'next' on 2011-10-06 at 76e90c3)

137 - + tree-walk: micro-optimization in tree_entry_interesting

138 - + tree-walk: drop unused parameter from match_dir_prefix

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

142 -* fg/submodule-git-file-git-dir (2011-08-22) 2 commits

143 - (merged to 'next' on 2011-10-06 at 3526bb9)

144 - + Move git-dir for submodules

145 - + rev-parse: add option --resolve-git-dir <path>

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

160

147 -Originally merged to 'next' on 2011-08-23.

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

162

149 -* hv/submodule-update-none (2011-08-11) 2 commits

150 - (merged to 'next' on 2011-10-06 at 4c105df)

151 - + add update 'none' flag to disable update of submodule by default

152 - + submodule: move update configuration variable further up

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

166

154 -Originally merged to 'next' on 2011-08-24.

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

170

156 -* jc/maint-diffstat-numstat-context (2011-09-22) 1 commit

157 - (merged to 'next' on 2011-10-06 at 36c972d)

158 - + diff: teach --stat/--numstat to honor -U$num

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

172

160 -"diff" is allowed to match the common lines differently depending on how

161 -many context lines it is showing, so running --(num)stat with 0 lines of

162 -context internally gives a result that may be surprising to some people.

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

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

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

166 -* jm/mergetool-pathspec (2011-09-26) 2 commits

167 - (merged to 'next' on 2011-10-06 at b8e830f)

168 - + mergetool: no longer need to save standard input

169 - + mergetool: Use args as pathspec to unmerged files

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

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

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

173 -* jn/maint-http-error-message (2011-09-06) 2 commits

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

175 - + http: avoid empty error messages for some curl errors

176 - + http: remove extra newline in error message

177 -

178 -Originally merged to 'next' on 2011-09-12.

179 -

180 -* jp/get-ref-dir-unsorted (2011-09-30) 2 commits

181 - (merged to 'next' on 2011-10-06 at 69fe65d)

182 - + refs: Use binary search to lookup refs faster

183 - + Don't sort ref_list too early

184 -

185 -* mh/check-ref-format-3 (2011-10-05) 23 commits

186 - (merged to 'next' on 2011-10-06 at c277498)

187 - + add_ref(): verify that the refname is formatted correctly

188 - + resolve_ref(): expand documentation

189 - + resolve_ref(): also treat a too-long SHA1 as invalid

190 - + resolve_ref(): emit warnings for improperly-formatted references

191 - + resolve_ref(): verify that the input refname has the right format

192 - + remote: avoid passing NULL to read_ref()

193 - + remote: use xstrdup() instead of strdup()

194 - + resolve_ref(): do not follow incorrectly-formatted symbolic refs

195 - + resolve_ref(): extract a function get_packed_ref()

196 - + resolve_ref(): turn buffer into a proper string as soon as possible

197 - + resolve_ref(): only follow a symlink that contains a valid, normalized refname

198 - + resolve_ref(): use prefixcmp()

199 - + resolve_ref(): explicitly fail if a symlink is not readable

200 - + Change check_refname_format() to reject unnormalized refnames

201 - + Inline function refname_format_print()

202 - + Make collapse_slashes() allocate memory for its result

203 - + Do not allow ".lock" at the end of any refname component

204 - + Refactor check_refname_format()

205 - + Change check_ref_format() to take a flags argument

206 - + Change bad_ref_char() to return a boolean value

207 - + git check-ref-format: add options --allow-onelevel and --refspec-pattern

208 - + t1402: add some more tests

209 - + get_sha1_hex(): do not read past a NUL character

210 -

211 -An unpleasant minor side effect was discovered with this one. If you try

212 -"git show -s config", the code warns that $GIT_DIR/config is not formatted

213 -correctly as a ref, which is technically correct but totally unwarranted.

214 -

215 -* mh/iterate-refs (2011-09-11) 7 commits

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

217 - + refs.c: make create_cached_refs() static

218 - + Retain caches of submodule refs

219 - + Store the submodule name in struct cached_refs

220 - + Allocate cached_refs objects dynamically

221 - + Change the signature of read_packed_refs()

222 - + Access reference caches only through new function get_cached_refs()

223 - + Extract a function clear_cached_refs()

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

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

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

227 -* mh/maint-notes-merge-pathbuf-fix (2011-09-27) 1 commit

228 - (merged to 'next' on 2011-10-06 at 0af69bb)

229 - + notes_merge_commit(): do not pass temporary buffer to other function

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

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

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

233 -* mz/remote-rename (2011-09-11) 4 commits

234 - (merged to 'next' on 2011-10-06 at 96db20d)

235 - + remote: only update remote-tracking branch if updating refspec

236 - + remote rename: warn when refspec was not updated

237 - + remote: "rename o foo" should not rename ref "origin/bar"

238 - + remote: write correct fetch spec when renaming remote 'remote'

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

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

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

242 -* nd/sparse-doc (2011-09-26) 1 commit

243 - (merged to 'next' on 2011-10-06 at f6b8355)

244 - + git-read-tree.txt: update sparse checkout examples

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

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

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

248 -* ps/gitweb-js-with-lineno (2011-09-27) 1 commit

249 - (merged to 'next' on 2011-10-06 at 9236f5e)

250 - + gitweb: Fix links to lines in blobs when javascript-actions are enabled

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

243

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

245

254 ---------------------------------------------------

255 -[Stalled]

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 -* jk/http-auth-keyring (2011-09-28) 22 commits

258 - - credential-cache: don't cache items without context

259 - - check_expirations: don't copy over same element

260 - - t0300: add missing EOF terminator for <<

261 - - credential-store: use a better storage format

262 - - t0300: make alternate username tests more robust

263 - - t0300: make askpass tests a little more robust

264 - - credential-cache: fix expiration calculation corner cases

265 - - docs: minor tweaks to credentials API

266 - - credentials: make credential_fill_gently() static

267 - - credentials: add "getpass" helper

268 - - credentials: add "store" helper

269 - - credentials: add "cache" helper

270 - - docs: end-user documentation for the credential subsystem

271 - - http: use hostname in credential description

272 - - allow the user to configure credential helpers

273 - - look for credentials in config before prompting

274 - - http: use credential API to get passwords

275 - - introduce credentials API

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

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

278 - - improve httpd auth tests

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

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

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

261

282 -Kicked back to 'pu' to allow design level discussions to continue.

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

263

284 -* js/cred-macos-x-keychain-2 (2011-10-06) 1 commit

285 - - contrib: add a pair of credential helpers for Mac OS X's keychain

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

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

267

288 -Kicked back to 'pu' to allow design level discussions to continue.

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

271

290 -* hv/submodule-merge-search (2011-08-26) 5 commits

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

292 - - allow multiple calls to submodule merge search for the same path

293 - - submodule: Demonstrate known breakage during recursive merge

294 - - push: Don't push a repository with unpushed submodules

295 - - push: teach --recurse-submodules the on-demand option

296 - (this branch is tangled with fg/submodule-auto-push.)

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

273

298 -The second from the bottom one needs to be replaced with a properly

299 -written commit log message.

274 +--------------------------------------------------

275 +[Stalled]

276

301 -* fg/submodule-auto-push (2011-09-11) 2 commits

277 +* hv/submodule-merge-search (2011-10-13) 4 commits

278 - submodule.c: make two functions static

279 + - allow multiple calls to submodule merge search for the same path

280 + - push: Don't push a repository with unpushed submodules

281 - push: teach --recurse-submodules the on-demand option

304 - (this branch is tangled with hv/submodule-merge-search.)

282

283 What the topic aims to achieve may make sense, but the implementation

284 looked somewhat suboptimal.

285

286 +The fix-up at the tip queued on fg/submodule-auto-push topic has been

287 +moved to this topic.

288 +

289 * sr/transport-helper-fix-rfc (2011-07-19) 2 commits

290 - t5800: point out that deleting branches does not work

291 - t5800: document inability to push new branch with old content

@@ -313,8 +293,36 @@ looked somewhat suboptimal.

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

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

295

316 ---------------------------------------------------

317 -[Cooking]

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 +

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

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

317 + - revert: Simplify passing command-line arguments around

318 + - revert: Allow mixed pick and revert instructions

319 + - revert: Make commit descriptions in insn sheet optional

320 + - revert: Fix buffer overflow in insn sheet parser

321 + - revert: Simplify getting commit subject

322 + - revert: Free memory after get_message call

323 +

324 +Probably needs a little bit more polish, e.g. squashing the tip fixup into

325 +an earlier one in the series.

326

327 * jc/signed-commit (2011-10-05) 4 commits

328 - commit: teach --gpg-sign option

@@ -322,132 +330,142 @@ command line, 2011-08-25) would help.

330 - rename "match_refs()" to "match_push_refs()"

331 - send-pack: typofix error message

332

325 -This is to replace the earlier "signed push" experiments.

333 +This is to replace the earlier "signed push" experiments. "verify-tag"

334 +equivalent needs to be written before this can proceed. I suspect that

335 +teaching "verify-tag" to notice and also handle signed commits would be

336 +the easiest, but "git tag --verify $commit" might look slightly funny

337 +from the UI POV. I dunno.

338

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

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

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

339 +* jc/lookup-object-hash (2011-08-11) 6 commits

340 + - object hash: replace linear probing with 4-way cuckoo hashing

341 + - object hash: we know the table size is a power of two

342 + - object hash: next_size() helper for readability

343 + - pack-objects --count-only

344 + - object.c: remove duplicated code for object hashing

345 + - object.c: code movement for readability

346

331 -Will merge to 'master' in the third wave.

347 +I do not think there is anything fundamentally wrong with this series, but

348 +the risk of breakage far outweighs observed performance gain in one

349 +particular workload.

350

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

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

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

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

337 - (this branch is used by sg/completion.)

351 +--------------------------------------------------

352 +[Cooking]

353

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

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

341 - + completion: push --set-upstream

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

357

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

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

345 - + Merge branch 'js/maint-no-cherry-pick-head-after-punted' into js/no-cherry-pick-head-after-punted

346 - (this branch uses js/maint-no-cherry-pick-head-after-punted.)

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

359

348 -Will merge to 'master' in the third wave.

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

363

350 -* js/maint-no-cherry-pick-head-after-punted (2011-10-06) 2 commits

351 - + cherry-pick: do not give irrelevant advice when cherry-pick punted

352 - + revert.c: defer writing CHERRY_PICK_HEAD till it is safe to do so

353 - (this branch is used by js/no-cherry-pick-head-after-punted.)

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

365

355 -Will merge to 'maint' later.

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

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

368 + + Teach merge the '[-e|--edit]' option

369

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

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

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

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

371

361 -Will merge to 'master' in the second wave.

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

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

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

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

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

377

367 -Will merge to 'master' in the second wave.

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

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

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

381 + + xdiff: factor out get_func_line()

382

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

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

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

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

384

373 -Will merge to 'master' in the third wave.

385 +* rs/pickaxe (2011-10-07) 7 commits

386 + (merged to 'next' on 2011-10-11 at 27d02b2)

387 + + pickaxe: factor out pickaxe

388 + + pickaxe: give diff_grep the same signature as has_changes

389 + + pickaxe: pass diff_options to contains and has_changes

390 + + pickaxe: factor out has_changes

391 + + pickaxe: plug regex/kws leak

392 + + pickaxe: plug regex leak

393 + + pickaxe: plug diff filespec leak with empty needle

394

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

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

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

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

396

379 -Will merge to 'master' in the third wave.

397 +* sc/difftool-skip (2011-10-14) 2 commits

398 + (merged to 'next' on 2011-10-14 at b91c581)

399 + + t7800: avoid arithmetic expansion notation

400 + (merged to 'next' on 2011-10-11 at 38d7e84)

401 + + git-difftool: allow skipping file by typing 'n' at prompt

402

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

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

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

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

404

385 -Will merge to 'master' in the third wave.

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

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

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

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

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

412

391 -Will merge to 'master' in the second wave.

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

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

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

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

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

418

397 -Will merge to 'master' in the third wave.

419 +* 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

422

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

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

401 - + url.c: simplify is_url()

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

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

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

426

403 -Will merge to 'master' in the third wave.

427 +Will merge to 'next'.

428

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

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

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

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

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

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

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

432

410 -Will merge to 'master' in the third wave.

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

434

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

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

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

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

416 -Will merge to 'master' in the third wave.

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

442

418 -* js/log-show-children (2011-10-04) 1 commit

419 - (merged to 'next' on 2011-10-06 at de8f6f2)

420 - + log --children

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

422 -Will merge to 'master' in the third wave.

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

449

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

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

426 - + name-rev: split usage string

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

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

452 + + Merge branch 'js/maint-no-cherry-pick-head-after-punted' into js/no-cherry-pick-head-after-punted

453 + (this branch uses js/maint-no-cherry-pick-head-after-punted.)

454

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

429 -Will merge to 'master' in the second wave.

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

456

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

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

433 - + test-ctype: add test for is_pathspec_magic

434 - + test-ctype: macrofy

457 +* js/maint-no-cherry-pick-head-after-punted (2011-10-06) 2 commits

458 + + cherry-pick: do not give irrelevant advice when cherry-pick punted

459 + + revert.c: defer writing CHERRY_PICK_HEAD till it is safe to do so

460 + (this branch is used by js/no-cherry-pick-head-after-punted.)

461

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

437 -Will merge to 'master' in the second wave.

462 +Will merge to 'maint' later.

463

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

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

441 - + commit: factor out clear_commit_marks_for_object_array

442 - + checkout: use leak_pending flag

443 - + bundle: use leak_pending flag

444 - + bisect: use leak_pending flag

445 - + revision: add leak_pending flag

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

447 - + revision: factor out add_pending_sha1

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

464 +* js/log-show-children (2011-10-04) 1 commit

465 + (merged to 'next' on 2011-10-06 at de8f6f2)

466 + + log --children

467

450 -Will merge to 'master' in the third wave.

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

469

470 * ph/transport-with-gitfile (2011-10-11) 5 commits

471 (merged to 'next' on 2011-10-12 at 6d58417)

@@ -458,28 +476,7 @@ Will merge to 'master' in the third wave.

476 + Learn to handle gitfiles in enter_repo

477 + enter_repo: do not modify input

478

461 -Will merge to 'master' in the third wave.

462 -

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

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

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

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

467 -

468 -Will merge to 'master' in the third wave.

469 -

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

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

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

473 -

474 -Will merge to 'maint' later.

475 -

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

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

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

479 - + Add Git::config_path()

480 -

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

482 -Will merge to 'master' in the second wave.

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

480

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

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

@@ -488,74 +485,18 @@ Will merge to 'master' in the second wave.

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

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

487

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

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

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

494 -

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

496 -Will merge to 'master' in the third wave.

497 -

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

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

500 - + apply: use OPT_NOOP_NOARG

501 - + revert: use OPT_NOOP_NOARG

502 - + parseopt: add OPT_NOOP_NOARG

503 - + archive.c: use OPT_BOOL()

504 - + parse-options: deprecate OPT_BOOLEAN

505 -

506 -Will merge to 'master' in the second wave.

507 -

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

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

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

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

517 -

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

519 -Will merge to 'master' in the second wave.

520 -

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

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

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

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

525 -

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

527 -Will merge to 'master' in the third wave.

528 -

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

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

531 - + diff: resurrect XDF_NEED_MINIMAL with --minimal

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

533 -

534 -Will merge to 'master' in the third wave.

535 -

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

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

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

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

540 -

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

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

543 -

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

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

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

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

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

549 -

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

551 -Will merge to 'master' in the third wave.

552 -

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.

558 -Will merge to 'master' in the third wave.

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

500

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

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

@@ -572,17 +513,7 @@ Will merge to 'master' in the third wave.

513 + branch: add read_branch_desc() helper function

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

515

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

576 -

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

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

579 - + Accept tags in HEAD or MERGE_HEAD

580 - + merge: remove global variable head[]

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

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

583 -

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

585 -Will merge to 'master' in the third wave.

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)

@@ -592,16 +523,43 @@ Will merge to 'master' in the third wave.

523 + cleanup: use internal memory allocation wrapper functions everywhere

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

525

595 -Re-rolled.

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

527

597 -* jc/lookup-object-hash (2011-08-11) 6 commits

598 - - object hash: replace linear probing with 4-way cuckoo hashing

599 - - object hash: we know the table size is a power of two

600 - - object hash: next_size() helper for readability

601 - - pack-objects --count-only

602 - - object.c: remove duplicated code for object hashing

603 - - object.c: code movement for readability

528 +--------------------------------------------------

529 +[Discarded]

530 +

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

532 + . http_init: accept separate URL parameter

533 + . credential-cache: don't cache items without context

534 + . check_expirations: don't copy over same element

535 + . t0300: add missing EOF terminator for <<

536 + . credential-store: use a better storage format

537 + . t0300: make alternate username tests more robust

538 + . t0300: make askpass tests a little more robust

539 + . credential-cache: fix expiration calculation corner cases

540 + . docs: minor tweaks to credentials API

541 + . credentials: make credential_fill_gently() static

542 + . credentials: add "getpass" helper

543 + . credentials: add "store" helper

544 + . credentials: add "cache" helper

545 + . docs: end-user documentation for the credential subsystem

546 + . http: use hostname in credential description

547 + . allow the user to configure credential helpers

548 + . look for credentials in config before prompting

549 + . http: use credential API to get passwords

550 + . 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.)

556

605 -I do not think there is anything fundamentally wrong with this series, but

606 -the risk of breakage far outweighs observed performance gain in one

607 -particular workload. Will keep it in 'next' at least for one cycle.

557 +Discarded without prejudice to allow design level discussions to continue.

558 +Expecting a re-roll based on jk/http-auth

559 +

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

561 + . 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.)

563 +

564 +Discarded without prejudice to allow design level discussions to continue.

565 +Expecting a re-roll based on jk/http-auth

What's cooking (2011/10 #05)