From: Charles Bailey <charles@hashpling.org>
To: "Jonas Flodén" <jonas.floden@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: git mergetool from next not working in subdirectory
Date: Fri, 30 Jan 2009 14:06:15 +0000 [thread overview]
Message-ID: <20090130140615.GA26321@hashpling.org> (raw)
In-Reply-To: <glutv9$4b1$1@ger.gmane.org>
On Fri, Jan 30, 2009 at 02:05:45PM +0100, Jonas Flodén wrote:
> ~/src/rep/subdir $ git mergetool
> Merging the files: a/b/file.c
>
> git checkout-index: subdir/subdir/a/b/file.c is not in the cache
> git checkout-index: subdir/subdir/a/b/file.c is not in the cache
> git checkout-index: subdir/subdir/a/b/file.c is not in the cache
> Normal merge conflict for 'a/b/file.c':
> {local}: modified
>
> {remote}: modified
Oh bother. I know exactly what this is. ls-files -u shows paths
relative to the work tree root, whereas checkout-index responds to
relative paths. Essentially the "$prefix" needs to come out of the
calls to the new checkout_staged_file shell function.
This is the bad commit 0ec7b6c26dad51f690cd985d4a5357634123c4b7
I can patch this (and more importantly add a test for this) tonight if
nobody beats me to it.
--
Charles Bailey
http://ccgi.hashpling.plus.com/blog/
next prev parent reply other threads:[~2009-01-30 14:07 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-30 13:05 git mergetool from next not working in subdirectory Jonas Flodén
2009-01-30 13:50 ` Johannes Gilger
2009-01-30 14:06 ` Charles Bailey [this message]
2009-01-30 14:22 ` [PATCH] Quick and dirty mergetool fix Charles Bailey
2009-01-30 16:00 ` Jonas Flodén
2009-01-30 16:16 ` [PATCH] Quick and dirty mergetool fix - take 2 Charles Bailey
2009-01-30 16:18 ` Charles Bailey
2009-01-30 16:22 ` Jonas Flodén
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=20090130140615.GA26321@hashpling.org \
--to=charles@hashpling.org \
--cc=git@vger.kernel.org \
--cc=jonas.floden@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).