delorie.com/archives/browse.cgi   search  
Mail Archives: cygwin/2011/03/22/17:45:54

X-Recipient: archive-cygwin AT delorie DOT com
X-SWARE-Spam-Status: No, hits=-0.3 required=5.0 tests=AWL,BAYES_00,T_RP_MATCHES_RCVD
X-Spam-Check-By: sourceware.org
To: cygwin AT cygwin DOT com
Subject: git issues with 1.7.8 + 3/13/11 snapshot of cygwin1.dll
Date: Tue, 22 Mar 2011 14:45:27 -0700
Message-ID: <14953.1300830327@freon.franz.com>
From: Kevin Layer <layer AT franz DOT com>
X-IsSubscribed: yes
Mailing-List: contact cygwin-help AT cygwin DOT com; run by ezmlm
List-Id: <cygwin.cygwin.com>
List-Subscribe: <mailto:cygwin-subscribe AT cygwin DOT com>
List-Archive: <http://sourceware.org/ml/cygwin/>
List-Post: <mailto:cygwin AT cygwin DOT com>
List-Help: <mailto:cygwin-help AT cygwin DOT com>, <http://sourceware.org/ml/#faqs>
Sender: cygwin-owner AT cygwin DOT com
Mail-Followup-To: cygwin AT cygwin DOT com
Delivered-To: mailing list cygwin AT cygwin DOT com

I see this on my XP32 system:

+ git fetch
Warning: No xauth data; using fake authentication data for X11 forwarding.
From git:/repo/git/cl
   75d375e..4ed5ea6  acl82      -> origin/acl82
   a5421cc..f0ac11c  master     -> origin/master
+ git fetch --tags
Warning: No xauth data; using fake authentication data for X11 forwarding.
*** rebase instead of merge origin/acl82
 src/code/random.cl        |   14 +++-
 src/code/smp-macros.cl    |    5 +-
 src/code/smp-utilities.cl |  195 +++++++++++++++++++++++----------------------
 src/comp/q/qcon.cl        |   22 +++++
 src/makefile.cl           |    2 +-
 5 files changed, 138 insertions(+), 100 deletions(-)
+ git rebase --whitespace=nowarn origin/acl82
First, rewinding head to replay your work on top of it...
fatal: Unable to create '/c/src/acl82/src/cl/.git/index.lock': File exists.

If no other git process is currently running, this probably means a
git process crashed in this repository earlier. Make sure no other git
process is running and remove the file manually to continue.
could not detach HEAD




When I look in the .git directory, the file index.lock is *not* there.


I suspect the file is lingering after the previous "git fetch".


I'm about to move up to the 3/18/11 snapshot.  Anyone feel that will
fix it?

I never saw this before, when using the git + putty ssh hack on 1.7.7.


--
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

- Raw text -


  webmaster     delorie software   privacy  
  Copyright © 2019   by DJ Delorie     Updated Jul 2019