From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Shawn O. Pearce" Subject: What's cooking in git.git (Sep 2008, #05; Mon, 29) Date: Tue, 30 Sep 2008 11:37:59 -0700 Message-ID: <20080930183759.GF21310@spearce.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 Tue Sep 30 20:39:18 2008 connect(): Connection refused 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 1Kkk7w-0004e4-61 for gcvg-git-2@gmane.org; Tue, 30 Sep 2008 20:39:17 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752933AbYI3SiB convert rfc822-to-quoted-printable (ORCPT ); Tue, 30 Sep 2008 14:38:01 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752992AbYI3SiB (ORCPT ); Tue, 30 Sep 2008 14:38:01 -0400 Received: from george.spearce.org ([209.20.77.23]:54238 "EHLO george.spearce.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752908AbYI3SiA (ORCPT ); Tue, 30 Sep 2008 14:38:00 -0400 Received: by george.spearce.org (Postfix, from userid 1001) id 4A0083835F; Tue, 30 Sep 2008 18:37:59 +0000 (UTC) Content-Disposition: inline X-master-at: 9800c0df412869c7949935b61581b9361fc49bd1 X-next-at: 37dbc802cfed9d39ff15dfd333bdd2e74ca9f458 User-Agent: Mutt/1.5.17+20080114 (2008-01-14) Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Sorry for sending out two issues in two days; yesterday I resent issue #4 by mistake. :-) Everything below is worded for yesterday, as that is when I wrote it, and when I meant to mail it. *sigh* ---- 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. If I have dropped anything recently its not because I don't want to apply it, it just slipped through the cracks. Please feel free to give me a gentle prod (and a patch resend or a pointer to the series on gmane). Thanks. ---------------------------------------------------------------- [New Topics] * gb/gitweb-pathinfo (Mon Sep 29 17:26:57 2008 +0200) 4 commits - gitweb: generate parent..current URLs - gitweb: parse parent..current syntax from pathinfo - gitweb: generate project/action/hash URLs - gitweb: parse project/action/hash_base:filename PATH_INFO This series just came in today. I haven't had a chance to look at it beyond stashing in `pu`. * mw/sendemail (Mon Sep 29 12:41:06 2008 -0500) 8 commits - send-email: signedoffcc -> signedoffbycc, but handle both - Docs: send-email: Create logical groupings for man text - Docs: send-email: Remove unnecessary config variable description - Docs: send-email: --chain_reply_to -> --[no-]chain-reply-to - send-email: change --no-validate to boolean --[no-]validate - Docs: send-email: Man page option ordering - Docs: send-email usage text much sexier - Docs: send-email's usage text and man page mention same options This series has already gone through 3 iterations before I could start to carry it in-tree. I haven't had a chance to read it yet myself, so its sitting around in `pu` for futher review. * pb/gitweb (Thu Sep 25 18:48:48 2008 +0200) 2 commits - gitweb: Sort the list of forks on the summary page by age - gitweb: Clean-up sorting of project list I forgot to look at this series today. I meant to review and try to merge it to `next` before publishing. Will do that tomorrow. * ae/preservemerge (Tue Sep 23 22:58:20 2008 +0200) 3 commits - git pull: Support --preserve-merges as a flag to rebase - git rebase: Support non-interactive merge-preserving rebase - Prepare for non-interactive merge-preserving rebase Andreas says there's some issues in here. I'm waiting for a respin on the series before I look at it futher. * mg/verboseprune (Mon Sep 29 18:49:52 2008 +0200) 1 commit - make prune report removed objects on -v Just came in today. Looks sane. I'll drop it onto `next` tomorrow. ---------------------------------------------------------------- [Graduated to "master"] * 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