Re: Merge problems with git-mingw

From: Peter Karlsson <peter@softwolves.pp.se>
Date: Oct 9, 2007, 08:56 UTC
Message-ID: <Pine.LNX.4.64.0710090953240.26773@ds9.cixit.se>
In-Reply-To: <470B2F7E.4080308@viscovery.net>

Hi!

> What if you run 'git var -l' outside a repository? From CMD?
> Have you tried 'git-var -l' (note the dash)? From CMD?

C:\Program Files\Git\bin>git var -l usage: git-var [-l | <variable>]

C:\Program Files\Git\bin>git-var -l fatal: Not a git repository

C:\Program Files\Git\bin>git --version git version 1.5.3.mingw.1

> Are you sure you have only one version of git in the PATH?

Yes.

> What's in your .git/config?

This is the .git/config file for one of the repositories where it fails:

  [core]
        repositoryformatversion = 0
        filemode = false
        bare = false
        logallrefupdates = true
        symlinks = false
        pager = less -x3 -r

  [instaweb]
        local = true
        httpd = c:/cygwin/usr/sbin/lighttpd.exe -f
        port = 4321
        browser = c:/progra~1/opera/opera.exe
        modulepath = c:/cygwin/usr/lib/apache
  [diff]
        renames = copies
        external = C:/Program Files/tkdiff/tkdiff.exe
  [user]
        name = Peter Karlsson
        email = peter.karlsson@tandbergdata.com

This is my global $HOME/.gitconfig:

  [user]
  name = Peter Karlsson
  email = peter@softwolves.pp.se
  [core]
          editor = c:/cygwin/bin/joe.exe
          pager = less -x3 -r
  [color]
  [color]
          pager = true

-- 
\\// Peter - http://www.softwolves.pp.se/