From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 18537 invoked by alias); 23 Mar 2011 00:24:23 -0000 Received: (qmail 18524 invoked by uid 22791); 23 Mar 2011 00:24:21 -0000 X-SWARE-Spam-Status: No, hits=-0.8 required=5.0 tests=AWL,BAYES_00,T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from sam.franz.com (HELO sam.franz.com) (67.207.112.88) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Wed, 23 Mar 2011 00:24:12 +0000 Received: from freon.franz.com (freon.franz.com [192.132.95.35]) by sam.franz.com (Allegro Maild v1.2.23) id 000000555796; Tue, 22 Mar 2011 17:24:11 -0700 Received: from freon.franz.com (localhost [127.0.0.1]) by freon.franz.com (8.14.3/8.14.3) with ESMTP id p2N0OAML020087 for ; Tue, 22 Mar 2011 17:24:10 -0700 To: cygwin@cygwin.com Subject: cygwin 1.7.8 + 3/18/11 snapshot + git = crash Date: Wed, 23 Mar 2011 01:33:00 -0000 Message-ID: <20086.1300839850@freon.franz.com> From: Kevin Layer X-IsSubscribed: yes Mailing-List: contact cygwin-help@cygwin.com; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: cygwin-owner@cygwin.com Mail-Followup-To: cygwin@cygwin.com X-SW-Source: 2011-03/txt/msg00664.txt.bz2 This is on Windows 7 64-bit. The crash at the end left an index.lock file. Please let me know what I can do to help track down the problem. Kevin + git rebase --whitespace=nowarn private/layer-scm First, rewinding head to replay your work on top of it... Applying: add regression files Using index info to reconstruct a base tree... :326: trailing whitespace. nil))) :631: trailing whitespace. nil))) :940: trailing whitespace. nil))) :1245: trailing whitespace. nil))) :1550: trailing whitespace. nil))) warning: squelched 6 whitespace errors warning: 11 lines add whitespace errors. Falling back to patching base and 3-way merge... 1 [main] git-merge-recursive 2864 C:\cygwin\lib\git-core\git-merge-recursive.exe: *** fatal error - could not load C:\WINDOWS\system32\winmm.dll, Win32 error 487 Stack trace: Frame Function Args 00229E84 6102793B (00229E84, 00000000, 00000000, 0022A1C0) 0022A174 6102793B (6117EC60, 00008000, 00000000, 61180997) 0022B1A4 61004F1B (61180101, 0022B1D0, 01000030, 00A70250) 0022B404 61001756 (610EF431, 0022B430, 611BE1F0, 0022C6D8) 0022B448 6115EE2C (6123E0E0, 00000000, 00000000, 00000000) 0022B478 610EF7BE (0022B4C0, 00000000, 00008238, 00A600F0) 0022B4D8 610C33A5 (0053A820, 00000000, 00000124, 00000010) 0022B4F8 00467C20 (0053A820, 00000124, 00000010, 00482D3E) 0022B528 00482F4A (0022C664, 00000FFA, 00B4A288, 61073E36) 0022C628 0048315B (00BB6ED8, 0000764A, 00000000, 00000007) 0022C688 00485A04 (00BB6ED8, 0000764A, 004F9642, 0022C6E8) 0022C738 004AE63D (0022C834, 0022C7F4, 612437DC, 612482BD) 0022C8E8 004B01E7 (000081A4, 00B9A084, 000081A4, 00B9A09C) 0022CA98 004B0FE5 (0022CB50, 00AA9C18, 00AA9C38, 00AA9C58) 0022CAD8 004B1589 (0022CB50, 00A9C0C8, 00AA81A0, 00000000) 0022CB28 004B17CC (0022CB50, 0022CC14, 0022CC00, 00000001) End of stack trace (more stack frames may be present) /usr/lib/git-core/git-am: line 121: 2864 Hangup git-merge-recursive $orig_tree -- HEAD $his_tree Failed to merge in the changes. Patch failed at 0001 add regression files When you have resolved this problem run "git rebase --continue". If you would prefer to skip this patch, instead run "git rebase --skip". To restore the original branch and stop rebasing run "git rebase --abort". -- Problem reports: http://cygwin.com/problems.html FAQ: http://cygwin.com/faq/ Documentation: http://cygwin.com/docs.html Unsubscribe info: http://cygwin.com/ml/#unsubscribe-simple