Re: What's in git.git (stable)

From: David Kastrup <dak@gnu.org>
Date: Jul 28, 2007, 08:56 UTC
Message-ID: <85zm1g3nze.fsf@lola.goethe.zz>
In-Reply-To: <7vvec4synj.fsf_-_@assigned-by-dhcp.cox.net>

Junio C Hamano <gitster@pobox.com> writes:

Show 5 quoted lines

> It's been a while since I sent this the last time.
>
> We are nearing 1.5.3 final; I pulled gitk updates tonight, and
> expect git-gui updates to 0.8.0 over the weekend.  There are a
> handful trivial fixes since 1.5.3-rc3.

I'd like to see some changes for mergetool's Emacs support: in moderately current versions of Emacs and XEmacs, ediff is a much preferable tool to emerge.

Also, the mergetool determines when to use emerge for merging by looking at the EDITOR/VISUAL variables. While it recognizes the presence of "emacsclient" and "gnuclient" there for offering the emerge tool, it does not actually use those settings for calling Emacs/XEmacs. If you use the desktop package, this means that you get a bear of a startup time while a _new_ instance of Emacs gets loaded against the wishes of the setup, and the command line parameters will be interpreted relatively to the last file restored into the desktop rather than the current directory (arguably a bug in the desktop package which I plan to fix eventually, but in the meantime the current package is farspread).

I'll try to come up with a fix this weekend if nobody beats me to it. As it stands, the mergetool is somewhere between subpar and unusable by default for a considerable number of Emacs users.

-- 
David Kastrup, Kriemhildstr. 15, 44793 Bochum