All of lore.kernel.org
 help / color / mirror / Atom feed
From: Theodore Tso <tytso@mit.edu>
To: Kelvie Wong <kelvie@ieee.org>
Cc: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Subject: Re: Mergetool generating blank files (1.5.3)
Date: Thu, 27 Sep 2007 18:52:18 -0400	[thread overview]
Message-ID: <20070927225218.GD8688@thunk.org> (raw)
In-Reply-To: <94ccbe710709271523s7e4c7a1dh53e34bd460c31d1f@mail.gmail.com>

On Thu, Sep 27, 2007 at 03:23:44PM -0700, Kelvie Wong wrote:
> Finally got it to work.  emacs (at least the version I'm using,
> 22.1.1) seems to set the $PWD via its first argument, that is,
> $LOCAL's directory, and when it goes to save, it tries to save $path
> on top of that.

It's not that emacs sets $PWD via its first argument, but the output
file is passed from emerge-files*-command to stashed in the per-buffer
variable emerge-file-out, which in turn gets passed to the emacs lisp
file write-file, which is what gets run when you run C-x C-w --- and
write-file interprets a relative pathname based on the containing
directory of the existing buffer.

> The updated patch above would be just to use the basename, that is, if
> it is certain that $LOCAL and $path will always reside in the same
> directory -- and I believe, but am not certain, that this is the case.

> Also, I am not sure if this is specific to my version of Emacs, so
> perhaps some further testing is required.

Yep, I've checked both emacs21 and emacs23-snapshot, and they both use
write-file, so this seems to be a long-standing bug (and I would call
it that) in emerge.el.  So a patch like what you suggested is probably
going to be needed.

						- Ted

  reply	other threads:[~2007-09-27 22:52 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-09-27 18:31 Mergetool generating blank files (1.5.3) Kelvie Wong
2007-09-27 18:57 ` Pierre Habouzit
2007-09-27 19:00   ` Russ Brown
2007-09-27 19:11     ` Pierre Habouzit
2007-09-27 22:23       ` Theodore Tso
2007-09-27 22:28         ` Pierre Habouzit
2007-09-28  5:15           ` Peter Baumann
2007-09-28  6:35             ` Pierre Habouzit
2007-09-27 19:12   ` Jeff King
2007-09-27 19:16     ` Pierre Habouzit
2007-09-27 19:41       ` Jeff King
2007-09-27 19:24   ` Kelvie Wong
2007-09-27 19:58     ` Junio C Hamano
2007-09-27 20:12       ` Kelvie Wong
2007-09-27 20:28         ` Junio C Hamano
2007-09-27 20:38           ` Kelvie Wong
2007-09-27 20:47             ` Junio C Hamano
2007-09-27 20:51               ` Junio C Hamano
2007-09-27 21:17                 ` Kelvie Wong
2007-09-27 21:22                   ` Kelvie Wong
2007-09-27 21:33                     ` Junio C Hamano
2007-09-27 21:41                       ` Junio C Hamano
2007-09-27 22:23                         ` Kelvie Wong
2007-09-27 22:52                           ` Theodore Tso [this message]
2007-09-28  4:17                             ` Kelvie Wong
2007-09-28  6:19                               ` David Kastrup
2007-09-27 22:35                         ` Theodore Tso
2007-09-28  8:43     ` David Kågedal

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=20070927225218.GD8688@thunk.org \
    --to=tytso@mit.edu \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=kelvie@ieee.org \
    /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.