Re: What's cooking in git.git (Aug 2013, #03; Tue, 13)
gits...@pobox.com wrote on Tue, 13 Aug 2013 15:06 -0700: * ks/p4-view-spec (2013-08-11) 3 commits - WAITING FOR ACK - git p4: implement view spec wildcards with p4 where - git p4 test: sanitize P4CHARSET Waiting for an ack. I'm still running perf tests on the 3-patch version. It looks good. You should expect a reroll of the 2nd and 3rd commits, combining them into one patch. Thanks for tracking these. -- Pete -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: What's cooking in git.git (Aug 2013, #03; Tue, 13)
On 08/14/2013 12:06 AM, Junio C Hamano wrote: * sb/parseopt-boolean-removal (2013-08-07) 9 commits (merged to 'next' on 2013-08-08 at b138a2d) + revert: use the OPT_CMDMODE for parsing, reducing code + checkout-index: fix negations of even numbers of -n + config parsing options: allow one flag multiple times + hash-object: replace stdin parsing OPT_BOOLEAN by OPT_COUNTUP + branch, commit, name-rev: ease up boolean conditions + checkout: remove superfluous local variable + log, format-patch: parsing uses OPT__QUIET + Replace deprecated OPT_BOOLEAN by OPT_BOOL + Remove deprecated OPTION_BOOLEAN for parsing arguments (this branch uses jc/parseopt-command-modes.) Convert most uses of OPT_BOOLEAN/OPTION_BOOLEAN that can use OPT_BOOL/OPTION_BOOLEAN which have much saner semantics, and turn remaining ones into OPT_SET_INT, OPT_COUNTUP, etc. as necessary; there seems to be some misconversion that makes many tests fail, though. Will cook in 'next'. Locally here all tests succeed, when testing that branch alone. Which tests fail for you, so I can look into it? * sb/fsck-opt-bool (2013-07-29) 1 commit (merged to 'next' on 2013-07-30 at 8a9964c) + fsck: Replace deprecated OPT_BOOLEAN by OPT_BOOL Will cook in 'next'. This one is completely included in sb/parseopt-boolean-removal, but doesn't need jc/parseopt-command-modes. So once we're confident with jc/parseopt-command-modes, we could drop this branch as well. Thanks, Stefan signature.asc Description: OpenPGP digital signature
What's cooking in git.git (Aug 2013, #03; Tue, 13)
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 -rc3 has been tagged; we will need to revert a7365313 (git stash: avoid data loss when git stash save kills a directory, 2013-06-28) that is killing git stash in repositories with too many untracked cruft before the final, with a plan to reapply it after trying to whip ls-files --killed into a reasonable performer, which needs to happen after the final. You can find the changes described here in the integration branches of the repositories listed at http://git-blame.blogspot.com/p/git-public-repositories.html -- [Graduated to master] * sb/mailmap-updates (2013-08-12) 1 commit + .mailmap: update long-lost friends with multiple defunct addresses -- [New Topics] * es/blame-L-twice (2013-08-06) 16 commits (merged to 'next' on 2013-08-08 at 9d6f821) + line-range: reject -L line numbers less than 1 + t8001/t8002: blame: add tests of -L line numbers less than 1 + line-range: teach -L^:RE to search from start of file + line-range: teach -L:RE to search from end of previous -L range + line-range: teach -L^/RE/ to search from start of file + line-range-format.txt: document -L/RE/ relative search + log: teach -L/RE/ to search from end of previous -L range + blame: teach -L/RE/ to search from end of previous -L range + line-range: teach -L/RE/ to search relative to anchor point + blame: document multiple -L support + t8001/t8002: blame: add tests of multiple -L options + blame: accept multiple -L ranges + blame: inline one-line function into its lone caller + range-set: publish API for re-use by git-blame -L + line-range-format.txt: clarify -L:regex usage form + git-log.txt: place each -L option variation on its own line (this branch is used by es/contacts-blame-L-multi; uses es/blame-L-more.) Teaches git blame to take more than one -L ranges. Will cook in 'next'. * mm/no-shell-escape-in-die-message (2013-08-07) 1 commit (merged to 'next' on 2013-08-08 at bddff86) + die_with_status: use printf '%s\n', not echo Fixes a minor bug in git rebase -i (there could be others, as the root cause is pretty generic) where the code feeds a random, data dependeant string to 'echo' and expects it to come out literally. Will cook in 'next'. * tr/fd-gotcha-fixes (2013-08-06) 1 commit (merged to 'next' on 2013-08-08 at f452c5b) + t0070: test that git_mkstemps correctly checks return value of open() Finishing touches to an earlier fix already in 'master'. Will cook in 'next'. * ap/remote-hg-tilde-is-home-directory (2013-08-09) 1 commit - remote-hg: fix path when cloning with tilde expansion Will merge to and cook in 'next'. * es/rebase-i-no-abbrev (2013-08-11) 3 commits - rebase: interactive: fix short SHA-1 collision - t3404: rebase: interactive: demonstrate short SHA-1 collision - t3404: restore specialized rebase-editor following commentchar test Will merge to and cook in 'next'. * fc/remote-hg-shared-setup (2013-08-11) 2 commits - remote-hg: add shared repo upgrade - remote-hg: ensure shared repo is initialized Will merge to and cook in 'next'. * jc/transport-do-not-use-connect-twice-in-fetch (2013-08-07) 5 commits - fetch: work around transport-take-over hack - fetch: refactor code that fetches leftover tags - fetch: refactor code that prepares a transport - fetch: rename file-scope global transport to gtransport - t5802: add test for connect helper The auto-tag-following code in git fetch tries to reuse the same transport twice when the serving end does not cooperate and does not give tags that point to commits that are asked for as part of the primary transfer. Unfortunately, Git-aware transport helper interface is not designed to be used more than once, hence this does not work over smart-http transfer. I'll try to see if this workaround can be done in a cleaner way before merging this to 'next'. * ks/p4-view-spec (2013-08-11) 3 commits - WAITING FOR ACK - git p4: implement view spec wildcards with p4 where - git p4 test: sanitize P4CHARSET Waiting for an ack. * mm/war-on-whatchanged (2013-08-13) 2 commits - whatchanged: document its historical nature - core-tutorial: trim the section on Inspecting Changes Will merge to and cook in 'next'. * nd/gc-lock-against-each-other (2013-08-09) 1 commit - gc: reject if another gc is running, unless --force is given Will merge to and cook in 'next'. * rt/doc-merge-file-diff3 (2013-08-09) 1 commit - Documentation/git-merge-file: document option --diff3 Will merge to and cook in 'next'. * sb/misc-cleanup (2013-08-09) 3 commits - rm: remove unneeded null pointer check - diff: fix a possible null pointer dereference - diff: remove ternary operator evaluating always to true Will merge to and cook in 'next'. *
