From mboxrd@z Thu Jan 1 00:00:00 1970 From: Junio C Hamano Subject: What's cooking in git.git (Sep 2008, #02; Wed, 10) Date: Wed, 10 Sep 2008 20:49:50 -0700 Message-ID: <7vhc8ntk81.fsf@gitster.siamese.dyndns.org> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: QUOTED-PRINTABLE To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Thu Sep 11 05:51:24 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 1KddD8-0002HE-GX for gcvg-git-2@gmane.org; Thu, 11 Sep 2008 05:51:15 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753153AbYIKDt5 convert rfc822-to-quoted-printable (ORCPT ); Wed, 10 Sep 2008 23:49:57 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753161AbYIKDt5 (ORCPT ); Wed, 10 Sep 2008 23:49:57 -0400 Received: from a-sasl-fastnet.sasl.smtp.pobox.com ([207.106.133.19]:36914 "EHLO sasl.smtp.pobox.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753059AbYIKDtz convert rfc822-to-8bit (ORCPT ); Wed, 10 Sep 2008 23:49:55 -0400 Received: from localhost.localdomain (localhost [127.0.0.1]) by a-sasl-fastnet.sasl.smtp.pobox.com (Postfix) with ESMTP id 670615F807; Wed, 10 Sep 2008 23:49:55 -0400 (EDT) Received: from pobox.com (ip68-225-240-211.oc.oc.cox.net [68.225.240.211]) (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 49B185F806; Wed, 10 Sep 2008 23:49:53 -0400 (EDT) User-Agent: Gnus/5.110006 (No Gnus v0.6) Emacs/21.4 (gnu/linux) X-Pobox-Relay-ID: B25A8F1E-7FB4-11DD-BA19-D0CFFE4BC1C1-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 merged to the maintenance series have "maint-" in their nam= es. ---------------------------------------------------------------- [New Topics] Many 'maint' material to go through the usual 'next' to 'master' to 'maint' cycle.. * mh/maint-honor-no-ssl-verify (Thu Feb 21 15:10:37 2008 -0800) 1 commi= t + Don't verify host name in SSL certs when GIT_SSL_NO_VERIFY is set * dp/maint-rebase-fix (Tue Sep 9 16:05:26 2008 +0400) 2 commits + git-rebase--interactive: auto amend only edited commit + git-rebase-interactive: do not squash commits on abort * jc/maint-checkout-keep-remove (Sun Sep 7 19:49:25 2008 -0700) 1 commi= t + checkout: do not lose staged removal * jc/maint-template-permbits (Thu Aug 21 19:31:50 2008 -0500) 1 commit + Fix permission bits on sources checked out with an overtight umask * am/status (Mon Sep 8 00:05:03 2008 +0200) 2 commits - wt-status: Teach how to discard changes in the working directory - wt-status: Split header generation into three functions This is what I commented as "making status output even chattier", but parked here to see what people think. * mv/commit-tree (Wed Sep 10 22:10:33 2008 +0200) 3 commits - t7603: add new testcases to ensure builtin-commit uses reduce_heads() - builtin-commit: use commit_tree() - commit_tree(): add a new author parameter * pb/autocorrect-wrapper (Wed Sep 10 14:44:20 2008 -0700) 2 commits - Fixup -- waiting for response - git wrapper: also uses aliases to suggest mistyped commands * jc/alternate-push (Tue Sep 9 01:27:10 2008 -0700) 4 commits - push: receiver end advertises refs from alternate repositories - push: prepare sender to receive extended ref information from the receiver - receive-pack: make it a builtin - is_directory(): a generic helper function ---------------------------------------------------------------- [Graduated to "master"] * jc/hide-cr-in-diff-from-less (Wed Aug 27 19:48:01 2008 -0700) 1 commi= t + diff: Help "less" hide ^M from the output * jc/maint-checkout-fix (Fri Aug 29 13:40:36 2008 -0700) 1 commit + checkout: do not check out unmerged higher stages randomly This is the same one as the bottom of "better conflict resolution" seri= es. * jc/cc-ld-dynpath (Sat Aug 16 15:01:23 2008 +0200) 2 commits + configure: auto detect dynamic library path switches + Makefile: Allow CC_LD_DYNPATH to be overriden I decided to push this forward; it might break minority configurations, but it appears nobody pays attention until it actually hurts, so let's = see what happens when this hits 'master'. * ar/autospell (Sun Aug 31 15:54:58 2008 +0200) 2 commits + Add help.autocorrect to enable/disable autocorrecting + git wrapper: DWIM mistyped commands ---------------------------------------------------------------- [Stalled -- Needs Action to Proceed (or to be dropped)] * bd/blame (Thu Aug 21 18:22:01 2008 -0500) 5 commits - Use xdiff caching to improve git blame performance - Allow xdiff machinery to cache hash results for a file - Always initialize xpparam_t to 0 - Bypass textual patch generation and parsing in git blame - Allow alternate "low-level" emit function from xdl_diff R=C3=A9ne had good comments on how the callback should be structured. * kb/am-directory (Fri Aug 29 15:27:50 2008 -0700) 1 commit - git-am: Pass the --directory option through to git-apply I think this is still buggy and drops the option when am stops with conflicts. * dk/emacs (Tue Aug 26 22:24:40 2008 -0500) 2 commits - Teach git.el to mark/unmark files by regexp - git.el: Diff only file at point by default These are still queued but Alexandre had improvement requests so these will likely be dropped. ---------------------------------------------------------------- [Will be merged to "master" soon] * np/pack (Tue Sep 2 10:22:22 2008 -0400) 4 commits + t5300: improve SHA1 collision test + pack-objects: don't include missing preferred base objects + sha1write: don't copy full sized buffers + Merge branch 'np/maint-safer-pack' into np/pack * bw/shortref (Fri Sep 5 23:16:23 2008 +0200) 1 commit + for-each-ref: `:short` format for `refname` * rs/decorate (Thu Sep 4 23:40:03 2008 +0200) 3 commits + add '%d' pretty format specifier to show decoration + move load_ref_decorations() to log-tree.c and export it + log: add load_ref_decorations() * tr/rev-list-reverse (Mon Sep 1 00:31:37 2008 +0200) 2 commits + t6013: replace use of 'tac' with equivalent Perl + rev-list: fix --reverse interaction with --parents * cc/bisect (Sat Sep 6 07:27:03 2008 +0200) 3 commits + bisect: remove "checkout_done" variable used when checking merge bases + bisect: only check merge bases when needed + bisect: test merge base if good rev is not an ancestor of bad rev * jc/setlinebuf-setvbuf (Wed Sep 3 20:33:29 2008 -0700) 1 commit + daemon.c: avoid setlinebuf() * jc/maint-diff-quiet (Mon Sep 1 23:20:26 2008 -0700) 2 commits + diff --quiet: make it synonym to --exit-code >/dev/null + diff Porcelain: do not disable auto index refreshing on -C -C ---------------------------------------------------------------- [Actively Cooking] * ho/dirstat-by-file (Fri Sep 5 22:27:35 2008 +0300) 1 commit + diff --dirstat-by-file: count changed files, not lines * jc/safe-c-l-d (Tue Sep 2 14:10:15 2008 -0700) 1 commit + safe_create_leading_directories(): make it about "leading" directories * jc/apply-include-exclude (Mon Aug 25 01:05:31 2008 -0700) 1 commit - git-apply:--include=3Dpathspec * pb/commit-where (Mon Sep 8 01:05:41 2008 +0200) 1 commit + builtin-commit.c: show on which branch a commit was added * jc/better-conflict-resolution (Thu Sep 4 23:48:48 2008 +0200) 15 comm= its + Fix AsciiDoc errors in merge documentation + git-merge documentation: describe how conflict is presented + checkout --conflict=3D