Junio C Hamano... and I think I've collected all the recent leftover topics from the list that are at least going in the right direction if not perfect and queued them to update 'pu'.
Hopefully I can tag 1.7.7-rc1 by the end of the month. Please help find regressions in the "master" branch, and the topics still in "next" that are slated for 1.7.7 (see the latest "What's cooking").
Thanks.
Junio C HamanoRe: 1.7.7-rc0 tagged and pushed out
Junio C Hamano <gitster@pobox.com> writes:
> ... and I think I've collected all the recent leftover topics from the > list that are at least going in the right direction if not perfect and > queued them to update 'pu'.
Here is a preview of the "New Topics" section of the next "What's cooking".
[New Topics]
* mg/maint-notes-C-doc (2011-08-25) 1 commit - git-notes.txt: clarify -C vs. copy and -F
* jc/clean-exclude-doc (2011-08-26) 1 commit - Documentation: clarify "git clean -e <pattern>"
* mh/check-ref-format-print-normalize (2011-08-25) 1 commit - check-ref-format --print: Normalize refnames that start with slashes
These tiny clean-up topics could go to 1.7.7 final. On the other hand, they are not urgent, either.
* bk/ancestry-path (2011-08-25) 3 commits - revision: do not include sibling history in --ancestry-path output - revision: keep track of the end-user input from the command line - rev-list: Demonstrate breakage with --ancestry-path --all
The topic came up a bit too late in the cycle.
* mg/branch-list (2011-08-26) 5 commits - branch: allow pattern arguments - branch: introduce --list option - git-branch: introduce missing long forms for the options - git-tag: introduce long forms for the options - t6040: test branch -vv (this branch uses nk/branch-v-abbrev.)
The topic came up a bit too late in the cycle.
* mm/rebase-i-exec-edit (2011-08-26) 2 commits - rebase -i: notice and warn if "exec $cmd" modifies the index or the working tree - rebase -i: clean error message for --continue after failed exec
The topic came up a bit too late in the cycle.
* jk/default-attr (2011-08-26) 1 commit - attr: map builtin userdiff drivers to well-known extensions
I fixed up the test breakage just for fun, but this is not urgent.
* hv/submodule-merge-search (2011-08-26) 4 commits - submodule: Search for merges only at end of recursive merge - allow multiple calls to submodule merge search for the same path - submodule: Demonstrate known breakage during recursive merge - push: Don't push a repository with unpushed submodules (this branch uses fg/submodule-ff-check-before-push, fg/submodule-ff-check-before-push and jc/combine-diff-callback.)
The topic came up a bit too late in the cycle. The bottom one needs to be replaced with a properly written commit log message.
* mm/mediawiki-as-a-remote (2011-08-26) 1 commit - Add a remote helper to interact with mediawiki (fetch & push)
Fun.
* nd/maint-autofix-tag-in-head (2011-08-26) 3 commits - Accept tags in HEAD or MERGE_HEAD - merge: remove global variable head[] - merge: keep stash[] a local variable
Probably needs a re-roll to aim a bit higher.
Junio C HamanoNot yet 1.7.7-rc1 but...
... here is an updated preview of the "New Topics" section of the next issue of "What's cooking". People sent in fixes to bugs several topics that are new in 1.7.7-rc0 have introduced, and while they are still on the "pu" (proposed updates) branch for tonight, they should and will be fast tracked to 1.7.7-rc1.
Thanks.
-- >8 --
[New Topics]
* mg/maint-notes-C-doc (2011-08-25) 1 commit - git-notes.txt: clarify -C vs. copy and -F
Will merge to "master".
* jc/clean-exclude-doc (2011-08-28) 1 commit - Documentation: clarify "git clean -e <pattern>"
Will merge to "master".
* mh/check-ref-format-print-normalize (2011-08-27) 2 commits - Forbid DEL characters in reference names - check-ref-format --print: Normalize refnames that start with slashes
Will merge to "master".
* bk/ancestry-path (2011-08-25) 3 commits - revision: do not include sibling history in --ancestry-path output - revision: keep track of the end-user input from the command line - rev-list: Demonstrate breakage with --ancestry-path --all
The topic came up a bit too late in the cycle. Will cook for a while.
* mg/branch-list (2011-08-28) 5 commits - branch: allow pattern arguments - branch: introduce --list option - git-branch: introduce missing long forms for the options - git-tag: introduce long forms for the options - t6040: test branch -vv
The topic came up a bit too late in the cycle.
* mm/rebase-i-exec-edit (2011-08-26) 2 commits - rebase -i: notice and warn if "exec $cmd" modifies the index or the working tree - rebase -i: clean error message for --continue after failed exec
The topic came up a bit too late in the cycle.
* jk/default-attr (2011-08-26) 1 commit - attr: map builtin userdiff drivers to well-known extensions
I fixed up the test breakage just for fun, but this is not urgent.
* hv/submodule-merge-search (2011-08-26) 4 commits - submodule: Search for merges only at end of recursive merge - allow multiple calls to submodule merge search for the same path - submodule: Demonstrate known breakage during recursive merge - push: Don't push a repository with unpushed submodules (this branch uses fg/submodule-ff-check-before-push.)
The topic came up a bit too late in the cycle. The bottom one needs to be replaced with a properly written commit log message.
* mm/mediawiki-as-a-remote (2011-08-26) 1 commit - Add a remote helper to interact with mediawiki (fetch & push)
Fun.
* nd/maint-autofix-tag-in-head (2011-08-26) 3 commits - Accept tags in HEAD or MERGE_HEAD - merge: remove global variable head[] - merge: keep stash[] a local variable
Probably needs a re-roll to aim a bit higher.
* bc/unstash-clean-crufts (2011-08-27) 4 commits - git-stash: remove untracked/ignored directories when stashed - t/t3905: add missing '&&' linkage - git-stash.sh: fix typo in error message - t/t3905: use the name 'actual' for test output, swap arguments to test_cmp
* bg/t5540-osx-grep (2011-08-28) 1 commit - t5540-http-test: shorten grep pattern
Will merge to "master".
* cb/maint-ls-files-error-report (2011-08-28) 1 commit - t3005: do not assume a particular order of stdout and stderr of git-ls-files
Will merge to "master".
* da/make-auto-header-dependencies (2011-08-27) 1 commit - Makefile: Improve compiler header dependency check (this branch uses fk/make-auto-header-dependencies.)
* ms/daemon-timeout-is-in-seconds (2011-08-28) 1 commit - git-daemon.txt: specify --timeout in seconds
Will merge to "master".
* bc/bisect-test-use-shell-path (2011-08-29) 1 commit - t6030: use $SHELL_PATH to invoke user's preferred shell instead of bare sh
Will merge to "master".
* gb/am-hg-patch (2011-08-29) 1 commit - am: preliminary support for hg patches
* gb/maint-am-patch-format-error-message (2011-08-29) 1 commit - am: format is in $patch_format, not parse_patch
Will merge to "master".
* gb/maint-am-stgit-author-to-from-fix (2011-08-29) 1 commit - am: fix stgit patch mangling
Will merge to "master".
* jc/diff-index-unpack (2011-08-29) 3 commits - diff-index: pass pathspec down to unpack-trees machinery - unpack-trees: allow pruning with pathspec - traverse_trees(): allow pruning with pathspec
Will cook for a while.
* tr/maint-format-patch-empty-output (2011-08-29) 4 commits - Document negated forms of format-patch --to --cc --add-headers - t4014: "no-add-headers" is actually called "no-add-header" - t4014: invoke format-patch with --stdout where intended - t4014: check for empty files from git format-patch --stdout
Will merge to "master".
* tr/maint-ident-to-git-memmove (2011-08-29) 1 commit - Use memmove in ident_to_git
Will merge to "master".
* tr/maint-strbuf-grow-nul-termination (2011-08-29) 1 commit - strbuf_grow(): maintain nul-termination even for new buffer
Will merge to "master".
* tr/maint-t3903-misquoted-command (2011-08-29) 1 commit - t3903: fix misquoted rev-parse invocation
Will merge to "master".
* va/p4-branch-import-test-update (2011-08-29) 1 commit - git-p4: simple branch tests edits
Will merge to "master".
Junio C HamanoNot yet 1.7.7-rc1 but... (take 2)
Junio C Hamano <gitster@pobox.com> writes:
... here is an updated preview of the "New Topics" section of the next issue of "What's cooking". People sent in fixes to bugs several topics that are new in 1.7.7-rc0 have introduced, and they are being fast tracked for 1.7.7-rc1, which probably will happen tomorrow.
Thanks.
-- >8 -- [New Topics]
* mg/maint-notes-C-doc (2011-08-25) 1 commit (merged to 'next' on 2011-08-30 at 6f3281a) + git-notes.txt: clarify -C vs. copy and -F
Will merge to "master".
* jc/clean-exclude-doc (2011-08-28) 1 commit (merged to 'next' on 2011-08-30 at 79dd173) + Documentation: clarify "git clean -e <pattern>"
Will merge to "master".
* mh/check-ref-format-print-normalize (2011-08-27) 2 commits (merged to 'next' on 2011-08-30 at e827410) + Forbid DEL characters in reference names + check-ref-format --print: Normalize refnames that start with slashes
Will merge to "master".
* bk/ancestry-path (2011-08-25) 3 commits - revision: do not include sibling history in --ancestry-path output - revision: keep track of the end-user input from the command line - rev-list: Demonstrate breakage with --ancestry-path --all
The topic came up a bit too late in the cycle. Will cook for a while.
* mg/branch-list (2011-08-28) 5 commits - branch: allow pattern arguments - branch: introduce --list option - git-branch: introduce missing long forms for the options - git-tag: introduce long forms for the options - t6040: test branch -vv
Not urgent; the topic came up a bit too late in the cycle.
* mm/rebase-i-exec-edit (2011-08-26) 2 commits - rebase -i: notice and warn if "exec $cmd" modifies the index or the working tree - rebase -i: clean error message for --continue after failed exec
Not urgent; the topic came up a bit too late in the cycle.
* jk/default-attr (2011-08-26) 1 commit - attr: map builtin userdiff drivers to well-known extensions
Not urgent; I fixed up the test breakage just for fun.
* hv/submodule-merge-search (2011-08-26) 4 commits - submodule: Search for merges only at end of recursive merge - allow multiple calls to submodule merge search for the same path - submodule: Demonstrate known breakage during recursive merge - push: Don't push a repository with unpushed submodules (this branch uses fg/submodule-ff-check-before-push.)
Not urgent; the topic came up a bit too late in the cycle. The bottom one needs to be replaced with a properly written commit log message.
* mm/mediawiki-as-a-remote (2011-08-26) 1 commit - Add a remote helper to interact with mediawiki (fetch & push)
Fun. Not urgent; the topic came up a bit too late in the cycle.
* nd/maint-autofix-tag-in-head (2011-08-26) 3 commits - Accept tags in HEAD or MERGE_HEAD - merge: remove global variable head[] - merge: keep stash[] a local variable
Probably needs a re-roll to aim a bit higher. Not urgent; will not be in 1.7.7.
* bc/unstash-clean-crufts (2011-08-27) 4 commits - git-stash: remove untracked/ignored directories when stashed - t/t3905: add missing '&&' linkage - git-stash.sh: fix typo in error message - t/t3905: use the name 'actual' for test output, swap arguments to test_cmp
Not urgent; the topic came up a bit too late in the cycle.
* bg/t5540-osx-grep (2011-08-28) 1 commit (merged to 'next' on 2011-08-30 at 894af05) + t5540-http-test: shorten grep pattern
Will merge to "master".
* cb/maint-ls-files-error-report (2011-08-28) 1 commit (merged to 'next' on 2011-08-30 at b606e19) + t3005: do not assume a particular order of stdout and stderr of git-ls-files
Will merge to "master".
* da/make-auto-header-dependencies (2011-08-30) 1 commit - Makefile: Improve compiler header dependency check (this branch uses fk/make-auto-header-dependencies.)
Not urgent; will not be in 1.7.7.
* ms/daemon-timeout-is-in-seconds (2011-08-28) 1 commit (merged to 'next' on 2011-08-30 at 2462eb0) + git-daemon.txt: specify --timeout in seconds
Will merge to "master".
* bc/bisect-test-use-shell-path (2011-08-30) 1 commit (merged to 'next' on 2011-08-30 at c090151) + t6030: use $SHELL_PATH to invoke user's preferred shell instead of bare sh
Will merge to "master".
* gb/am-hg-patch (2011-08-29) 1 commit - am: preliminary support for hg patches
Not urgent; the topic came up a bit too late in the cycle.
* gb/maint-am-patch-format-error-message (2011-08-29) 1 commit (merged to 'next' on 2011-08-30 at ed01a1d) + am: format is in $patch_format, not parse_patch
Will merge to "master".
* gb/maint-am-stgit-author-to-from-fix (2011-08-29) 1 commit (merged to 'next' on 2011-08-30 at 0740010) + am: fix stgit patch mangling
Will merge to "master".
* jc/diff-index-unpack (2011-08-29) 3 commits - diff-index: pass pathspec down to unpack-trees machinery - unpack-trees: allow pruning with pathspec - traverse_trees(): allow pruning with pathspec
Will cook for a while.
* tr/maint-format-patch-empty-output (2011-08-29) 4 commits (merged to 'next' on 2011-08-30 at 078c522) + Document negated forms of format-patch --to --cc --add-headers + t4014: "no-add-headers" is actually called "no-add-header" + t4014: invoke format-patch with --stdout where intended + t4014: check for empty files from git format-patch --stdout
Will merge to "master".
* tr/maint-ident-to-git-memmove (2011-08-29) 1 commit (merged to 'next' on 2011-08-30 at 9395a9b) + Use memmove in ident_to_git
Will merge to "master".
* tr/maint-strbuf-grow-nul-termination (2011-08-29) 1 commit (merged to 'next' on 2011-08-30 at dc87192) + strbuf_grow(): maintain nul-termination even for new buffer
Will merge to "master".
* tr/maint-t3903-misquoted-command (2011-08-30) 1 commit (merged to 'next' on 2011-08-30 at f533857) + t3903: fix misquoted rev-parse invocation
Will merge to "master".
* va/p4-branch-import-test-update (2011-08-29) 1 commit (merged to 'next' on 2011-08-30 at 5c54fb3) + git-p4: simple branch tests edits
Will merge to "master".
* jn/remote-helpers-doc (2011-08-29) 1 commit - Documentation/remote-helpers: explain capabilities first
Not urgent; it would however be a good starting point.
* nm/grep-object-sha1-lock (2011-08-30) 1 commit - grep: Fix race condition in delta_base_cache
Not urgent; the topic came up a bit too late in the cycle.
* tr/mergetool-valgrind (2011-08-30) 1 commit - Symlink mergetools scriptlets into valgrind wrappers
Not urgent; the topic came up a bit too late in the cycle.
* js/i18n-scripts-2 (2011-08-30) 1 commit (merged to 'next' on 2011-08-30 at 5a144a2) + bisect: take advantage of gettextln, eval_gettextln.
Will merge to "master".