Merge problems with git-mingw

Hi!

I am running the mingw port of Git from a Cygwin environment, because I had problems with the Cygwin version (not sure what the problem was, probably a CRLF issue). Everything works fine, except for merging:

  $ git merge master
  usage: git-var [-l | <variable>]
  $

Does anyone have any idea on what could cause that? (I've checked that git-var is indeed the mingw version and not the Cygwin version).

  $ git --version
  git version 1.5.3.mingw.1

I'm running on top of another version control system, so I need to switch back to master and update the sources from upstream using that system's tools, and then merge it back into my branch. Without "git merge" working, that is a bit problematic, to say the least... :-)

On 10/8/07, Peter Karlsson <peter@softwolves.pp.se> wrote:

What does this command return?

  $ git var GIT_COMMITTER_IDENT

-- larsh

Doesn't seem to work:

  $ git var GIT_COMMITTER_IDENT
  usage: git-var [-l | <variable>]

On 10/8/07, Peter Karlsson <peter@softwolves.pp.se> wrote:

Something is weird with your setup and/or the mingw port, but you can probably work around the issue by doing this:

$ git config user.name "your name" $ git config user.email "your email"

Optionally, you can add the --global flag to both commands to make the config visible in all of your repos.

-- larsh

Hi!

Both of those are configured properly, but even after configuring them locally for the repository only, I get the same error with "git var". Weird.

[Johannes CC'ed as the mingw.git maintainer]

On 10/8/07, Peter Karlsson <peter@softwolves.pp.se> wrote:

Does 'git var -l' work as expected? Also, could you try the latest git-package provided by the cygwin installer? If CRLF-handling was your problem, take a look at the description of core.autocrlf with 'git help config'.

[This does look like an issue with running mingw.git under Cygwin. Johannes, is this even supposed to work?]

-- larsh

Lars Hjemli schrieb:

Sure, why not? Cygwin's settings as well as core.autocrlf should be completely irrelevant. I've no clue what could be wrong here.

-- Hannes

HI!

Hmm, it also gives an error message:

$ git var -l usage: git-var [-l | <variable>]

I tried it with Git 1.5.3.2 from Cygwin, and the problem I'm having is not with the CRLF handling in the checked out files, but rather in the repository database itself. Cloning a repository with Cygwin-Git produced various errors about the object database being corrupt. Mingw-Git does not produce those errors.

I get the same error running mingw-git from a regular cmd.exe prompt, so it doesn't seem to be related to Cygwin at all.

Peter Karlsson schrieb:

What if you run 'git var -l' outside a repository? From CMD? Have you tried 'git-var -l' (note the dash)? From CMD? Are you sure you have only one version of git in the PATH? What's in your .git/config?

-- Hannes

Hi!

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

Yes.

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 Karlsson schrieb:

For the time being, install this beast in a path without blanks.

This needs fixing, appearently. :(

-- Hannes

On Oct 9, 2007, at 11:03 AM, Johannes Sixt wrote:

I have the printf 'callstack' below from the v1.5.3.mingw.1 version (9c792c5) Apparently spawnve, which is called in compat/mingw.c, corrupts argv.

I have no idea how to continue debugging. Maybe some one else can take over.

	Steffen

$ git var GIT_COMMITTER_IDENT

argv at git.c:429 3 C:\Program Files (x86)\Git\bin\git.exe var C:/Program Files (x86)/Git/bin/git-var GIT_COMMITTER_IDENT

argv at compat/mingw.c:301 C:/Program Files (x86)/Git/bin/git-var GIT_COMMITTER_IDENT (null)

argv at var.c:54 4 C:/Program Files (x86)/Git/bin/git-var GIT_COMMITTER_IDENT usage: git-var [-l | <variable>]

Steffen Prohaska schrieb:

Thank you. Here is a quick-fix.

-- Hannes

On Tue, 9 Oct 2007, Johannes Sixt wrote:

Extern declarations inside a local scope will not work on more modern gcc versions. Don't do it. Do proper prototyping in proper scope.

		Linus

This patch fixed executing of non-builtins if installation dir contains spaces. That is 'git var' works now.

The original patch is by Johannes Sixt <j.sixt@viscovery.net>.

Signed-off-by: Steffen Prohaska <prohaska@zib.de>
---
 compat/mingw.c    |    2 +-
 exec_cmd.c        |    2 +-
 git-compat-util.h |    1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

Ok, this is what I created from the quick-fix. It works for me in msysgit.

Should the patch be polished that it can be applied to git.git or will we only apply it to 4msysgit?

If it should be polished, what would be the right way? ifdef in exec_cmd.c?

	Steffen

Steffen Prohaska schrieb:

I'll apply it to mingw.git, and as long as you don't rebase or pull from there, you'd also have to apply it to 4msysgit.

git.git is a no-go at this time - compat/mingw.c doesn't exist, yet.

This area needs more polishing, and it will be among the *last* mingw patches that flow upstream.

BTW, I think the fix is incomplete anyway: We quote only argv[0], but actually all of argv should be quoted. Will test.

-- Hannes

If an external git command (not a shell script) was invoked with arguments that contain spaces, these arguments would be split into separate arguments. They must be quoted. This also affected installations where $prefix contained a space, as in "C:\Program Files\GIT". Both errors can be triggered by invoking

     git hash-object "a b"

where "a b" is an existing file. --- Johannes Sixt schrieb:

Here is the proper fix.

Yes, this leaks memory on the error path. We can clean that up later...

-- Hannes

  compat/mingw.c |    7 ++++++-
  1 files changed, 6 insertions(+), 1 deletions(-)