All of lore.kernel.org
 help / color / mirror / Atom feed
From: Johannes Sixt <j6t@kdbg.org>
To: Tim Henigan <tim.henigan@gmail.com>
Cc: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Subject: Re: What's cooking in git.git (Apr 2012, #08; Fri, 20)
Date: Sun, 22 Apr 2012 17:07:15 +0200	[thread overview]
Message-ID: <4F941EA3.7080200@kdbg.org> (raw)
In-Reply-To: <xmqqobqmkkxv.fsf@junio.mtv.corp.google.com>

Am 21.04.2012 02:06, schrieb Junio C Hamano:
> * th/difftool-diffall (2012-04-14) 8 commits
>   - difftool: print list of valid tools with '--tool-help'
>   - difftool: teach difftool to handle directory diffs
>   - difftool: eliminate setup_environment function
>   - difftool: stop appending '.exe' to git
>   - difftool: remove explicit change of PATH
>   - difftool: exit(0) when usage is printed
>   - difftool: add '--no-gui' option
>   - difftool: parse options using Getopt::Long
> 
> Rolls the two-directory-diff logic from diffall script (in contrib/) into
> "git difftool" framework.

This does not pass test 33 (the last one) on Windows:

+++ git difftool --dir-diff --extcmd ls branch
Use of uninitialized value in length at d:/Src/mingw-git/git-difftool line 55.
Use of uninitialized value in length at d:/Src/mingw-git/git-difftool line 55.
exiting now at d:/Src/mingw-git/git-difftool line 120.
usage: git diff [--no-index] <path> <path>
diff --raw --no-abbrev -z branch: command returned error: 129

("exiting now" is a debugging "warn" call that I inserted)

I don't know what's going on. One possibility is that an old Git.pm is
being used, because I haven't 'make install' yet.

I'm not going to look into this, but I can run tests if you tell me what
to do.

-- Hannes

  parent reply	other threads:[~2012-04-22 15:07 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-04-21  0:06 What's cooking in git.git (Apr 2012, #08; Fri, 20) Junio C Hamano
2012-04-21 10:23 ` SZEDER Gábor
2012-04-22  5:25   ` Junio C Hamano
2012-04-22 15:05     ` Felipe Contreras
2012-04-22 15:07 ` Johannes Sixt [this message]
2012-04-25 18:14   ` Tim Henigan
2012-04-26  6:31     ` Johannes Sixt

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4F941EA3.7080200@kdbg.org \
    --to=j6t@kdbg.org \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=tim.henigan@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.