From mboxrd@z Thu Jan 1 00:00:00 1970 From: Junio C Hamano Subject: What's cooking in git.git (Sep 2008, #04; Mon, 22) Date: Mon, 22 Sep 2008 12:40:55 -0700 Message-ID: <7vwsh4vuig.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 Mon Sep 22 21:42: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 1KhrIY-0008LU-SX for gcvg-git-2@gmane.org; Mon, 22 Sep 2008 21:42:19 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751816AbYIVTlJ convert rfc822-to-quoted-printable (ORCPT ); Mon, 22 Sep 2008 15:41:09 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751754AbYIVTlI (ORCPT ); Mon, 22 Sep 2008 15:41:08 -0400 Received: from a-sasl-fastnet.sasl.smtp.pobox.com ([207.106.133.19]:45891 "EHLO sasl.smtp.pobox.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751709AbYIVTlF convert rfc822-to-8bit (ORCPT ); Mon, 22 Sep 2008 15:41:05 -0400 Received: from localhost.localdomain (localhost [127.0.0.1]) by a-sasl-fastnet.sasl.smtp.pobox.com (Postfix) with ESMTP id 359B863031; Mon, 22 Sep 2008 15:41:04 -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 DF3E76302F; Mon, 22 Sep 2008 15:40:58 -0400 (EDT) User-Agent: Gnus/5.110006 (No Gnus v0.6) Emacs/21.4 (gnu/linux) X-Pobox-Relay-ID: 648CFABE-88DE-11DD-85EF-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. I'll be on vacation til Oct 08; proposal/review/discussion/improvement cycle based on e-mails and the distributed nature of git mean that it shouldn't keep the participants from further improving the system. I'v= e asked Shawn to look after in-flight patches during the time, so hopeful= ly when I come back I'll see a much better git ;-). ---------------------------------------------------------------- [New Topics] * nd/narrow (Sun Sep 14 20:07:59 2008 +0700) 9 commits - grep: skip files that have not been checked out - checkout_entry(): CE_NO_CHECKOUT on checked out entries. - Prevent diff machinery from examining worktree outside narrow checkout - Add tests for updating no-checkout entries in index - ls-files: add --narrow-checkout option to "will checkout" entries - update-index: add --checkout/--no-checkout to update CE_NO_CHECKOUT bit - update-index: refactor mark_valid() in preparation for new options - Introduce CE_NO_CHECKOUT bit - Extend index to save more flags This is an early half of the earlier series (I haven't had chance to lo= ok at the updated series yet), and should be replaced with the updated one posted recently. ---------------------------------------------------------------- [Stalled -- Needs Action to Proceed (or to be dropped)] * pb/submodule (Fri Sep 12 23:09:19 2008 +0200) 1 commit - t7400: Add short "git submodule add" testsuite Waiting for a reroll. * 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. ---------------------------------------------------------------- [Will be merged to 'master/maint' soon] * mv/merge-recursive (Sat Sep 6 18:29:49 2008 +0200) 11 commits + builtin-merge: release the lockfile in try_merge_strategy() + merge-recursive: get rid of virtual_id + merge-recursive: move current_{file,directory}_set to struct merge_options + merge-recursive: move the global obuf to struct merge_options + merge-recursive: get rid of the index_only global variable + merge-recursive: move call_depth to struct merge_options + cherry-pick/revert: make direct internal call to merge_tree() + builtin-merge: avoid run_command_v_opt() for recursive and subtree + merge-recursive: introduce merge_options + merge-recursive.c: Add more generic merge_recursive_generic() + Split out merge_recursive() to merge-recursive.c (Tip at 4271666) * ho/dirstat-by-file (Fri Sep 5 22:27:35 2008 +0300) 1 commit + diff --dirstat-by-file: count changed files, not lines (Tip at fd33777) * jc/safe-c-l-d (Tue Sep 2 14:10:15 2008 -0700) 1 commit + safe_create_leading_directories(): make it about "leading" directories (Tip at 5f0bdf5) * jc/apply-include-exclude (Mon Aug 25 01:05:31 2008 -0700) 1 commit + git-apply:--include=3Dpathspec (Tip at 6ecb1ee) * 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 (Tip at 7a172b0) * pb/autocorrect-wrapper (Wed Sep 10 17:54:28 2008 +0200) 1 commit + git wrapper: also use aliases to correct mistyped commands (Tip at 746c221) * 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