1 To: git@vger.kernel.org
2 Subject: What's cooking in git.git (Sep 2011, #08; Wed, 28)
3 X-master-at: 8d714b11df2b65e5f4272c1616e561930010be90
4 X-next-at: 65ce6c2cbd3bace125ad01daf7ec705f2a84e58e
6 What's cooking in git.git (Sep 2011, #08; Wed, 28)
7 --------------------------------------------------
9 Here are the topics that have been cooking. Commits prefixed with '-' are
10 only in 'pu' while commits prefixed with '+' are in 'next'.
12 Here are the repositories that have my integration branches:
14 With maint, master, next, pu, todo, html and man:
16 url = git://repo.or.cz/alt-git.git
17 url = https://code.google.com/p/git-core/
19 With only maint, master, html and man:
21 url = git://git.sourceforge.jp/gitroot/git-core/git.git
22 url = git://git-core.git.sourceforge.net/gitroot/git-core/git-core
24 With all the topics and integration branches but not todo, html or man:
26 url = https://github.com/gitster/git
28 Until kernel.org comes back to life, it might be a good idea to
29 tentatively have the following in your $HOME/.gitconfig:
31 [url "http://code.google.com/p/git-core"]
32 insteadOf = git://git.kernel.org/pub/scm/git/git.git
34 --------------------------------------------------
37 * jc/apply-blank-at-eof-fix (2011-09-26) 1 commit
38 - apply --whitespace=error: correctly report new blank lines at end
40 * nd/sparse-doc (2011-09-26) 1 commit
41 - git-read-tree.txt: update sparse checkout examples
43 * jp/get-ref-dir-unsorted (2011-09-26) 1 commit
44 - Don't sort ref_list too early
46 * jc/grep-untracked-exclude (2011-09-28) 2 commits
47 - Merge branch 'jc/maint-grep-untracked-exclude' into jc/grep-untracked-exclude
48 - Merge branch 'jc/maint-grep-untracked-exclude' into jc/grep-untracked-exclude
49 (this branch uses bw/grep-no-index-no-exclude and jc/maint-grep-untracked-exclude.)
51 * jc/maint-grep-untracked-exclude (2011-09-28) 3 commits
52 - grep: rename --exclude to --exclude-standard
53 - grep: --untracked and --exclude tests
54 - grep: teach --untracked and --exclude options
55 (this branch is used by jc/grep-untracked-exclude; uses bw/grep-no-index-no-exclude.)
57 * jc/parse-options-boolean (2011-09-28) 5 commits
58 - apply: use OPT_NOOP_NOARG
59 - revert: use OPT_NOOP_NOARG
60 - parseopt: add OPT_NOOP_NOARG
61 - archive.c: use OPT_BOOL()
62 - parse-options: deprecate OPT_BOOLEAN
64 * mh/maint-notes-merge-pathbuf-fix (2011-09-27) 1 commit
65 - notes_merge_commit(): do not pass temporary buffer to other function
67 * ph/push-to-delete-nothing (2011-09-28) 2 commits
69 - receive-pack: don't pass non-existent refs to post-{receive,update} hooks in push deletions
71 * ps/gitweb-js-with-lineno (2011-09-27) 1 commit
72 - gitweb: Fix links to lines in blobs when javascript-actions are enabled
74 * zj/send-email-authen-sasl (2011-09-28) 1 commit
75 - send-email: auth plain/login fix
77 --------------------------------------------------
78 [Graduated to "master"]
80 * jc/namespace-doc-with-old-asciidoc (2011-09-16) 1 commit
81 + Documentation/gitnamespaces.txt: cater to older asciidoc
83 It turns out that the version of AsciiDoc that has troubles with the
84 mark-up this patch works around is not quite old enough to be dismissed
87 --------------------------------------------------
90 * hv/submodule-merge-search (2011-08-26) 5 commits
91 - submodule: Search for merges only at end of recursive merge
92 - allow multiple calls to submodule merge search for the same path
93 - submodule: Demonstrate known breakage during recursive merge
94 - push: Don't push a repository with unpushed submodules
95 (merged to 'next' on 2011-08-24 at 398e764)
96 + push: teach --recurse-submodules the on-demand option
97 (this branch is tangled with fg/submodule-auto-push.)
99 The second from the bottom one needs to be replaced with a properly
100 written commit log message.
102 * jc/signed-push (2011-09-12) 7 commits
103 - push -s: support pre-receive-signature hook
104 - push -s: receiving end
105 - push -s: send signed push certificate
107 - Split GPG interface into its own helper library
108 - rename "match_refs()" to "match_push_refs()"
109 - send-pack: typofix error message
110 (this branch uses jc/run-receive-hook-cleanup; is tangled with jc/signed-push-3.)
112 This was the v2 that updated notes tree on the receiving end.
114 * jc/signed-push-3 (2011-09-12) 4 commits
115 . push -s: signed push
116 - Split GPG interface into its own helper library
117 - rename "match_refs()" to "match_push_refs()"
118 - send-pack: typofix error message
119 (this branch uses jc/run-receive-hook-cleanup; is tangled with jc/signed-push.)
121 This is the third edition, that moves the preparation of the notes tree to
124 I expect that both of these topics will be discarded.
126 * jk/add-i-hunk-filter (2011-07-27) 5 commits
127 (merged to 'next' on 2011-08-11 at 8ff9a56)
128 + add--interactive: add option to autosplit hunks
129 + add--interactive: allow negatation of hunk filters
130 + add--interactive: allow hunk filtering on command line
131 + add--interactive: factor out regex error handling
132 + add--interactive: refactor patch mode argument processing
136 * jh/receive-count-limit (2011-05-23) 10 commits
137 - receive-pack: Allow server to refuse pushes with too many objects
138 - pack-objects: Estimate pack size; abort early if pack size limit is exceeded
139 - send-pack/receive-pack: Allow server to refuse pushing too large packs
140 - pack-objects: Allow --max-pack-size to be used together with --stdout
141 - send-pack/receive-pack: Allow server to refuse pushes with too many commits
142 - pack-objects: Teach new option --max-commit-count, limiting #commits in pack
143 - receive-pack: Prepare for addition of the new 'limit-*' family of capabilities
144 - Tighten rules for matching server capabilities in server_supports()
145 - send-pack: Attempt to retrieve remote status even if pack-objects fails
146 - Update technical docs to reflect side-band-64k capability in receive-pack
148 Would need another round to separate per-pack and per-session limits.
150 * jk/generation-numbers (2011-09-11) 8 commits
151 - metadata-cache.c: make two functions static
152 - limit "contains" traversals based on commit generation
153 - check commit generation cache validity against grafts
154 - pretty: support %G to show the generation number of a commit
155 - commit: add commit_generation function
156 - add metadata-cache infrastructure
157 - decorate: allow storing values instead of pointers
158 - Merge branch 'jk/tag-contains-ab' (early part) into HEAD
160 The initial "tag --contains" de-pessimization without need for generation
161 numbers is already in; backburnered.
163 * sr/transport-helper-fix-rfc (2011-07-19) 2 commits
164 - t5800: point out that deleting branches does not work
165 - t5800: document inability to push new branch with old content
167 Perhaps 281eee4 (revision: keep track of the end-user input from the
168 command line, 2011-08-25) in bk/ancestry-path would help.
170 * po/cygwin-backslash (2011-08-05) 2 commits
171 - On Cygwin support both UNIX and DOS style path-names
172 - git-compat-util: add generic find_last_dir_sep that respects is_dir_sep
174 Incomplete with respect to backslash processing in prefix_filename(), and
175 also loses the ability to escape glob specials. Perhaps drop?
177 --------------------------------------------------
180 * jc/maint-diffstat-numstat-context (2011-09-22) 1 commit
181 (merged to 'next' on 2011-09-26 at 12539ab)
182 + diff: teach --stat/--numstat to honor -U$num
184 "diff" is allowed to match the common lines differently depending on how
185 many context lines it is showing, so running --(num)stat with 0 lines of
186 context internally gives a result that may be surprising to some people.
188 * nd/maint-sparse-errors (2011-09-22) 2 commits
189 (merged to 'next' on 2011-09-26 at cdcdec5)
190 + Add explanation why we do not allow to sparse checkout to empty working tree
191 + sparse checkout: show error messages when worktree shaping fails
193 * rs/diff-cleanup-records-fix (2011-09-26) 1 commit
194 (merged to 'next' on 2011-09-27 at 3bd75d8)
195 + Revert removal of multi-match discard heuristic in 27af01
197 * di/fast-import-empty-tag-note-fix (2011-09-22) 2 commits
198 - fast-import: don't allow to note on empty branch
199 - fast-import: don't allow to tag empty branch
203 * js/check-attr-cached (2011-09-22) 2 commits
204 (merged to 'next' on 2011-09-27 at 74d7b66)
205 + t0003: remove extra whitespaces
206 + Teach '--cached' option to check-attr
208 * bw/grep-no-index-no-exclude (2011-09-15) 2 commits
209 (merged to 'next' on 2011-09-26 at 776f13b)
210 + grep --no-index: don't use git standard exclusions
211 + grep: do not use --index in the short usage output
212 (this branch is used by jc/grep-untracked-exclude and jc/maint-grep-untracked-exclude.)
214 * jc/want-commit (2011-09-15) 1 commit
215 (merged to 'next' on 2011-09-26 at 5841512)
216 + Allow git merge ":/<pattern>"
218 * jc/ls-remote-short-help (2011-09-16) 1 commit
219 (merged to 'next' on 2011-09-26 at e24a27a)
220 + ls-remote: a lone "-h" is asking for help
222 * jc/maint-bundle-too-quiet (2011-09-19) 1 commit
223 (merged to 'next' on 2011-09-26 at ba140d4)
224 + Teach progress eye-candy to fetch_refs_from_bundle()
226 * jk/filter-branch-require-clean-work-tree (2011-09-15) 1 commit
227 (merged to 'next' on 2011-09-26 at 206a74a)
228 + filter-branch: use require_clean_work_tree
230 * jn/gitweb-highlite-sanitise (2011-09-16) 1 commit
231 (merged to 'next' on 2011-09-26 at c79390a)
232 + gitweb: Strip non-printable characters from syntax highlighter output
234 * mh/check-ref-format-3 (2011-09-16) 22 commits
235 - add_ref(): verify that the refname is formatted correctly
236 - resolve_ref(): expand documentation
237 - resolve_ref(): also treat a too-long SHA1 as invalid
238 - resolve_ref(): emit warnings for improperly-formatted references
239 - resolve_ref(): verify that the input refname has the right format
240 - remote: avoid passing NULL to read_ref()
241 - remote: use xstrdup() instead of strdup()
242 - resolve_ref(): do not follow incorrectly-formatted symbolic refs
243 - resolve_ref(): extract a function get_packed_ref()
244 - resolve_ref(): turn buffer into a proper string as soon as possible
245 - resolve_ref(): only follow a symlink that contains a valid, normalized refname
246 - resolve_ref(): use prefixcmp()
247 - resolve_ref(): explicitly fail if a symlink is not readable
248 - Change check_refname_format() to reject unnormalized refnames
249 - Inline function refname_format_print()
250 - Make collapse_slashes() allocate memory for its result
251 - Do not allow ".lock" at the end of any refname component
252 - Refactor check_refname_format()
253 - Change check_ref_format() to take a flags argument
254 - Change bad_ref_char() to return a boolean value
255 - git check-ref-format: add options --allow-onelevel and --refspec-pattern
256 - t1402: add some more tests
258 * cn/eradicate-working-copy (2011-09-21) 1 commit
259 (merged to 'next' on 2011-09-26 at 2683d36)
260 + Remove 'working copy' from the documentation and C code
262 * js/bisect-no-checkout (2011-09-21) 1 commit
263 (merged to 'next' on 2011-09-21 at e94ad3e)
264 + bisect: fix exiting when checkout failed in bisect_start()
266 * mg/maint-doc-sparse-checkout (2011-09-21) 3 commits
267 (merged to 'next' on 2011-09-21 at f316dec)
268 + git-read-tree.txt: correct sparse-checkout and skip-worktree description
269 + git-read-tree.txt: language and typography fixes
270 + unpack-trees: print "Aborting" to stderr
272 * ms/patch-id-with-overlong-line (2011-09-22) 1 commit
273 (merged to 'next' on 2011-09-26 at a33d0b2)
274 + patch-id.c: use strbuf instead of a fixed buffer
276 * sn/doc-update-index-assume-unchanged (2011-09-21) 1 commit
277 (merged to 'next' on 2011-09-21 at 325e796)
278 + Documentation/git-update-index: refer to 'ls-files'
280 * jc/request-pull-show-head-4 (2011-09-21) 7 commits
281 - request-pull: use the branch description
282 - request-pull: state what commit to expect
283 - request-pull: modernize style
284 - branch: teach --edit-description option
285 - format-patch: use branch description in cover letter
286 - branch: add read_branch_desc() helper function
287 - Merge branch 'bk/ancestry-path' into jc/branch-desc
288 (this branch uses bk/ancestry-path.)
290 * jm/mergetool-pathspec (2011-09-26) 2 commits
291 (merged to 'next' on 2011-09-26 at f699566)
292 + mergetool: no longer need to save standard input
293 + mergetool: Use args as pathspec to unmerged files
295 * nd/maint-autofix-tag-in-head (2011-09-18) 4 commits
296 (merged to 'next' on 2011-09-27 at dc8e2e3)
297 + Accept tags in HEAD or MERGE_HEAD
298 + merge: remove global variable head[]
299 + merge: use return value of resolve_ref() to determine if HEAD is invalid
300 + merge: keep stash[] a local variable
302 * jk/maint-fetch-submodule-check-fix (2011-09-12) 1 commit
303 (merged to 'next' on 2011-09-12 at 3c73b8c)
304 + fetch: avoid quadratic loop checking for updated submodules
305 (this branch is used by jk/argv-array.)
307 This probably can wait, as long as the other half of the regression fix
308 is in the upcoming release.
310 * bc/attr-ignore-case (2011-09-14) 5 commits
311 (merged to 'next' on 2011-09-26 at 1e0814c)
312 + attr: read core.attributesfile from git_default_core_config
313 + attr.c: respect core.ignorecase when matching attribute patterns
314 + builtin/mv.c: plug miniscule memory leak
315 + cleanup: use internal memory allocation wrapper functions everywhere
316 + attr.c: avoid inappropriate access to strbuf "buf" member
318 * jc/maint-fsck-fwrite-size-check (2011-09-11) 1 commit
319 (merged to 'next' on 2011-09-16 at 2258f11)
320 + fsck: do not abort upon finding an empty blob
322 * jk/argv-array (2011-09-14) 7 commits
323 (merged to 'next' on 2011-09-16 at 90feab4)
324 + run_hook: use argv_array API
325 + checkout: use argv_array API
326 + bisect: use argv_array API
327 + quote: provide sq_dequote_to_argv_array
328 + refactor argv_array into generic code
329 + quote.h: fix bogus comment
330 + add sha1_array API docs
331 (this branch uses jk/maint-fetch-submodule-check-fix.)
333 * js/cred-macos-x-keychain-2 (2011-09-14) 1 commit
334 (merged to 'next' on 2011-09-26 at 4f289a4)
335 + contrib: add a pair of credential helpers for Mac OS X's keychain
336 (this branch uses jk/http-auth-keyring.)
338 Welcome addition to build our confidence in the jk/http-auth-keyring topic.
340 * rj/maint-t9159-svn-rev-notation (2011-09-21) 1 commit
341 (merged to 'next' on 2011-09-26 at 525a567)
342 + t9159-*.sh: skip for mergeinfo test for svn <= 1.4
344 * tr/doc-note-rewrite (2011-09-13) 1 commit
345 (merged to 'next' on 2011-09-16 at 5fe813a)
346 + Documentation: basic configuration of notes.rewriteRef
348 Updated to a safer wording.
350 * jk/default-attr (2011-09-12) 1 commit
351 - attr: map builtin userdiff drivers to well-known extensions
353 Will be re-rolled after 1.7.7 final.
355 * hl/iso8601-more-zone-formats (2011-09-12) 1 commit
356 (merged to 'next' on 2011-09-12 at 270f5c7)
357 + date.c: Support iso8601 timezone formats
359 * jc/run-receive-hook-cleanup (2011-09-12) 1 commit
360 (merged to 'next' on 2011-09-12 at 68dd431)
361 + refactor run_receive_hook()
362 (this branch is used by jc/signed-push and jc/signed-push-3.)
364 Just to make it easier to run a hook that reads from its standard input.
366 * jk/for-each-ref (2011-09-08) 5 commits
367 (merged to 'next' on 2011-09-14 at 36ed515)
368 + for-each-ref: add split message parts to %(contents:*).
369 + for-each-ref: handle multiline subjects like --pretty
370 + for-each-ref: refactor subject and body placeholder parsing
371 + t6300: add more body-parsing tests
372 + t7004: factor out gpg setup
374 * wh/normalize-alt-odb-path (2011-09-07) 1 commit
375 (merged to 'next' on 2011-09-14 at 96f722b)
376 + sha1_file: normalize alt_odb path before comparing and storing
378 * fk/use-kwset-pickaxe-grep-f (2011-09-11) 2 commits
379 (merged to 'next' on 2011-09-14 at 436d858)
380 + obstack.c: Fix some sparse warnings
381 + sparse: Fix an "Using plain integer as NULL pointer" warning
383 In general we would prefer to see these fixed at the upstream first, but
384 we have essentially forked from them at their last GPLv2 versions...
386 * jc/make-static (2011-09-14) 4 commits
387 (merged to 'next' on 2011-09-14 at c5943ff)
388 + exec_cmd.c: prepare_git_cmd() is sometimes used
389 + environment.c: have_git_dir() has users on Cygwin
390 (merged to 'next' on 2011-09-11 at 2acb0af)
391 + vcs-svn: remove unused functions and make some static
392 + make-static: master
394 With a few fix-ups; probably needs to be ejected after 1.7.7 happens.
396 * rj/quietly-create-dep-dir (2011-09-11) 1 commit
397 (merged to 'next' on 2011-09-12 at 93d1c6b)
398 + Makefile: Make dependency directory creation less noisy
400 * mz/remote-rename (2011-09-11) 4 commits
401 (merged to 'next' on 2011-09-26 at 5e64f68)
402 + remote: only update remote-tracking branch if updating refspec
403 + remote rename: warn when refspec was not updated
404 + remote: "rename o foo" should not rename ref "origin/bar"
405 + remote: write correct fetch spec when renaming remote 'remote'
407 * cb/common-prefix-unification (2011-09-12) 3 commits
408 (merged to 'next' on 2011-09-14 at 24f571f)
409 + rename pathspec_prefix() to common_prefix() and move to dir.[ch]
410 + consolidate pathspec_prefix and common_prefix
411 + remove prefix argument from pathspec_prefix
413 * cb/send-email-help (2011-09-12) 1 commit
414 (merged to 'next' on 2011-09-14 at ae71999)
415 + send-email: add option -h
417 A separate set of patches to remove the hidden fully-spelled "help" from
418 other commands would be nice to have as companion patches as well.
420 * jc/fetch-pack-fsck-objects (2011-09-04) 3 commits
421 (merged to 'next' on 2011-09-12 at a031347)
422 + test: fetch/receive with fsckobjects
423 + transfer.fsckobjects: unify fetch/receive.fsckobjects
424 + fetch.fsckobjects: verify downloaded objects
426 We had an option to verify the sent objects before accepting a push but
427 lacked the corresponding option when fetching. In the light of the recent
428 k.org incident, a change like this would be a good addition.
430 * jc/fetch-verify (2011-09-01) 3 commits
431 (merged to 'next' on 2011-09-12 at 3f491ab)
432 + fetch: verify we have everything we need before updating our ref
433 + rev-list --verify-object
434 + list-objects: pass callback data to show_objects()
435 (this branch uses jc/traverse-commit-list; is tangled with jc/receive-verify.)
437 During a fetch, we verify that the pack stream is self consistent,
438 but did not verify that the refs that are updated are consistent with
439 objects contained in the packstream, and this adds such a check.
441 * jc/receive-verify (2011-09-09) 6 commits
442 (merged to 'next' on 2011-09-12 at 856de78)
443 + receive-pack: check connectivity before concluding "git push"
444 + check_everything_connected(): libify
445 + check_everything_connected(): refactor to use an iterator
446 + fetch: verify we have everything we need before updating our ref
447 + rev-list --verify-object
448 + list-objects: pass callback data to show_objects()
449 (this branch uses jc/traverse-commit-list; is tangled with jc/fetch-verify.)
451 While accepting a push, we verify that the pack stream is self consistent,
452 but did not verify that the refs the push updates are consistent with
453 objects contained in the packstream, and this adds such a check.
455 * jn/maint-http-error-message (2011-09-06) 2 commits
456 (merged to 'next' on 2011-09-12 at a843f03)
457 + http: avoid empty error messages for some curl errors
458 + http: remove extra newline in error message
460 * bk/ancestry-path (2011-09-15) 4 commits
461 (merged to 'next' on 2011-09-15 at aa64d04)
462 + t6019: avoid refname collision on case-insensitive systems
463 (merged to 'next' on 2011-09-02 at d05ba5d)
464 + revision: do not include sibling history in --ancestry-path output
465 + revision: keep track of the end-user input from the command line
466 + rev-list: Demonstrate breakage with --ancestry-path --all
467 (this branch is used by jc/request-pull-show-head-4.)
469 * mg/branch-list (2011-09-13) 7 commits
470 (merged to 'next' on 2011-09-14 at 6610a2e)
471 + t3200: clean up checks for file existence
472 (merged to 'next' on 2011-09-11 at 20a9cdb)
473 + branch: -v does not automatically imply --list
474 (merged to 'next' on 2011-09-02 at b818eae)
475 + branch: allow pattern arguments
476 + branch: introduce --list option
477 + git-branch: introduce missing long forms for the options
478 + git-tag: introduce long forms for the options
479 + t6040: test branch -vv
481 * mm/rebase-i-exec-edit (2011-08-26) 2 commits
482 (merged to 'next' on 2011-09-02 at e75b1b9)
483 + rebase -i: notice and warn if "exec $cmd" modifies the index or the working tree
484 + rebase -i: clean error message for --continue after failed exec
486 * mm/mediawiki-as-a-remote (2011-09-28) 6 commits
487 (merged to 'next' on 2011-09-28 at a1c9ae5)
488 + git-remote-mediawiki: allow a domain to be set for authentication
489 (merged to 'next' on 2011-09-27 at 7ce8254)
490 + git-remote-mediawiki: obey advice.pushNonFastForward
491 + git-remote-mediawiki: set 'basetimestamp' to let the wiki handle conflicts
492 + git-remote-mediawiki: trivial fixes
493 (merged to 'next' on 2011-09-12 at 163c6a5)
494 + git-remote-mediawiki: allow push to set MediaWiki metadata
495 + Add a remote helper to interact with mediawiki (fetch & push)
499 * bc/unstash-clean-crufts (2011-08-27) 4 commits
500 (merged to 'next' on 2011-09-02 at 7bfd66f)
501 + git-stash: remove untracked/ignored directories when stashed
502 + t/t3905: add missing '&&' linkage
503 + git-stash.sh: fix typo in error message
504 + t/t3905: use the name 'actual' for test output, swap arguments to test_cmp
506 * da/make-auto-header-dependencies (2011-08-30) 1 commit
507 (merged to 'next' on 2011-09-02 at e04a4af)
508 + Makefile: Improve compiler header dependency check
509 (this branch uses fk/make-auto-header-dependencies.)
511 * gb/am-hg-patch (2011-08-29) 1 commit
512 (merged to 'next' on 2011-09-02 at 3edfe4c)
513 + am: preliminary support for hg patches
515 * jc/diff-index-unpack (2011-08-29) 3 commits
516 (merged to 'next' on 2011-09-02 at 4206bd9)
517 + diff-index: pass pathspec down to unpack-trees machinery
518 + unpack-trees: allow pruning with pathspec
519 + traverse_trees(): allow pruning with pathspec
521 * nm/grep-object-sha1-lock (2011-08-30) 1 commit
522 (merged to 'next' on 2011-09-02 at 336f57d)
523 + grep: Fix race condition in delta_base_cache
525 * tr/mergetool-valgrind (2011-08-30) 1 commit
526 (merged to 'next' on 2011-09-02 at f5f2c61)
527 + Symlink mergetools scriptlets into valgrind wrappers
529 * fg/submodule-auto-push (2011-09-11) 2 commits
530 (merged to 'next' on 2011-09-11 at 3fc86f7)
531 + submodule.c: make two functions static
532 (merged to 'next' on 2011-08-24 at 398e764)
533 + push: teach --recurse-submodules the on-demand option
534 (this branch is tangled with hv/submodule-merge-search.)
536 What the topic aims to achieve may make sense, but the implementation
537 looked somewhat suboptimal.
539 * jc/traverse-commit-list (2011-08-22) 3 commits
540 (merged to 'next' on 2011-08-24 at df50dd7)
541 + revision.c: update show_object_with_name() without using malloc()
542 + revision.c: add show_object_with_name() helper function
543 + rev-list: fix finish_object() call
544 (this branch is used by jc/fetch-verify and jc/receive-verify.)
546 * fk/make-auto-header-dependencies (2011-08-18) 1 commit
547 (merged to 'next' on 2011-08-24 at 3da2c25)
548 + Makefile: Use computed header dependencies if the compiler supports it
549 (this branch is used by da/make-auto-header-dependencies.)
551 * mh/iterate-refs (2011-09-11) 7 commits
552 (merged to 'next' on 2011-09-27 at c289699)
553 + refs.c: make create_cached_refs() static
554 + Retain caches of submodule refs
555 + Store the submodule name in struct cached_refs
556 + Allocate cached_refs objects dynamically
557 + Change the signature of read_packed_refs()
558 + Access reference caches only through new function get_cached_refs()
559 + Extract a function clear_cached_refs()
561 I did not see anything fundamentally wrong with this series, but it was
562 unclear what the benefit of these changes are. If the series were to read
563 parts of the ref hierarchy (like refs/heads/) lazily, the story would
564 have been different, though.
566 * hv/submodule-update-none (2011-08-11) 2 commits
567 (merged to 'next' on 2011-08-24 at 5302fc1)
568 + add update 'none' flag to disable update of submodule by default
569 + submodule: move update configuration variable further up
571 * jc/lookup-object-hash (2011-08-11) 6 commits
572 (merged to 'next' on 2011-08-24 at 5825411)
573 + object hash: replace linear probing with 4-way cuckoo hashing
574 + object hash: we know the table size is a power of two
575 + object hash: next_size() helper for readability
576 + pack-objects --count-only
577 + object.c: remove duplicated code for object hashing
578 + object.c: code movement for readability
580 I do not think there is anything fundamentally wrong with this series, but
581 the risk of breakage far outweighs observed performance gain in one
582 particular workload. Will keep it in 'next' at least for one cycle.
584 * fg/submodule-git-file-git-dir (2011-08-22) 2 commits
585 (merged to 'next' on 2011-08-23 at 762194e)
586 + Move git-dir for submodules
587 + rev-parse: add option --resolve-git-dir <path>
589 I do not think there is anything fundamentally wrong with this series, but
590 the risk of breakage outweighs any benefit for having this new
591 feature. Will keep it in 'next' at least for one cycle.
593 * jk/http-auth-keyring (2011-09-28) 22 commits
594 (merged to 'next' on 2011-09-28 at 65ce6c2)
595 + credential-cache: don't cache items without context
596 (merged to 'next' on 2011-09-16 at b4195eb)
597 + check_expirations: don't copy over same element
598 + t0300: add missing EOF terminator for <<
599 (merged to 'next' on 2011-09-14 at 589c7c9)
600 + credential-store: use a better storage format
601 + t0300: make alternate username tests more robust
602 + t0300: make askpass tests a little more robust
603 + credential-cache: fix expiration calculation corner cases
604 + docs: minor tweaks to credentials API
605 (merged to 'next' on 2011-09-11 at 491ce6a)
606 + credentials: make credential_fill_gently() static
607 (merged to 'next' on 2011-08-03 at b06e80e)
608 + credentials: add "getpass" helper
609 + credentials: add "store" helper
610 + credentials: add "cache" helper
611 + docs: end-user documentation for the credential subsystem
612 + http: use hostname in credential description
613 + allow the user to configure credential helpers
614 + look for credentials in config before prompting
615 + http: use credential API to get passwords
616 + introduce credentials API
617 + http: retry authentication failures for all http requests
618 + remote-curl: don't retry auth failures with dumb protocol
619 + improve httpd auth tests
620 + url: decode buffers that are not NUL-terminated
621 (this branch is tangled with js/cred-macos-x-keychain-2.)
623 * rr/revert-cherry-pick-continue (2011-09-11) 19 commits
624 (merged to 'next' on 2011-09-11 at 7d78054)
625 + builtin/revert.c: make commit_list_append() static
626 (merged to 'next' on 2011-08-24 at 712c115)
627 + revert: Propagate errors upwards from do_pick_commit
628 + revert: Introduce --continue to continue the operation
629 + revert: Don't implicitly stomp pending sequencer operation
630 + revert: Remove sequencer state when no commits are pending
631 + reset: Make reset remove the sequencer state
632 + revert: Introduce --reset to remove sequencer state
633 + revert: Make pick_commits functionally act on a commit list
634 + revert: Save command-line options for continuing operation
635 + revert: Save data for continuing after conflict resolution
636 + revert: Don't create invalid replay_opts in parse_args
637 + revert: Separate cmdline parsing from functional code
638 + revert: Introduce struct to keep command-line options
639 + revert: Eliminate global "commit" variable
640 + revert: Rename no_replay to record_origin
641 + revert: Don't check lone argument in get_encoding
642 + revert: Simplify and inline add_message_to_msg
643 + config: Introduce functions to write non-standard file
644 + advice: Introduce error_resolve_conflict
646 --------------------------------------------------
649 * js/cred-macos-x-keychain (2011-09-11) 15 commits
650 (merged to 'next' on 2011-09-12 at 8d17f94)
651 + contrib: add a credential helper for Mac OS X's keychain
652 (merged to 'next' on 2011-09-11 at 491ce6a)
653 + credentials: make credential_fill_gently() static
654 (merged to 'next' on 2011-08-03 at b06e80e)
655 + credentials: add "getpass" helper
656 + credentials: add "store" helper
657 + credentials: add "cache" helper
658 + docs: end-user documentation for the credential subsystem
659 + http: use hostname in credential description
660 + allow the user to configure credential helpers
661 + look for credentials in config before prompting
662 + http: use credential API to get passwords
663 + introduce credentials API
664 + http: retry authentication failures for all http requests
665 + remote-curl: don't retry auth failures with dumb protocol
666 + improve httpd auth tests
667 + url: decode buffers that are not NUL-terminated
668 (this branch is tangled with jk/http-auth-keyring and js/cred-macos-x-keychain-2.)
670 Reverted out of 'next'.
672 * jc/reflog-walk-use-only-nsha1 (2011-09-13) 4 commits
673 . (baloon) teach reflog-walk to look at only new-sha1 field
674 + environment.c: have_git_dir() has users on Cygwin
675 (merged to 'next' on 2011-09-11 at 2acb0af)
676 + vcs-svn: remove unused functions and make some static
677 + make-static: master
678 (this branch is tangled with jc/make-static.)
680 * hw/maint-abspath-cwd-limit (2011-09-21) 3 commits
681 (merged to 'next' on 2011-09-21 at 210cf9a)
682 + Revert 622fea4 (abspath.c: increase array size of cwd variable)
683 (merged to 'next' on 2011-09-19 at 7d5e921)
684 + abspath.c: increase array size of cwd variable to PATH_MAX
685 + path.c: increase array size of cwd variable to PATH_MAX
687 Reverted out of 'next'.
689 * jc/request-pull-show-head (2011-09-13) 2 commits
690 (merged to 'next' on 2011-09-13 at c82fb3a)
691 + Revert "State what commit to expect in request-pull"
692 (merged to 'next' on 2011-09-12 at c1c7b73)
693 + State what commit to expect in request-pull
695 Reverted out of 'next'.