From mboxrd@z Thu Jan 1 00:00:00 1970 From: Junio C Hamano Subject: Re: What's cooking in git.git (topics) Date: Sun, 29 Jun 2008 01:55:13 -0700 Message-ID: <7vod5kd3im.fsf@gitster.siamese.dyndns.org> References: <7vlk4snpj3.fsf@gitster.siamese.dyndns.org> <7v8x0992hy.fsf@gitster.siamese.dyndns.org> <7vd4pf7h9y.fsf@gitster.siamese.dyndns.org> <7vwsnjl21c.fsf@gitster.siamese.dyndns.org> <7vhcehzdeg.fsf@gitster.siamese.dyndns.org> <7vbq4j748l.fsf@gitster.siamese.dyndns.org> <7vr6d8apjx.fsf@gitster.siamese.dyndns.org> <7vhcdyfe9u.fsf@gitster.siamese.dyndns.org> <7vabjm1a0q.fsf@gitster.siamese.dyndns.org> <7vr6crj0jk.fsf@gitster.siamese.dyndns.org> <7vmyn4hr8f.fsf@gitster.siamese.dyndns.org> <7vmymsjz6x.fsf@gitster.siamese.dyndns.org> <7vabijxhk4.fsf@gitster.siamese.dyndns.org> <7vwslhg8qe.fsf@gitster.siamese.dyndns.org> <7vhccfiksy.fsf@gitster.siamese.dyndns.org> <7vod6k6zg4.fsf@gitster.siamese.dyndns.org> <7v4p7xwsfp.fsf@gitster.siamese.dyndns.org> <7v3anb19n7.fsf@gitster.siamese.dyndns.org> <7vwskjazql.fsf@gitster.siamese.dyndns.org> <7vk5ggipuw.fsf@gitster.siamese.dyndns.org> <7vej6l3lp7.fsf@gitster.siamese.dyndns.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Sun Jun 29 10:56:31 2008 Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1KCshx-0002wW-59 for gcvg-git-2@gmane.org; Sun, 29 Jun 2008 10:56:30 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752099AbYF2Izc (ORCPT ); Sun, 29 Jun 2008 04:55:32 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751802AbYF2Izc (ORCPT ); Sun, 29 Jun 2008 04:55:32 -0400 Received: from a-sasl-fastnet.sasl.smtp.pobox.com ([207.106.133.19]:53513 "EHLO sasl.smtp.pobox.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751212AbYF2Iz2 (ORCPT ); Sun, 29 Jun 2008 04:55:28 -0400 Received: from localhost.localdomain (localhost [127.0.0.1]) by a-sasl-fastnet.sasl.smtp.pobox.com (Postfix) with ESMTP id 9225D29C6; Sun, 29 Jun 2008 04:55:25 -0400 (EDT) Received: from pobox.com (ip68-225-240-77.oc.oc.cox.net [68.225.240.77]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by a-sasl-fastnet.sasl.smtp.pobox.com (Postfix) with ESMTPSA id E837C29C5; Sun, 29 Jun 2008 04:55:20 -0400 (EDT) User-Agent: Gnus/5.110006 (No Gnus v0.6) Emacs/21.4 (gnu/linux) X-Pobox-Relay-ID: 1D6BB5CA-45B9-11DD-8A72-CE28B26B55AE-77302942!a-sasl-fastnet.pobox.com Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' while commits prefixed with '+' are in 'next'. The topics list the commits in reverse chronological order. The topics meant to be applied to the maintenance series have "maint-" in their names. It already is beginning to become clear what 1.6.0 will look like. What's already in 'next' all are well intentioned (I do not guarantee they are already bug-free --- that is what cooking them in 'next' is for) and are good set of feature enhancements. Bigger changes will be: * MinGW will be in. * /usr/bin/git-cat-file is no more. The bulk of the git commands will move to /usr/libexec/git-core/ or somesuch. * git-merge will be rewritten in C. * default pack and idx versions will be updated as scheduled for some time ago. ---------------------------------------------------------------- [New Topics] * jk/maint-fetch-ref-hier (Thu Jun 26 23:59:50 2008 -0400) 1 commit + fetch: report local storage errors in status table When the remote used to have "foo" branch but now has "foo/bar", fetch refuses to delete the existing remote tracking branch "foo" to create a new remote tracking branch "foo/bar", but the error message was confusing. * jc/maint-reset (Wed Jun 25 18:16:36 2008 -0700) 1 commit + Allow "git-reset path" when unambiguous We used to require "git-reset -- path" even when there is no ambiguity (i.e. path cannot be mistaken as a valid tree-ish and it is a filename in the work tree). * js/maint-clone-insteadof (Fri Jun 27 13:56:05 2008 +0100) 1 commit . clone: respect url.insteadOf setting in global configs "git clone" does not honor "url.InsteadOf" in $HOME/.gitconfig; Daniel seems to have ideas for a better fix than this, but this is worth fixing on 'maint'. * tr/send-email-ssl (Thu Jun 26 23:03:21 2008 +0200) 2 commits + git-send-email: prevent undefined variable warnings if no encryption is set + git-send-email: add support for TLS via Net::SMTP::SSL * kb/send-email-fifo (Wed Jun 25 15:44:40 2008 -0700) 1 commit + git-send-email: Accept fifos as well as files Two minor send-email feature enhancements for 1.6.0. * jc/checkdiff (Thu Jun 26 16:08:05 2008 -0700) 6 commits + Update sample pre-commit hook to use "diff --check" + diff --check: detect leftover conflict markers + Teach "diff --check" about new blank lines at end + checkdiff: pass diff_options to the callback + check_and_emit_line(): rename and refactor + diff --check: explain why we do not care whether old side is binary Allows us to replace the sample pre-commit hook that was not aware of the line termination convention per path nor newer whitespace breakage rules. * np/pack-default (Wed Jun 25 00:25:53 2008 -0400) 2 commits + pack.indexversion config option now defaults to 2 + repack.usedeltabaseoffset config option now defaults to "true" Updates the default value for pack.indexversion to 2 and use delta-base offset encoding of the packfiles by default. * js/apply-recount (Fri Jun 27 18:43:09 2008 +0100) 1 commit + Allow git-apply to recount the lines in a hunk (AKA recountdiff) A good ingredient for implementing "apply --edit". * dz/apply-again (Fri Jun 27 14:39:12 2008 -0400) 1 commit + git-apply: handle a patch that touches the same path more than once better Allows us to feed a patch that touches the same path more than once. * ph/parseopt-step-blame (Tue Jun 24 11:12:12 2008 +0200) 7 commits - Migrate git-blame to parse-option partially. - parse-opt: add PARSE_OPT_KEEP_ARGV0 parser option. - parse-opt: fake short strings for callers to believe in. - parse-opt: do not pring errors on unknown options, return -2 intead. - parse-opt: create parse_options_step. - parse-opt: Export a non NORETURN usage dumper. - parse-opt: have parse_options_{start,end}. ---------------------------------------------------------------- [Will merge to master soon] * nd/dashless (Tue Jun 24 19:58:11 2008 -0700) 2 commits + Keep some git-* programs in $(bindir) + Move all dashed-form commands to libexecdir Scheduled for 1.6.0. We'll leave server-side programs in $(bindir) so that ssh clients can ask for "git-program" and find them on the $PATH. * sg/merge-options (Sun Apr 6 03:23:47 2008 +0200) 1 commit + merge: remove deprecated summary and diffstat options and config variables * jc/dashless (Thu Jun 26 16:43:34 2008 -0700) 4 commits + Revert "Make clients ask for "git program" over ssh and local transport" + Make clients ask for "git program" over ssh and local transport + Prepare execv_git_cmd() for removal of builtins from the filesystem + git-shell: accept "git foo" form ---------------------------------------------------------------- [Actively Cooking] * jc/reflog-expire (Sat Jun 28 22:24:49 2008 -0700) 2 commits - Make default expiration period of reflog used for stash infinite - Per-ref reflog expiry configuration As 1.6.0 will be a good time to make backward incompatible changes, the tip commit makes the default expiry period of stash 'never', unless you configure them to expire explicitly using gc.refs/stash.* variables. Needs consensus, but I am guessing that enough people would want stash that does not expire. * jc/merge-theirs (Sat Jun 28 17:28:22 2008 -0700) 3 commits - Teach git-merge to pass -X