To: git@vger.kernel.org
+Cc: Eric Wong <normalperson@yhbt.net>,
+ Pete Wyckoff <pw@padd.com>,
+ Luke Diamand <luke@diamand.org>,
+ Erik Faye-Lund <kusmabite@gmail.com>,
+ Stefan Zager <szager@google.com>
Bcc: lwn@lwn.net
-Subject: What's cooking in git.git (Aug 2012, #05; Sat, 18)
-X-master-at: 91e4bfe96f1e72a3ce743fe032bfadfc9509fc2a
-X-next-at: f24913b098a0334d129beee428e81b2d82449265
+Subject: What's cooking in git.git (Aug 2012, #06; Sun, 19)
+X-master-at: 889d35899ba64640e47798681ecb34a4be043bad
+X-next-at: d66298809de5c57cf7578f0abaa9088f2784c3c9
-What's cooking in git.git (Aug 2012, #05; Sat, 18)
+What's cooking in git.git (Aug 2012, #06; Sun, 19)
--------------------------------------------------
Here are the topics that have been cooking. Commits prefixed with '-' are
only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'.
-I'll be tagging the v1.7.12 final sometime tomorrow, and following
-the tradition the next branch will be rebuilt on top of 'master'
-after a few days. We would also eject some topics in 'next' that
-turned out to be mistakes when that rebuilding happens, but I do not
-think we have any such topics right now. And then, post 1.7.12
-cycle opens. I think the next cycle should start the transition of
-that much waited "push default change" topic and perhaps we may want
-to even call it 1.8.0 release. I haven't decided yet.
+Now 1.7.12 is out, we will have a few days of calming down period on
+the 'master' front, just in case we have to deal with brown paper
+bag post-release fixes, and then start getting the topics that have
+been cooking on the 'next' branch graduate to the 'master', perhaps
+starting on coming Wednesday.
+
+For this cycle, we already have fairly well cooked topics, many of
+which are on 'next', and the git-svn updates for svn 1.7 by Michael
+G Schwern is also a candidate for early graduation, provided if Eric
+is OK with the series (I'd need to double check with him). There
+also were some topics that were almost there already during their
+review discussions but somehow lost momentum when we got distracted,
+and I think most of them would be ready fairly quickly if the
+respective owners of the topics (you know who you are) can find time
+to put some work into them.
+
+So I'm planning to keep this cycle reasonably short and aim for
+tagging the result as 1.8.0 at the end of 9th week, on October 21st,
+after which I'd disappear for a few weeks.
+http://tinyurl.com/gitCal is where you can always find my rough
+tagging schedule at.
You can find the changes described here in the integration branches of the
repositories listed at
--------------------------------------------------
[New Topics]
+* kk/maint-for-each-ref-multi-sort (2012-08-19) 2 commits
+ - for-each-ref: Fix sort with multiple keys
+ - t6300: test sort with multiple keys
+
+A small and sensible fix, even though the accompanying test seems to
+touch too many unrelated existing ones needlessly, which may want to
+be fixed by a reroll.
+
+--------------------------------------------------
+[Stalled]
+
+* mz/rebase-range (2012-07-18) 7 commits
+ . rebase (without -p): correctly calculate patches to rebase
+ . rebase -p: don't request --left-right only to ignore left side
+ . rebase -p: use --cherry-mark for todo file
+ . git-rebase--interactive.sh: look up subject in add_pick_line
+ . git-rebase--interactive: group all $preserve_merges code
+ . git-rebase--interactive.sh: extract function for adding "pick" line
+ . git-rebase--am.sh: avoid special-casing --keep-empty
+
+Expecting a reroll.
+
+Performance concerns from Windows folks. Also the series lacks
+proper sign-offs.
+
+* jl/submodule-rm (2012-07-05) 2 commits
+ - rm: remove submodules from the index and the .gitmodules file
+ - rm: don't fail when removing populated submodules
+
+Expecting a reroll.
+
+* lt/commit-tree-guess-utf-8 (2012-06-28) 1 commit
+ - commit/commit-tree: correct latin1 to utf-8
+
+Teaches "git commit" and "git commit-tree" the "we are told to use
+utf-8 in log message, but this does not look like utf-8---attempt to
+pass it through convert-from-latin1-to-utf8 and see if it makes
+sense" heuristics "git mailinfo" already uses.
+
+A draft from Linus received privately without a log message.
+Expecting a reroll.
+
+* mb/remote-default-nn-origin (2012-07-11) 6 commits
+ - Teach get_default_remote to respect remote.default.
+ - Test that plain "git fetch" uses remote.default when on a detached HEAD.
+ - Teach clone to set remote.default.
+ - Teach "git remote" about remote.default.
+ - Teach remote.c about the remote.default configuration setting.
+ - Rename remote.c's default_remote_name static variables.
+
+When the user does not specify what remote to interact with, we
+often attempt to use 'origin'. This can now be customized via a
+configuration variable.
+
+Expecting a reroll.
+"The first remote becomes the default" bit is better done as a
+separate step.
+
+* jc/split-blob (2012-04-03) 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
+ - packfile: use varint functions
+
+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 long time 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" fanbois, 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 :-<.
+
+--------------------------------------------------
+[Cooking]
+
* hv/coding-guidelines (2012-08-15) 1 commit
(merged to 'next' on 2012-08-18 at 5a78f2c)
+ Documentation/CodingGuidelines: spell out more shell guidelines
sufficient to keep the coherent style, but over time some parts of
the codebase have drifted enough to make it ineffective.
+Will merge to 'master' as part of the first batch.
+
* jc/daemon-access-hook (2012-08-15) 1 commit
- daemon: --access-hook option
Allow an external command to tell git-daemon to decline service
based on the client address, repository path, etc.
+Will merge to 'next'.
+
* jc/send-email-reconfirm (2012-08-14) 1 commit
- send-email: validate & reconfirm interactive responses
mistakes such as saying "y<RETURN>" to sender mail address whose
prompt is given with a correctly guessed default.
+Will merge to 'next'.
+
* pw/p4-submit-conflicts (2012-08-16) 12 commits
- git p4: add submit --prepare-p4-only option
- git p4: add submit --dry-run option
- git p4 test: use p4d -L option to suppress log messages
- git p4 test: remove bash-ism of combined export/assignment
+I saw Pete and Luke going back and forth collaborating, so I take
+that this may still be rerolled---if not, please holler.
+
* tx/relative-in-the-future (2012-08-16) 2 commits
- date: show relative dates in the future
- date: refactor the relative date logic from presentation
+Not my itch; rewritten an earlier submission by Tom Xue into
+somewhat more maintainable form, though it breaks existing i18n.
+
* ef/win32-cred-helper (2012-08-16) 1 commit
- contrib: add win32 credential-helper
+Credential helper for Win32 (is this GUI???).
+
+Will merge to 'next'.
+
* jc/maint-abbrev-option-cli (2012-08-16) 1 commit
(merged to 'next' on 2012-08-18 at e002006)
+ gitcli: describe abbreviation of long options
that the command accepts that begin with "--opt", in which case you
can give "--opt") anywhere easy to find for new people.
+Will merge to 'master' as part of the first batch.
+
* mv/pull-r-for-rebase (2012-08-17) 1 commit
(merged to 'next' on 2012-08-18 at e7d885b)
+ man: git pull -r is a short for --rebase
Minor documentation update.
+Will merge to 'master' as part of the first batch.
+
* rr/precompose-utf8-cleanup (2012-08-17) 1 commit
- cleanup precompose_utf8
A style and code cleanup.
+Will merge to 'next'.
* jc/doc-git-updates (2012-08-17) 1 commit
(merged to 'next' on 2012-08-18 at f24913b)
+ Documentation: update the introductory section
+Will merge to 'master' as part of the first batch.
+
* fa/remote-svn (2012-08-17) 16 commits
- Add a test script for remote-svn
- remote-svn: add marks-file regeneration
- vcs-svn: Add sha1 calculation to fast_export and line_buffer
(this branch uses fa/remote-svn.)
+I haven't seen many comments and reviews from people involved in the
+area, other than DBarr's worries on teaching exporter (which is
+supposed to be Git agnostic, as its output "fast-import" format is
+meant to be usable by others) to compute object names in Git way.
+
+It is somewhat hard for me to judge these two series.
+
* mh/maint-config-doc-proxy-command (2012-08-18) 2 commits
- git-config doc: unconfuse an example
- git-config.txt: fix example
---------------------------------------------------
-[Stalled]
-
-* mz/rebase-range (2012-07-18) 7 commits
- . rebase (without -p): correctly calculate patches to rebase
- . rebase -p: don't request --left-right only to ignore left side
- . rebase -p: use --cherry-mark for todo file
- . git-rebase--interactive.sh: look up subject in add_pick_line
- . git-rebase--interactive: group all $preserve_merges code
- . git-rebase--interactive.sh: extract function for adding "pick" line
- . git-rebase--am.sh: avoid special-casing --keep-empty
-
-Expecting a reroll.
-
-Performance concerns from Windows folks. Also the series lacks
-proper sign-offs.
-
-* jl/submodule-rm (2012-07-05) 2 commits
- - rm: remove submodules from the index and the .gitmodules file
- - rm: don't fail when removing populated submodules
-
-Expecting a reroll.
-
-* lt/commit-tree-guess-utf-8 (2012-06-28) 1 commit
- - commit/commit-tree: correct latin1 to utf-8
-
-Teaches "git commit" and "git commit-tree" the "we are told to use
-utf-8 in log message, but this does not look like utf-8---attempt to
-pass it through convert-from-latin1-to-utf8 and see if it makes
-sense" heuristics "git mailinfo" already uses.
-
-A draft from Linus received privately without a log message.
-Expecting a reroll.
-
-* mb/remote-default-nn-origin (2012-07-11) 6 commits
- - Teach get_default_remote to respect remote.default.
- - Test that plain "git fetch" uses remote.default when on a detached HEAD.
- - Teach clone to set remote.default.
- - Teach "git remote" about remote.default.
- - Teach remote.c about the remote.default configuration setting.
- - Rename remote.c's default_remote_name static variables.
-
-When the user does not specify what remote to interact with, we
-often attempt to use 'origin'. This can now be customized via a
-configuration variable.
-
-Expecting a reroll.
-"The first remote becomes the default" bit is better done as a
-separate step.
-
-* jc/split-blob (2012-04-03) 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
- - packfile: use varint functions
-
-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 long time 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" fanbois, 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 :-<.
-
---------------------------------------------------
-[Cooking]
+Will merge to 'next'.
* ph/stash-rerere (2012-08-17) 2 commits
- stash: invoke rerere in case of conflict
- test: git-stash conflict sets up rerere
+"git stash" internally used "git merge-recursive" backend, which did
+not trigger "rerere" upon conflicts unlike other mergy operations.
+
+Will merge to 'next'.
+
* hv/submodule-path-unmatch (2012-08-14) 1 commit
- Let submodule command exit with error status if path does not exist
As the title says.
+Will merge to 'next'.
* jc/add-delete-default (2012-08-13) 1 commit
- git add: notice removal of tracked paths by default
not notice removed files, which may be "Huh?" to some users. They
can of course use "git add -A dir/", but why should they?
+Resurrected from graveyard, as I thought it was a worthwhile thing
+to do in the longer term; waiting for comments.
+
* jc/maint-rev-list-topo-doc (2012-08-15) 1 commit
(merged to 'next' on 2012-08-18 at d1f54d9)
+ rev-list docs: clarify --topo-order description
documentation. It is not just about "children before parent", but
also about "don't mix lineages".
+Will merge to 'master' as part of the first batch.
+
* bc/receive-pack-stdout-protection (2012-08-06) 2 commits
(merged to 'next' on 2012-08-07 at d7aa316)
+ receive-pack: do not leak output from auto-gc to standard output
message from "git prune" that said it was removing cruft leaked to
the standard output, breaking the communication protocol.
-Not urgent (non regression).
+Will merge to 'master' as part of the second batch.
* bc/prune-info (2012-08-07) 1 commit
- prune.c: only print informational message in show_only or verbose mode
Teach "git prune" without "-v" to be silent about leftover temporary files.
-Not urgent (non regression).
+Will merge to 'next'.
* jc/tag-doc (2012-08-06) 1 commit
(merged to 'next' on 2012-08-18 at 9fe64b2)
directories was the only to have branches and tags, but that is not
true for quite some time.
-Not urgent (non regression).
+Will merge to 'master' as part of the first batch.
* jk/docs-docbook-monospace-display (2012-08-07) 1 commit
(merged to 'next' on 2012-08-18 at 7e02bf8)
for materials meant to be examples that are better typeset in
monospace.
-Not urgent (non regression).
+Will merge to 'master' as part of the second batch.
* jc/maint-protect-sh-from-ifs (2012-08-08) 1 commit
- sh-setup: protect from exported IFS
rely on being able to parse "ls-files -s | while read a b c..."
start to fail. Protect them from such a misconfiguration.
+Will merge to 'next'.
+
* jk/check-docs-update (2012-08-08) 8 commits
(merged to 'next' on 2012-08-18 at 4409d2e)
+ check-docs: get documented command list from Makefile
Simplify "make check-docs" implementation and update its coverage.
+Will merge to 'master' as part of the first batch.
+
* js/gitweb-path-info-unquote (2012-08-15) 1 commit
(merged to 'next' on 2012-08-15 at 844da17)
+ gitweb: URL-decode $my_url/$my_uri when stripping PATH_INFO
account, failing to notice directories with funny characters e.g. SP
in their paths.
-Not urgent (non regression).
+Will merge to 'master' as part of the first batch.
* mg/rebase-i-onto-reflog-in-full (2012-08-10) 1 commit
- rebase -i: use full onto sha1 in reflog
The reflog entries left by "git rebase" and "git rebase -i" were
inconsistent.
+Will merge to 'next'.
+
* mz/empty-rebase-test (2012-08-09) 1 commit
- add tests for 'git rebase --keep-empty'
+Will merge to 'next'.
+
* jc/capabilities (2012-08-13) 3 commits
- fetch-pack: mention server version with verbose output
- parse_feature_request: make it easier to see feature values
Some capabilities were asked by fetch-pack even when upload-pack did
not advertise that they are available. Fix fetch-pack not to do so.
+Will merge to 'next'.
+
* pw/p4-use-client-spec-branch-detection (2012-08-11) 5 commits
- git p4: make branch detection work with --use-client-spec
- git p4: do wildcard decoding in stripRepoPath
- git p4 test: add broken --use-client-spec --detect-branches tests
- git p4 test: move client_view() function to library
+Will merge to 'next' and soon to 'master'.
+
* jc/maint-push-refs-all (2012-08-07) 2 commits
- get_fetch_map(): tighten checks on dest refs
- fetch/push: allow refs/*:refs/*
Allows pushing and fetching refs/stash.
+Need to send it out to the list for review.
* jk/version-string (2012-08-10) 3 commits
(merged to 'next' on 2012-08-10 at d8dcb00)
protocol exchange. But we do so carefully only to the other end that
understands it.
-Not urgent (non regression).
+Will merge to 'master' as part of the third batch.
* js/grep-patterntype-config (2012-08-03) 1 commit
(merged to 'next' on 2012-08-09 at 1a08d6c)
"grep" learned to use a non-standard pattern type by default if a
configuration variable tells it to.
-Not urgent (non regression).
+Will merge to 'master' as part of the second batch.
* mm/die-with-dashdash-help (2012-08-03) 1 commit
(merged to 'next' on 2012-08-09 at 1aae096)
+ setup: clarify error messages for file/revisions ambiguity
Reword error messages.
-Not urgent (non regression).
+
+Will merge to 'master' as part of the first batch.
* tr/merge-recursive-flush (2012-08-03) 1 commit
(merged to 'next' on 2012-08-09 at da826ec)
+ merge-recursive: eliminate flush_buffer() in favor of write_in_full()
Remove unnecessary code.
-Not urgent (non regression).
+
+Will merge to 'master' as part of the first batch.
* tr/void-diff-setup-done (2012-08-03) 1 commit
(merged to 'next' on 2012-08-09 at 668a46f)
+ diff_setup_done(): return void
Remove unnecessary code.
-Not urgent (non regression).
+
+Will merge to 'master' as part of the first batch.
* mk/test-seq (2012-08-04) 1 commit
(merged to 'next' on 2012-08-06 at 3f6917c)
Add a compatibility/utility function to the test framework.
-Not urgent (non regression).
+Will merge to 'master' as part of the first batch.
* ab/diff-write-incomplete-line (2012-08-05) 1 commit
(merged to 'next' on 2012-08-07 at dcf02ae)
The output from "git diff -B" for a file that ends with an
incomplete line did not put "\ No newline..." on a line of its own.
-Not urgent (non regression).
+Will merge to 'master' as part of the second batch.
* pg/maint-apply-remove-unused-variable (2012-08-05) 1 commit
(merged to 'next' on 2012-08-05 at aa9f5e9)
+ apply: delete unused deflate_origlen from patch struct
Remove unused field.
-Not urgent (non regression).
+Will merge to 'master' as part of the first batch.
* tg/index-v5 (2012-08-17) 13 commits
- p0002-index.sh: add perf test for the index formats
matter in the old code were left behind after the code structure
changed sufficiently to make them useless.
-Not urgent (non regression).
+Will merge to 'master' as part of the first batch.
* jc/maint-sane-execvp-notdir (2012-07-31) 1 commit
(merged to 'next' on 2012-08-09 at 5dd4240)
"git foo" errored out with "Not a directory" when the user had a non
directory on $PATH, and worse yet it masked an alias "foo" to run.
-Not urgent (non regression).
+Will merge to 'master' as part of the third batch.
* jc/sanitize-nkd-lazy-iconv-open (2012-07-31) 1 commit
(merged to 'next' on 2012-08-09 at 832c238)
iconv_open() only when it is necessary, in the hope of avoiding
set-up overhead.
-Not urgent (non regression).
+Needs some work to rename functions
+as mentioned by Linus in the discussion.
* tr/maint-send-email-2047 (2012-07-31) 1 commit
(merged to 'next' on 2012-08-09 at 17dfe57)
"git send-email" did not unquote encoded words that appear on the
header correctly, and lost "_" from strings.
-Not urgent (non regression).
+Will merge to 'master' as part of the first batch.
* cw/cherry-pick-allow-empty-message (2012-08-06) 1 commit
(merged to 'next' on 2012-08-09 at eab95f6)
log message. The "--allow-empty-message" option can be used to
silently proceed.
-Not urgent (non regression).
+Will merge to 'master' as part of the third batch.
* ms/git-svn-1.7 (2012-08-02) 20 commits
- git-svn: remove ad-hoc canonicalizations
A series by Michael Schwern via Eric to update git-svn to revamp the
way URLs are internally passed around, to make it work with SVN 1.7.
+Will merge to 'next' after pinging Eric to double check and then to 'master'.
+
* jc/maint-t7406-rev-parse-max-count-huh (2012-07-30) 1 commit
(merged to 'next' on 2012-07-30 at 9b27acc)
+ t7406: fix misleading "rev-parse --max-count=1 HEAD"
Test clean-up, with no behaviour change.
-Not urgent (non regression).
+Will merge to 'master' as part of the second batch.
* jk/maint-diff-nul40-as-sentinel (2012-07-29) 1 commit
+ diff: do not use null sha1 as a sentinel value
"git diff" had a confusion between taking data from a path in the
working tree and taking data from an object that happens to have
name 0{40} recorded in a tree.
-Not urgent (non regression).
* mz/cherry-code-cleanup (2012-07-29) 3 commits
- cherry: remove redundant check for merge commit
- remove unnecessary parameter from get_patch_ids()
Minor code clean-up on the cherry-pick codepath.
-Not urgent (non regression).
+
+Will merge to 'next'.
* jc/maint-config-exit-status (2012-07-30) 1 commit
(merged to 'next' on 2012-07-30 at 8392da9)
status for a case that was documented, and introduce a new code for
"all other errors".
-Not urgent (non regression).
+Will merge to 'master' as part of the third batch.
* jk/maint-null-in-trees (2012-07-29) 2 commits
(merged to 'next' on 2012-07-30 at 771c497)
We do not want a link to 0{40} object stored anywhere in our objects.
-Not urgent (non regression).
+Will merge to 'master' as part of the second batch.
* sz/submodule-force-update (2012-07-25) 1 commit
(merged to 'next' on 2012-07-26 at 3bda2be)
We may want a documentation update and a few tests on top.
-Not urgent (non regression).
-
* jc/test-prereq (2012-08-04) 8 commits
(merged to 'next' on 2012-08-04 at 6dd9156)
+ fixup! t3910: use the UTF8_NFD_TO_NFC test prereq
and make use of it for detecting SYMLINKS, CASE_INSENSITIVE_FS and
NKD/NKC MacOS x gotcha.
-Not urgent (non regression).
+Will merge to 'master' as part of the first batch.
* da/difftool-updates (2012-08-10) 12 commits
(merged to 'next' on 2012-08-10 at 4accbf6)
"git difftool --dir-diff" learned to use symbolic links to prepare
temporary copy of the working tree when available.
-Not urgent (non regression).
+Will merge to 'master' as part of the second batch.
* jk/no-more-pre-exec-callback (2012-06-05) 1 commit
(merged to 'next' on 2012-07-23 at fe59cb6)
+ pager: drop "wait for output to run less" hack
-Will defer for 6 months until ancient "less" goes extinct.
+Will defer until the end of the 2012,
+waiting for older "less" to go extinct.
* mm/push-default-switch-warning (2012-06-24) 1 commit
(merged to 'next' on 2012-06-26 at fea512a)
+ push: start warning upcoming default change for push.default
-Will defer for another cycle.
+Will merge to 'master' as part of the second batch.
projects / thirdparty / git.git / commitdiff
