Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' while commits prefixed with '+' are in 'next'. The ones marked with '.' do not appear in any of the integration branches, but I am still holding onto them. Topics not in 'next' will have to wait until post 1.7.1 cycle. I expect that the changes already under discussion will be ready by the time the post 1.7.1 cycle begins, and we will hopefully have a cycle for 1.7.2 that is shorter than usual to include them. -------------------------------------------------- [Graduated to "master"] * sb/notes-parse-opt (2010-02-27) 1 commit (merged to 'next' on 2010-03-24 at 82eebc1) + notes: rework subcommands and parse options * cc/cherry-pick-ff (2010-03-20) 7 commits (merged to 'next' on 2010-03-20 at a1ae16b) + revert: fix tiny memory leak in cherry-pick --ff + rebase -i: use new --ff cherry-pick option (merged to 'next' on 2010-03-07 at 5589b26) + Documentation: describe new cherry-pick --ff option + cherry-pick: add tests for new --ff option + revert: add --ff option to allow fast forward when cherry-picking + builtin/merge: make checkout_fast_forward() non static + parse-options: add parse_options_concat() to concat options -------------------------------------------------- [New Topics] * cw/ws-indent-with-tab (2010-04-01) 2 commits - whitespace: we cannot "catch all errors known to git" anymore - Add tab-in-indent whitespace error class Not quite ready until "apply --whitespace=fix" gets a matching change. * ic/bash-completion-rpm (2010-03-26) 1 commit - RPM spec: include bash completion support This is needed in 'master' by -rc1 at the latest. Soon in 'next'. * js/grep-open (2010-03-26) 2 commits - grep -O: allow optional argument specifying the pager (or editor) - grep: Add the option '--open-files-in-pager' Probably needs to support --no-index mode as well. * mg/notes-reflog (2010-03-29) 2 commits - refs.c: Write reflogs for notes just like for branch heads - t3301-notes: Test the creation of reflog entries Implementation is trivially correct; I am unsure if "notes" tree wants reflog in the first place, though. Please convince me and I'll move it to 'next' soon, aiming for -rc0 or -rc1 at the latest. * rr/remote-helper-doc (2010-03-28) 2 commits - Documentation/remote-helpers: Fix some typos - Documentation/remote-helpers: Rewrite description Although I lost track of this series with too rapid succession of updates, intermixed with some documentation updates in the related areas, my impression is that area experts haven't Acked them yet. * sr/remote-helper-export (2010-03-29) 7 commits - remote-helpers: add tests for testgit helper - remote-helpers: add testgit helper - remote-helpers: add support for an export command - remote-helpers: allow requesing the path to the .git directory - fast-import: always create marks_file directories - clone: also configure url for bare clones - clone: pass the remote name to remote_get May merge to 'next', but I would prefer waiting til 1.7.2 to have this with a confidence than fast-tracking it. * cc/revert-strategy (2010-03-31) 5 commits - revert: add "--strategy" option to choose merge strategy - merge: make function try_merge_command non static - merge: refactor code that calls "git merge-STRATEGY" - revert: refactor merge recursive code into its own function - revert: use strbuf to refactor the code that writes the merge message (this branch uses jn/merge-diff3-label.) May merge to 'next' soon, but this is more about debugging and we are not in a great hurry. * mr/gitweb-jsmin (2010-04-01) 6 commits - gitweb: update INSTALL to use shorter make target - gitweb: add documentation to INSTALL regarding gitweb.js - instaweb: add minification awareness - Gitweb: add autoconfigure support for minifiers - Gitweb: add support for minifying gitweb.css - Gitweb: add ignore and clean rules for minified files Soon in 'next' when minor rewording replacement patches come; otherwise felt solid. * sc/http-late-auth (2010-04-01) 1 commit - Prompt for a username when an HTTP request 401s May merge to 'next', but I would prefer waiting til 1.7.2 to have this with a confidence than fast-tracking it. * hg/convert (2010-03-29) 5 commits . convert: Added core.refilteronadd feature. . convert: Inhibit contraction of foreign $Id$ during stats. . convert: Use the enum constant SAFE_CRLF_FALSE. . convert: Keep foreign $Id$ on checkout. . convert: Safer handling of $Id$ contraction. * jk/cached-textconv (2010-04-01) 7 commits - diff: avoid useless filespec population - diff: cache textconv output - textconv: refactor calls to run_textconv - introduce notes-cache interface - make commit_tree a library function - fix textconv leak in emit_rewrite_diff - fix const-correctness of write_sha1_file May merge to 'next', but I would prefer waiting til 1.7.2 to have this with a confidence than fast-tracking it. -------------------------------------------------- [Stalled] * cw/test-lib-relicense (2010-02-22) 1 commit . test-lib.sh: Add explicit license detail, with change from GPLv2 to GPLv2+. Ack-collection stopped at the last three names. I am hoping Carl can take it from there without my keeping an eye on it. * js/rebase-origin-x (2010-02-05) 1 commit - [RFC w/o test and incomplete] rebase: add -x option to record original commit name I retract my objection against the idea of -x; needs polishing before moving forward. * sg/bash-completion (2010-02-23) 4 commits (merged to 'next' on 2010-03-08 at bc59860) + bash: completion for gitk aliases + bash: support user-supplied completion scripts for aliases + bash: support user-supplied completion scripts for user's git commands + bash: improve aliased command recognition Perhaps rename _git_frotz -> _git_complete_frotz? I dunno. * sd/log-decorate (2010-02-17) 3 commits (merged to 'next' on 2010-03-08 at 58a6fba) + log.decorate: usability fixes + Add `log.decorate' configuration variable. + git_config_maybe_bool() Needs squelching the configuration setting when "--pretty=raw" is given, at least, or possibly when any "--pretty" is explicitly given. * np/malloc-threading (2010-03-24) 1 commit - Make xmalloc and xrealloc thread-safe Still has locking issues? * js/async-thread (2010-03-09) 7 commits - Enable threaded async procedures whenever pthreads is available (merged to 'next' on 2010-03-20 at 9939243) + Dying in an async procedure should only exit the thread, not the process. + Reimplement async procedures using pthreads + Windows: more pthreads functions + Fix signature of fcntl() compatibility dummy + Make report() from usage.c public as vreportf() and use it. + Modernize t5530-upload-pack-error. Waiting for resolution of locking issues in malloc-threading. -------------------------------------------------- [Cooking] * da/maint-python-startup (2010-03-27) 1 commit (merged to 'next' on 2010-04-01 at ca6897a) + Makefile: Remove usage of deprecated Python "has_key" method Hopefully will merge to 'master' by -rc0. * jc/conflict-marker-size (2010-03-24) 1 commit (merged to 'next' on 2010-04-01 at 164b1f4) + diff --check: honor conflict-marker-size attribute Hopefully will merge to 'master' by -rc0. * ld/discovery-limit-to-fs (2010-03-17) 3 commits - Add support for GIT_ONE_FILESYSTEM - truncate cwd string before printing error message - config.c: remove static keyword from git_env_bool() Linus made a good point of making this a default, and Erick Mattos confirmed that it won't be a problem even on Windows. Will move to 'next' after such a "default on" change, keep it there until 1.7.1 ships, warn about it in the release notes as an upcoming backward incompatibility, and then move to 'master' after 1.7.1. * sb/fmt-merge-msg (2010-03-24) 7 commits (merged to 'next' on 2010-04-01 at 5fcbec5) + fmt-merge-msg: hide summary option + fmt-merge-msg: remove custom string_list implementation + string-list: add unsorted_string_list_lookup() + fmt-merge-msg: use pretty.c routines + t6200: test fmt-merge-msg more + t6200: modernize with test_tick + fmt-merge-msg: be quiet if nothing to merge Hopefully will merge to 'master' by -rc0. * pc/remove-warn (2010-03-26) 4 commits - Remove a redundant errno test in a usage of remove_path - Introduce remove_or_warn function - Implement the rmdir_or_warn function - Generalise the unlink_or_warn function I cherry-picked only obviously sensible bits. Soon in 'next'. * ef/maint-empty-commit-log (2010-03-21) 1 commit (merged to 'next' on 2010-03-28 at aa103e5) + rev-list: fix --pretty=oneline with empty message Hopefully will merge to 'master' by -rc0. * em/checkout-orphan (2010-03-21) 1 commit (merged to 'next' on 2010-03-28 at 86b6a4f) + git checkout: create unparented branch by --orphan Perhaps needs a bit of documentation updates, describing the "going open source" scenario. * mg/mailmap-update (2010-03-19) 1 commit (merged to 'next' on 2010-03-28 at 8ac3436) + .mailmap: Entries for Alex Bennée, Deskin Miller, Vitaly "_Vi" Shukela Soon in 'master'. * mg/maint-send-email-lazy-editor (2010-03-22) 1 commit (merged to 'next' on 2010-03-28 at 7e8e58e) + send-email: lazily assign editor variable Soon in 'master'. * mg/use-default-abbrev-length-in-rev-list (2010-03-22) 1 commit (merged to 'next' on 2010-03-28 at d3e9f04) + rev-list: use default abbrev length when abbrev-commit is in effect Soon in 'master'. * rb/maint-python-path (2010-03-21) 1 commit (merged to 'next' on 2010-03-28 at 58ba409) + Correct references to /usr/bin/python which does not exist on FreeBSD Soon in 'master'. * rr/imap-send-unconfuse-from-line (2010-03-22) 1 commit (merged to 'next' on 2010-03-28 at fbedd77) + imap-send: Remove limitation on message body Soon in 'master'. * sp/maint-http-backend-die-triggers-die-recursively (2010-03-22) 1 commit (merged to 'next' on 2010-03-28 at bf02879) + http-backend: Don't infinite loop during die() Soon in 'master'. * ar/config-from-command-line (2010-03-26) 2 commits - Use strbufs instead of open-coded string manipulation - Allow passing of configuration parameters in the command line May merge to 'next', but I would prefer waiting til 1.7.2 to have this with a confidence than fast-tracking it. * bc/t5505-fix (2010-03-19) 3 commits (merged to 'next' on 2010-03-28 at 1b097af) + t/t5505-remote.sh: escape * to prevent interpretation by shell as glob + t5505: add missing && + t5505: remove unnecessary subshell invocations Soon in 'master'. * bw/template-tool-buildconfig (2010-03-20) 2 commits (merged to 'next' on 2010-03-28 at 1e6fd8d) + Modernize git calling conventions in hook templates + Make templates honour SHELL_PATH and PERL_PATH Soon in 'master'. * mb/rebase-i-no-ff (2010-03-24) 1 commit (merged to 'next' on 2010-03-28 at b2c54cb) + Teach rebase the --no-ff option. Soon in 'master'. * jn/merge-diff3-label (2010-03-20) 14 commits (merged to 'next' on 2010-03-20 at 26f1805) + merge-recursive: add a label for ancestor + cherry-pick, revert: add a label for ancestor + revert: clarify label on conflict hunks + compat: add mempcpy() + checkout -m --conflict=diff3: add a label for ancestor + merge_trees(): add ancestor label parameter for diff3-style output + merge_file(): add comment explaining behavior wrt conflict style + checkout --conflict=diff3: add a label for ancestor + ll_merge(): add ancestor label parameter for diff3-style output + merge-file --diff3: add a label for ancestor + xdl_merge(): move file1 and file2 labels to xmparam structure + xdl_merge(): add optional ancestor label to diff3-style output + tests: document cherry-pick behavior in face of conflicts + tests: document format of conflicts from checkout -m (this branch is used by cc/revert-strategy.) Soon in 'master'. * do/rebase-i-arbitrary (2010-03-14) 1 commit (merged to 'next' on 2010-03-28 at 5ba9970) + rebase--interactive: don't require what's rebased to be a branch Soon in 'master'. * ja/send-email-ehlo (2010-03-14) 3 commits (merged to 'next' on 2010-03-28 at 00964a8) + git-send-email.perl - try to give real name of the calling host to HELO/EHLO + git-send-email.perl: add option --smtp-debug + git-send-email.perl: improve error message in send_message() Soon in 'master'. * ak/everyday-git (2009-10-21) 1 commit (merged to 'next' on 2010-03-28 at ae67548) + everyday: fsck and gc are not everyday operations Soon in 'master'. * bc/acl-test (2010-03-15) 5 commits (merged to 'next' on 2010-03-28 at b40fa09) + t/t1304: make a second colon optional in the mask ACL check + t/t1304: set the ACL effective rights mask + t/t1304: use 'test -r' to test readability rather than looking at mode bits + t/t1304: set the Default ACL base entries + t/t1304: avoid -d option to setfacl Soon in 'master'. * bc/maint-daemon-sans-ss-family (2010-03-15) 1 commit (merged to 'next' on 2010-03-28 at 305ad0b) + daemon.c: avoid accessing ss_family member of struct sockaddr_storage Soon in 'master'. * ef/cherry-abbrev (2010-03-20) 2 commits (merged to 'next' on 2010-03-28 at eb3825c) + ls: remove redundant logic + cherry: support --abbrev option Soon in 'master'. * gh/maint-stash-show-error-message (2010-03-16) 1 commit (merged to 'next' on 2010-03-28 at 61a5643) + Improve error messages from 'git stash show' Soon in 'master'. * rs/threaded-grep-context (2010-03-15) 1 commit (merged to 'next' on 2010-03-28 at 1934af1) + grep: enable threading for context line printing Soon in 'master'. * nd/setup (2010-03-25) 43 commits - builtins: do not commit pager choice early - builtins: reset startup_info->have_run_setup_gitdir when unsetting up repository - builtins: setup repository before print unknown command error - Guard unallowed access to repository when it's not set up - alias: keep repository found while collecting aliases as long as possible - Allow to undo setup_git_directory_gently() gracefully (and fix alias code) - builtins: check for startup_info->help, print and exit early - builtins: utilize startup_info->help where possible - run_builtin(): save "-h" detection result for later use - config: do not read .git/config if there is no repository - apply: do not check sha1 when repository has not been found - Do not read .git/info/attributes if there is no repository - Do not read .git/info/exclude if there is no repository - git_config(): do not read .git/config if there is no repository - init/clone: turn on startup->have_repository properly - worktree setup: restore original state when things go wrong - Use git_config_early() instead of git_config() during repo setup - Add git_config_early() - worktree setup: call set_git_dir explicitly - rev-parse --git-dir: print relative gitdir correctly - enter_repo(): initialize other variables as setup_git_directory_gently() does - Move enter_repo() to setup.c - index-pack: use RUN_SETUP_GENTLY - index-pack: trust the prefix returned by setup_git_directory_gently() - worktree setup: calculate prefix even if no worktree is found - merge-file: use RUN_SETUP_GENTLY - var: use RUN_SETUP_GENTLY - ls-remote: use RUN_SETUP_GENTLY - help: use RUN_SETUP_GENTLY - diff: use RUN_SETUP_GENTLY - bundle: use RUN_SETUP_GENTLY - apply: use RUN_SETUP_GENTLY - verify-pack: use RUN_SETUP_GENTLY - check-ref-format: use RUN_SETUP_GENTLY - mailinfo: use RUN_SETUP_GENTLY - archive: use RUN_SETUP_GENTLY - builtin: USE_PAGER should not be used without RUN_SETUP* - grep: use RUN_SETUP_GENTLY - shortlog: use RUN_SETUP_GENTLY - hash-object: use RUN_SETUP_GENTLY - config: use RUN_SETUP_GENTLY - builtin: Support RUN_SETUP_GENTLY to set up repository early if found - builtin: introduce startup_info struct -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html