To: git@vger.kernel.org
Bcc: lwn@lwn.net
-Subject: What's cooking in git.git (Sep 2012, #10; Sun, 30)
-X-master-at: 261b5119c7a7cb778dd812cfb006b511c5bc4065
-X-next-at: 8e89b3c30625b00571c4cbc5e5a74d8e3e442754
+Subject: What's cooking in git.git (Oct 2012, #01; Tue, 2)
+X-master-at: b65f30b6b3bf34831b32a1b209bc1955f2bf79df
+X-next-at: e57700a8bba97a7ca41f5703b8cd8de489f06c07
-What's cooking in git.git (Sep 2012, #10; Sun, 30)
+What's cooking in git.git (Oct 2012, #01; Tue, 2)
--------------------------------------------------
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'.
-The tip of 'master' will be tagged as 1.8.0-rc0 real soon now.
+The tip of 'master' is a bit past v1.8.0-rc0; we are more or less
+feature complete, except for a few topics marked as "Will merge to
+'master' in the list below.
+
+I do not expect the topics in the stalled category will be ready for
+the upcoming release; they may appear in the release after v1.8.0 if
+they are rerolled. Also some of the topics that have been cooking
+in 'next' have to be deferred to the next cycle.
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
http://git-blame.blogspot.com/p/git-public-repositories.html
--------------------------------------------------
-[Graduated to "master"]
-
-* aw/rebase-i-edit-todo (2012-09-19) 5 commits
- (merged to 'next' on 2012-09-24 at 95625d7)
- + rebase -i: suggest using --edit-todo to fix an unknown instruction
- + rebase -i: Add tests for "--edit-todo"
- + rebase -i: Teach "--edit-todo" action
- + rebase -i: Refactor help messages for todo file
- + rebase usage: subcommands can not be combined with -i
-
- Teach an option to edit the insn sheet to "git rebase -i".
-
-
-* jk/smart-http-switch (2012-09-21) 2 commits
- (merged to 'next' on 2012-09-24 at b2a2777)
- + remote-curl: let users turn off smart http
- + remote-curl: rename is_http variable
- (this branch uses sp/maint-http-info-refs-no-retry.)
-
- Allows users to turn off smart-http when talking to dumb-only
- servers.
-
-
-* js/rebase-exec-command-not-found (2012-09-18) 1 commit
- (merged to 'next' on 2012-09-24 at ed5b048)
- + rebase -i: fix misleading error message after 'exec no-such' instruction
+[New Topics]
- When you misspell the command name you give to the "exec" action in
- the "git rebase -i" insn sheet, you are told that 'rebase' is not a
- git subcommand from "git rebase --continue".
+* bw/config-lift-variable-name-length-limit (2012-10-01) 1 commit
+ - Remove the hard coded length limit on variable names in config files
+ The configuration parser had an unnecessary hardcoded limit on
+ variable names that was not checked consistently. Lift the limit.
-* rr/maint-submodule-unknown-cmd (2012-09-25) 1 commit
- (merged to 'next' on 2012-09-25 at 4bb1bc4)
- + submodule: if $command was not matched, don't parse other args
+ Will merge to 'next'.
- "git submodule frotz" was not diagnosed as "frotz" being an unknown
- subcommand to "git submodule"; the user instead got a complaint
- that "git submodule status" was run with an unknown path "frotz".
+* jc/maint-t1450-fsck-order-fix (2012-10-02) 1 commit
+ - t1450: the order the objects are checked is undefined
-* rr/test-use-shell-path-not-shell (2012-09-25) 1 commit
- (merged to 'next' on 2012-09-27 at 3a1848f)
- + test-lib: use $SHELL_PATH, not $SHELL
+ The fsck test assumed too much on what kind of error it will
+ detect. The only important thing is the inconsistency is detected
+ as an error.
+ Will merge to 'next'.
-* rs/archive-zip-utf8 (2012-09-24) 4 commits
- (merged to 'next' on 2012-09-24 at 9b42b1c)
- + archive-zip: write extended timestamp
- + archive-zip: support UTF-8 paths
- + Revert "archive-zip: support UTF-8 paths"
- (merged to 'next' on 2012-09-11 at 3b1f071)
- + archive-zip: support UTF-8 paths
+--------------------------------------------------
+[Graduated to "master"]
- With another reroll, it looks like the series is as polished as it
- could be.
+* da/mergetool-custom (2012-09-25) 1 commit
+ (merged to 'next' on 2012-09-27 at f910851)
+ + mergetool--lib: Allow custom commands to override built-ins
+ The actual external command to run for mergetool backend can be
+ specified with difftool/mergetool.$name.cmd configuration
+ variables, but this mechanism was ignored for the backends we
+ natively support.
-* sp/maint-http-enable-gzip (2012-09-20) 1 commit
- (merged to 'next' on 2012-09-24 at 1d05142)
- + Enable info/refs gzip decompression in HTTP client
- Allows a more common 'gzip' Accept-Encoding to be used.
+* ep/malloc-check-perturb (2012-09-26) 1 commit
+ (merged to 'next' on 2012-09-27 at f115b8b)
+ + MALLOC_CHECK: enable it, unless disabled explicitly
+ Fixes a brown-paper bag bug.
-* sp/maint-http-info-refs-no-retry (2012-09-20) 1 commit
- (merged to 'next' on 2012-09-24 at ebcce8e)
- + Revert "retry request without query when info/refs?query fails"
- (this branch is used by jk/smart-http-switch.)
- Kills an old workaround for an unlikely server misconfiguration
- that hurts debuggability.
+* jc/blame-follows-renames (2012-09-21) 1 commit
+ (merged to 'next' on 2012-09-27 at 12634c1)
+ + git blame: document that it always follows origin across whole-file renames
+ (this branch is used by jc/blame-no-follow.)
---------------------------------------------------
-[New Topics]
+ Clarify the "blame" documentation to tell the users that there is
+ no need to ask for "--follow".
-* jl/submodule-add-by-name (2012-09-30) 2 commits
- - submodule add: Fail when .git/modules/<name> already exists unless forced
- - Teach "git submodule add" the --name option
-
- If you remove a submodule, in order to keep the repository so that
- "git checkout" to an older commit in the superproject history can
- resurrect the submodule, the real repository will stay in $GIT_DIR
- of the superproject. A later "git submodule add $path" to add a
- different submodule at the same path will fail. Diagnose this case
- a bit better, and if the user really wants to add an unrelated
- submodule at the same path, give the "--name" option to give it a
- place in $GIT_DIR of the superproject that does not conflict with
- the original submodule.
+* jk/completion-tests (2012-09-27) 2 commits
+ (merged to 'next' on 2012-09-27 at 5cd6968)
+ + t9902: add completion tests for "odd" filenames
+ + t9902: add a few basic completion tests
-* nd/grep-reflog (2012-09-29) 4 commits
- - revision: make --grep search in notes too if shown
- - log --grep-reflog: reject the option without -g
- - revision: add --grep-reflog to filter commits by reflog messages
- - grep: prepare for new header field filter
- Teach the commands from the "log" family the "--grep-reflog" option
- to limit output by string that appears in the reflog entry when the
- --walk-reflogs option is in effect.
+* jk/receive-pack-unpack-error-to-pusher (2012-09-21) 3 commits
+ (merged to 'next' on 2012-09-27 at 90f0c6f)
+ + receive-pack: drop "n/a" on unpacker errors
+ + receive-pack: send pack-processing stderr over sideband
+ + receive-pack: redirect unpack-objects stdout to /dev/null
+ Send errors from "unpack-objects" and "index-pack" back to the "git
+ push" over the git and smart-http protocols, just like it is done
+ for a push over the ssh protocol.
-* ep/malloc-check-perturb (2012-09-26) 1 commit
- (merged to 'next' on 2012-09-27 at f115b8b)
- + MALLOC_CHECK: enable it, unless disabled explicitly
- Fixes a brown-paper bag bug.
+* os/commit-submodule-ignore (2012-09-24) 1 commit
+ (merged to 'next' on 2012-09-27 at 9cd2cfd)
+ + commit: pay attention to submodule.$name.ignore in .gitmodules
- Will merge to 'master'.
+ "git status" honored the ignore=dirty settings in .gitmodules but
+ "git commit" didn't.
-* lt/mailinfo-handle-attachment-more-sanely (2012-09-30) 1 commit
- - mailinfo: don't require "text" mime type for attachments
+* rt/maint-clone-single (2012-09-20) 1 commit
+ (merged to 'next' on 2012-09-27 at a47d54d)
+ + clone --single: limit the fetch refspec to fetched branch
- A patch attached as application/octet-stream (e.g. not text/*) were
- mishandled,not correctly honoring Content-Transfer-Encoding
- (e.g. base64).
+ Running "git fetch" in a repository made with "git clone --single"
+ slurps all the branches, defeating the point of "--single".
--------------------------------------------------
[Stalled]
- Improve documentation and comments regarding directory traversal API
- Update directory listing API doc to match code
- Expecting a further reroll to follow-up review comments.
+ Expecting a reroll.
* as/test-tweaks (2012-09-20) 7 commits
* jc/blame-no-follow (2012-09-21) 2 commits
- blame: pay attention to --no-follow
- diff: accept --no-follow option
- (this branch uses jc/blame-follows-renames.)
Teaches "--no-follow" option to "git blame" to disable its
whole-file rename detection.
Stalled mostly due to lack of responses.
+* mk/maint-graph-infinity-loop (2012-09-25) 1 commit
+ - graph.c: infinite loop in git whatchanged --graph -m
+
+ The --graph code fell into infinite loop when asked to do what the
+ code did not expect ;-)
+
+ Anybody who worked on "--graph" wants to comment?
+ Stalled mostly due to lack of responses.
+
+
* ph/credential-refactor (2012-09-02) 5 commits
- wincred: port to generic credential helper
- Merge branch 'ef/win32-cred-helper' into ph/credential-refactor
link pointing at it.
Seems broken as it makes $(pwd) and TRASH_DIRECTORY inconsistent.
- Needs rerolling.
+ Will discard.
* jc/maint-push-refs-all (2012-08-27) 2 commits
--------------------------------------------------
[Cooking]
-* da/mergetool-custom (2012-09-25) 1 commit
- (merged to 'next' on 2012-09-27 at f910851)
- + mergetool--lib: Allow custom commands to override built-ins
+* jl/submodule-add-by-name (2012-09-30) 2 commits
+ - submodule add: Fail when .git/modules/<name> already exists unless forced
+ - Teach "git submodule add" the --name option
- The actual external command to run for mergetool backend can be
- specified with difftool/mergetool.$name.cmd configuration
- variables, but this mechanism was ignored for the backends we
- natively support.
+ If you remove a submodule, in order to keep the repository so that
+ "git checkout" to an older commit in the superproject history can
+ resurrect the submodule, the real repository will stay in $GIT_DIR
+ of the superproject. A later "git submodule add $path" to add a
+ different submodule at the same path will fail. Diagnose this case
+ a bit better, and if the user really wants to add an unrelated
+ submodule at the same path, give the "--name" option to give it a
+ place in $GIT_DIR of the superproject that does not conflict with
+ the original submodule.
- Will merge to 'master'.
+ Will merge to 'next'.
-* mk/maint-graph-infinity-loop (2012-09-25) 1 commit
- - graph.c: infinite loop in git whatchanged --graph -m
+* nd/grep-reflog (2012-09-29) 4 commits
+ (merged to 'next' on 2012-10-01 at 57773a6)
+ + revision: make --grep search in notes too if shown
+ + log --grep-reflog: reject the option without -g
+ + revision: add --grep-reflog to filter commits by reflog messages
+ + grep: prepare for new header field filter
- The --graph code fell into infinite loop when asked to do what the
- code did not expect ;-)
+ Teach the commands from the "log" family the "--grep-reflog" option
+ to limit output by string that appears in the reflog entry when the
+ "--walk-reflogs" option is in effect.
- Anybody who worked on --graph wants to comment?
+ Will merge to 'master'.
-* tu/gc-auto-quiet (2012-09-27) 1 commit
- - silence git gc --auto --quiet output
+* lt/mailinfo-handle-attachment-more-sanely (2012-09-30) 1 commit
+ (merged to 'next' on 2012-10-01 at 2a1cecc)
+ + mailinfo: don't require "text" mime type for attachments
- Will merge to 'next'.
+ A patch attached as application/octet-stream (e.g. not text/*) were
+ mishandled, not correctly honoring Content-Transfer-Encoding
+ (e.g. base64).
+ Will merge to 'master'.
-* jk/completion-tests (2012-09-27) 2 commits
- (merged to 'next' on 2012-09-27 at 5cd6968)
- + t9902: add completion tests for "odd" filenames
- + t9902: add a few basic completion tests
+
+* tu/gc-auto-quiet (2012-09-27) 1 commit
+ (merged to 'next' on 2012-10-01 at ad8b91b)
+ + silence git gc --auto --quiet output
+
+ "gc --auto" notified the user that auto-packing has triggered even
+ under the "--quiet" option.
Will merge to 'master'.
-* jm/diff-context-config (2012-09-27) 2 commits
- - [SQUASH] test fixups
- - diff: diff.context configuration gives default to -U
+* jm/diff-context-config (2012-10-02) 2 commits
+ (merged to 'next' on 2012-10-02 at e57700a)
+ + t4055: avoid use of sed 'a' command
+ (merged to 'next' on 2012-10-01 at 509a558)
+ + diff: diff.context configuration gives default to -U
+
+ Teaches a new configuration variable to "git diff" Porcelain and
+ its friends.
- Will merge to 'next' after squashing.
+ Will defer to the next cycle.
* mh/ceiling (2012-09-29) 9 commits
logic to escape the ceilings the user thought to have specified.
The solution felt a bit unnecessarily convoluted to me.
+ Expecting a reroll.
* jl/submodule-rm (2012-09-29) 1 commit
- - submodule: teach rm to remove submodules unless they contain a git directory
+ (merged to 'next' on 2012-10-01 at 4e5c4fc)
+ + submodule: teach rm to remove submodules unless they contain a git directory
"git rm submodule" cannot blindly remove a submodule directory as
its working tree may have local changes, and worse yet, it may even
is not embedded in its working tree but is elsewhere and uses the
gitfile mechanism to point at it.
- Will merge to 'next'.
+ Will defer to the next cycle.
* nd/wildmatch (2012-09-27) 5 commits
It was pointed out that some symbols that do not have to be global
are left global. I think this reroll fixed most of them.
-
-* os/commit-submodule-ignore (2012-09-24) 1 commit
- (merged to 'next' on 2012-09-27 at 9cd2cfd)
- + commit: pay attention to submodule.$name.ignore in .gitmodules
-
- "git status" honored the ignore=dirty settings in .gitmodules but
- "git commit" didn't.
-
- Will merge to 'master'.
+ Will merge to 'next'.
* nd/pretty-placeholder-with-color-option (2012-09-30) 9 commits
- pretty: share code between format_decoration and show_decorations
-* jk/receive-pack-unpack-error-to-pusher (2012-09-21) 3 commits
- (merged to 'next' on 2012-09-27 at 90f0c6f)
- + receive-pack: drop "n/a" on unpacker errors
- + receive-pack: send pack-processing stderr over sideband
- + receive-pack: redirect unpack-objects stdout to /dev/null
-
- Send errors from "unpack-objects" and "index-pack" back to the "git
- push" over the git and smart-http protocols, just like it is done
- for a push over the ssh protocol.
-
- Will merge to 'master'.
-
-
-* jc/blame-follows-renames (2012-09-21) 1 commit
- (merged to 'next' on 2012-09-27 at 12634c1)
- + git blame: document that it always follows origin across whole-file renames
- (this branch is used by jc/blame-no-follow.)
-
- Clarify the "blame" documentation to tell the users that there is
- no need to ask for "--follow".
-
- Will merge to 'master'.
-
-
-* rt/maint-clone-single (2012-09-20) 1 commit
- (merged to 'next' on 2012-09-27 at a47d54d)
- + clone --single: limit the fetch refspec to fetched branch
-
- Running "git fetch" in a repository made with "git clone --single"
- slurps all the branches, defeating the point of "--single".
-
- Will merge to 'master'.
-
-
* jk/no-more-pre-exec-callback (2012-06-05) 1 commit
- pager: drop "wait for output to run less" hack
(Originally merged to 'next' on 2012-07-23)
- Will defer until the end of the 2012.
- while waiting for older "less" to go extinct.
+ Will defer to the next cycle.
projects / thirdparty / git.git / commitdiff
