To: git@vger.kernel.org
-Subject: What's cooking in git.git (Jan 2012, #05; Mon, 23)
-X-master-at: 69204d0ab18d28d07ee2c8c9b50bbf5bd80343ab
-X-next-at: bee31c659a45b507c95fb5bc777eb04fad181b4d
+Subject: What's cooking in git.git (Jan 2012, #06; Fri, 27)
+X-master-at: 828ea97de486c1693d6e4f2c7347acb50235a85d
+X-next-at: db81badb8172f91f47582d00408dd94bbe9b4d93
-What's cooking in git.git (Jan 2012, #05; Mon, 23)
+What's cooking in git.git (Jan 2012, #06; Fri, 27)
--------------------------------------------------
Here are the topics that have been cooking. Commits prefixed with '-' are
only in 'pu' (proposed updates) while commits prefixed with '+' are in
'next'.
+Now 1.7.9 is out, the development cycle for 1.7.10 will start shortly.
+
Here are the repositories that have my integration branches:
With maint, master, next, pu, todo:
https://github.com/gitster/git-{htmldocs,manpages}.git/
--------------------------------------------------
-[Graduated to "master"]
+[New Topics]
+
+* jl/submodule-re-add (2012-01-24) 1 commit
+ (merged to 'next' on 2012-01-26 at 482553e)
+ + submodule add: fix breakage when re-adding a deep submodule
-* jc/pull-signed-tag-doc (2012-01-17) 1 commit
- + pulling signed tag: add howto document
+Low-impact fix to an old issue.
+Will merge early in the next cycle.
-* jk/credentials (2012-01-16) 4 commits
- (merged to 'next' on 2012-01-16 at 2810b82)
- + credential-cache: ignore "connection refused" errors
- (merged to 'next' on 2012-01-16 at 1c6c94a)
- + unix-socket: do not let close() or chdir() clobber errno during cleanup
- + credential-cache: report more daemon connection errors
- + unix-socket: handle long socket pathnames
+* jn/svn-fe (2012-01-27) 44 commits
+ - vcs-svn/svndiff.c: squelch false "unused" warning from gcc
+ - Merge branch 'svn-fe' of git://repo.or.cz/git/jrn into jn/svn-fe
+ - vcs-svn: reset first_commit_done in fast_export_init
+ - Merge branch 'db/text-delta' into svn-fe
+ - vcs-svn: do not initialize report_buffer twice
+ - Merge branch 'db/text-delta' into svn-fe
+ - vcs-svn: avoid hangs from corrupt deltas
+ - vcs-svn: guard against overflow when computing preimage length
+ - Merge branch 'db/delta-applier' into db/text-delta
+ - vcs-svn: implement text-delta handling
+ - Merge branch 'db/delta-applier' into db/text-delta
+ - Merge branch 'db/delta-applier' into svn-fe
+ - vcs-svn: cap number of bytes read from sliding view
+ - test-svn-fe: split off "test-svn-fe -d" into a separate function
+ - vcs-svn: let deltas use data from preimage
+ - vcs-svn: let deltas use data from postimage
+ - vcs-svn: verify that deltas consume all inline data
+ - vcs-svn: implement copyfrom_data delta instruction
+ - vcs-svn: read instructions from deltas
+ - vcs-svn: read inline data from deltas
+ - vcs-svn: read the preimage when applying deltas
+ - vcs-svn: parse svndiff0 window header
+ - vcs-svn: skeleton of an svn delta parser
+ - vcs-svn: make buffer_read_binary API more convenient
+ - vcs-svn: learn to maintain a sliding view of a file
+ - Makefile: list one vcs-svn/xdiff object or header per line
+ - Merge branch 'db/svn-fe-code-purge' into svn-fe
+ - vcs-svn: drop obj_pool
+ - vcs-svn: drop treap
+ - vcs-svn: drop string_pool
+ - vcs-svn: pass paths through to fast-import
+ - Merge branch 'db/strbufs-for-metadata' into db/svn-fe-code-purge
+ - Merge branch 'db/length-as-hash' (early part) into db/svn-fe-code-purge
+ - Merge branch 'db/vcs-svn-incremental' into svn-fe
+ - vcs-svn: avoid using ls command twice
+ - vcs-svn: use mark from previous import for parent commit
+ - vcs-svn: handle filenames with dq correctly
+ - vcs-svn: quote paths correctly for ls command
+ - vcs-svn: eliminate repo_tree structure
+ - vcs-svn: add a comment before each commit
+ - vcs-svn: save marks for imported commits
+ - vcs-svn: use higher mark numbers for blobs
+ - vcs-svn: set up channel to read fast-import cat-blob response
+ - Merge commit 'v1.7.5' into svn-fe
-Minor fix-ups to the new feature.
+Will merge early in the next cycle.
-* mh/maint-show-ref-doc (2012-01-13) 2 commits
- (merged to 'next' on 2012-01-16 at 8573f09)
- + git-show-ref doc: typeset regexp in fixed width font
- + git-show-ref: fix escaping in asciidoc source
+--------------------------------------------------
+[Stalled]
-* nd/pathspec-recursion-cleanup (2012-01-16) 2 commits
- (merged to 'next' on 2012-01-16 at 0189264)
- + diff-index: enable recursive pathspec matching in unpack_trees
- + Document limited recursion pathspec matching with wildcards
+* jc/advise-push-default (2011-12-18) 1 commit
+ - push: hint to use push.default=upstream when appropriate
-* tr/maint-word-diff-incomplete-line (2012-01-12) 1 commit
- (merged to 'next' on 2012-01-16 at 58ddaaf)
- + word-diff: ignore '\ No newline at eof' marker
+Peff had a good suggestion outlining an updated code structure so that
+somebody new can try to dip his or her toes in the development. Any
+takers?
+
+Waiting for a reroll.
+
+* mh/ref-api-rest (2011-12-12) 35 commits
+ . repack_without_ref(): call clear_packed_ref_cache()
+ . read_packed_refs(): keep track of the directory being worked in
+ . is_refname_available(): query only possibly-conflicting references
+ . refs: read loose references lazily
+ . read_loose_refs(): take a (ref_entry *) as argument
+ . struct ref_dir: store a reference to the enclosing ref_cache
+ . sort_ref_dir(): take (ref_entry *) instead of (ref_dir *)
+ . do_for_each_ref_in_dir*(): take (ref_entry *) instead of (ref_dir *)
+ . add_entry(): take (ref_entry *) instead of (ref_dir *)
+ . search_ref_dir(): take (ref_entry *) instead of (ref_dir *)
+ . find_containing_direntry(): use (ref_entry *) instead of (ref_dir *)
+ . add_ref(): take (ref_entry *) instead of (ref_dir *)
+ . read_packed_refs(): take (ref_entry *) instead of (ref_dir *)
+ . find_ref(): take (ref_entry *) instead of (ref_dir *)
+ . is_refname_available(): take (ref_entry *) instead of (ref_dir *)
+ . get_loose_refs(): return (ref_entry *) instead of (ref_dir *)
+ . get_packed_refs(): return (ref_entry *) instead of (ref_dir *)
+ . refs: wrap top-level ref_dirs in ref_entries
+ . get_ref_dir(): keep track of the current ref_dir
+ . do_for_each_ref(): only iterate over the subtree that was requested
+ . refs: sort ref_dirs lazily
+ . sort_ref_dir(): do not sort if already sorted
+ . refs: store references hierarchically
+ . refs.c: rename ref_array -> ref_dir
+ . struct ref_entry: nest the value part in a union
+ . check_refname_component(): return 0 for zero-length components
+ . free_ref_entry(): new function
+ . refs.c: reorder definitions more logically
+ . is_refname_available(): reimplement using do_for_each_ref_in_array()
+ . names_conflict(): simplify implementation
+ . names_conflict(): new function, extracted from is_refname_available()
+ . repack_without_ref(): reimplement using do_for_each_ref_in_array()
+ . do_for_each_ref_in_arrays(): new function
+ . do_for_each_ref_in_array(): new function
+ . do_for_each_ref(): correctly terminate while processesing extra_refs
+
+I had to remove this temporarily out of 'pu' as I didn't want to deal with
+merge conflicts with the mh/ref-clone-without-extra-refs topic that
+removes yet another caller of add_extra_ref() that this series touches.
+
+Will defer till the next cycle.
+
+* ss/git-svn-prompt-sans-terminal (2012-01-04) 3 commits
+ - fixup! 15eaaf4
+ - git-svn, perl/Git.pm: extend Git::prompt helper for querying users
+ (merged to 'next' on 2012-01-05 at 954f125)
+ + perl/Git.pm: "prompt" helper to honor GIT_ASKPASS and SSH_ASKPASS
+
+The bottom one has been replaced with a rewrite based on comments from
+Ævar. The second one needs more work, both in perl/Git.pm and prompt.c, to
+give precedence to tty over SSH_ASKPASS when terminal is available.
+
+Will defer till the next cycle.
+
+* nd/commit-ignore-i-t-a (2012-01-16) 2 commits
+ - commit, write-tree: allow to ignore CE_INTENT_TO_ADD while writing trees
+ - cache-tree: update API to take abitrary flags
+
+May want to consider this as fixing an earlier UI mistake, and not as a
+feature that devides the userbase.
+
+Will defer till the next cycle.
--------------------------------------------------
-[New Topics]
+[Cooking]
+
+* jc/split-blob (2012-01-24) 6 commits
+ - chunked-object: streaming checkout
+ - chunked-object: fallback checkout codepaths
+ - bulk-checkin: support chunked-object encoding
+ - bulk-checkin: allow the same data to be multiply hashed
+ - new representation types in the packstream
+ - varint-in-pack: refactor varint encoding/decoding
+
+Not ready.
+
+I finished the streaming checkout codepath, but as explained in 127b177
+(bulk-checkin: support chunked-object encoding, 2011-11-30), these are
+still early steps of a long and painful journey. At least pack-objects and
+fsck need to learn the new encoding for the series to be usable locally,
+and then index-pack/unpack-objects needs to learn it to be used remotely.
+
+Given that I heard a lot of noise that people want large files, and that I
+was asked by somebody at GitTogether'11 privately for an advice on how to
+pay developers (not me) to help adding necessary support, I am somewhat
+dissapointed that the original patch series that was sent almost two
+months ago still remains here without much comments and updates from the
+developer community. I even made the interface to the logic that decides
+where to split chunks easily replaceable, and I deliberately made the
+logic in the original patch extremely stupid to entice others, especially
+the "bup" fanboys, to come up with a better logic, thinking that giving
+people an easy target to shoot for, they may be encouraged to help
+out. The plan is not working :-(.
* jl/test-pause (2012-01-17) 1 commit
(merged to 'next' on 2012-01-20 at ee56335)
Will merge early in the next cycle and deal with any fallout in 'master'.
-* ar/i18n-no-gettext (2012-01-23) 3 commits
+* ar/i18n-no-gettext (2012-01-27) 4 commits
+ (merged to 'next' on 2012-01-27 at 0ecf258)
+ + i18n: Do not force USE_GETTEXT_SCHEME=fallthrough on NO_GETTEXT
(merged to 'next' on 2012-01-23 at 694a94e)
+ i18n: Make NO_GETTEXT imply fallthrough scheme in shell l10n
+ add a Makefile switch to avoid gettext translation in shell scripts
Will merge early in the next cycle.
-* va/git-p4-branch (2012-01-20) 3 commits
- - git-p4: Add test case for complex branch import
- - git-p4: Search for parent commit on branch creation
- - git-p4: Add checkpoint() task
+* va/git-p4-branch (2012-01-26) 4 commits
+ (merged to 'next' on 2012-01-26 at e67c52a)
+ + t9801: do not overuse test_must_fail
+ + git-p4: Change p4 command invocation
+ + git-p4: Add test case for complex branch import
+ + git-p4: Search for parent commit on branch creation
(this branch uses ld/git-p4-branches-and-labels.)
-A handful of review comments seen.
-Expecting a re-roll.
+Rerolled and Acked.
+Will merge early in the next cycle.
* sp/smart-http-failure-to-push (2012-01-20) 1 commit
(merged to 'next' on 2012-01-20 at a892434)
Looked reasonable.
Will merge early in the next cycle.
---------------------------------------------------
-[Stalled]
-
-* jc/advise-push-default (2011-12-18) 1 commit
- - push: hint to use push.default=upstream when appropriate
-
-Peff had a good suggestion outlining an updated code structure so that
-somebody new can try to dip his or her toes in the development. Any
-takers?
-
-Waiting for a reroll.
-
-* jc/split-blob (2011-12-01) 6 commits
- . WIP (streaming chunked)
- - chunked-object: fallback checkout codepaths
- - bulk-checkin: support chunked-object encoding
- - bulk-checkin: allow the same data to be multiply hashed
- - new representation types in the packstream
- - varint-in-pack: refactor varint encoding/decoding
-
-Not ready.
-
-At least pack-objects and fsck need to learn the new encoding for the
-series to be usable locally, and then index-pack/unpack-objects needs to
-learn it to be used remotely.
-
-* mh/ref-api-rest (2011-12-12) 35 commits
- . repack_without_ref(): call clear_packed_ref_cache()
- . read_packed_refs(): keep track of the directory being worked in
- . is_refname_available(): query only possibly-conflicting references
- . refs: read loose references lazily
- . read_loose_refs(): take a (ref_entry *) as argument
- . struct ref_dir: store a reference to the enclosing ref_cache
- . sort_ref_dir(): take (ref_entry *) instead of (ref_dir *)
- . do_for_each_ref_in_dir*(): take (ref_entry *) instead of (ref_dir *)
- . add_entry(): take (ref_entry *) instead of (ref_dir *)
- . search_ref_dir(): take (ref_entry *) instead of (ref_dir *)
- . find_containing_direntry(): use (ref_entry *) instead of (ref_dir *)
- . add_ref(): take (ref_entry *) instead of (ref_dir *)
- . read_packed_refs(): take (ref_entry *) instead of (ref_dir *)
- . find_ref(): take (ref_entry *) instead of (ref_dir *)
- . is_refname_available(): take (ref_entry *) instead of (ref_dir *)
- . get_loose_refs(): return (ref_entry *) instead of (ref_dir *)
- . get_packed_refs(): return (ref_entry *) instead of (ref_dir *)
- . refs: wrap top-level ref_dirs in ref_entries
- . get_ref_dir(): keep track of the current ref_dir
- . do_for_each_ref(): only iterate over the subtree that was requested
- . refs: sort ref_dirs lazily
- . sort_ref_dir(): do not sort if already sorted
- . refs: store references hierarchically
- . refs.c: rename ref_array -> ref_dir
- . struct ref_entry: nest the value part in a union
- . check_refname_component(): return 0 for zero-length components
- . free_ref_entry(): new function
- . refs.c: reorder definitions more logically
- . is_refname_available(): reimplement using do_for_each_ref_in_array()
- . names_conflict(): simplify implementation
- . names_conflict(): new function, extracted from is_refname_available()
- . repack_without_ref(): reimplement using do_for_each_ref_in_array()
- . do_for_each_ref_in_arrays(): new function
- . do_for_each_ref_in_array(): new function
- . do_for_each_ref(): correctly terminate while processesing extra_refs
-
-I had to remove this temporarily out of 'pu' as I didn't want to deal with
-merge conflicts with the mh/ref-clone-without-extra-refs topic that
-removes yet another caller of add_extra_ref() that this series touches.
-
-Will defer till the next cycle.
-
-* ss/git-svn-prompt-sans-terminal (2012-01-04) 3 commits
- - fixup! 15eaaf4
- - git-svn, perl/Git.pm: extend Git::prompt helper for querying users
- (merged to 'next' on 2012-01-05 at 954f125)
- + perl/Git.pm: "prompt" helper to honor GIT_ASKPASS and SSH_ASKPASS
-
-The bottom one has been replaced with a rewrite based on comments from
-Ævar. The second one needs more work, both in perl/Git.pm and prompt.c, to
-give precedence to tty over SSH_ASKPASS when terminal is available.
-
-Will defer till the next cycle.
-
-* nd/commit-ignore-i-t-a (2012-01-16) 2 commits
- - commit, write-tree: allow to ignore CE_INTENT_TO_ADD while writing trees
- - cache-tree: update API to take abitrary flags
-
-May want to consider this as fixing an earlier UI mistake, and not as a
-feature that devides the userbase.
-
-Will defer till the next cycle.
-
---------------------------------------------------
-[Cooking]
-
* jc/pull-signed-tag (2012-01-23) 1 commit
(merged to 'next' on 2012-01-23 at 4257553)
+ merge: use editor by default in interactive sessions
Looked reasonable.
Will merge early in the next cycle.
-* nd/clone-detached (2012-01-23) 11 commits
+* nd/clone-detached (2012-01-24) 12 commits
+ (merged to 'next' on 2012-01-26 at 7b0cc8a)
+ + clone: fix up delay cloning conditions
(merged to 'next' on 2012-01-23 at bee31c6)
+ push: do not let configured foreign-vcs permanently clobbered
(merged to 'next' on 2012-01-23 at 9cab64e)
+ t5601: add missing && cascade
(this branch uses nd/clone-single-branch.)
-Applied a band-aid to a corner-case regression.
+Applied two band-aids to a corner-case regression.
Will merge early in the next cycle and deal with any fallout in 'master'.
* nd/clone-single-branch (2012-01-08) 1 commit
projects / thirdparty / git.git / commitdiff
