From: Jonathan Nieder <jrnieder@gmail.com>
To: Thomas Rast <trast@student.ethz.ch>
Cc: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>,
Bert Wesarg <bert.wesarg@googlemail.com>,
msysgit@googlegroups.com
Subject: Re: [PATCH v2 2/2] merge-file: correctly find files when called in subdir
Date: Sun, 17 Oct 2010 14:59:14 -0500 [thread overview]
Message-ID: <20101017195914.GA3434@burratino> (raw)
In-Reply-To: <d0e540fdced31557e983d7503da3dcb75c622dc9.1287342969.git.trast@student.ethz.ch>
Thomas Rast wrote:
> This is a slight semantic change on Windows, because it now
> substitutes / for \ in paths, but I suppose that's harmless?
Yeah, I think it doesn't matter either way. cc-ing msysgit@
just in case.
> builtin/merge-file.c | 7 ++++++-
> t/t6023-merge-file.sh | 8 ++++++++
> 2 files changed, 14 insertions(+), 1 deletions(-)
FWIW I still like both patches.
next prev parent reply other threads:[~2010-10-17 20:03 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-16 11:33 [PATCH] merge-file: correctly find files when called in subdir Thomas Rast
2010-10-16 13:30 ` Bert Wesarg
2010-10-17 1:11 ` Jonathan Nieder
2010-10-17 10:39 ` Thomas Rast
2010-10-17 16:05 ` Jonathan Nieder
2010-10-17 19:23 ` [PATCH v2 1/2] prefix_filename(): safely handle the case where pfx_len=0 Thomas Rast
2010-10-17 19:23 ` [PATCH v2 2/2] merge-file: correctly find files when called in subdir Thomas Rast
2010-10-17 19:59 ` Jonathan Nieder [this message]
2010-10-18 6:10 ` Johannes Sixt
2010-10-17 1:30 ` [PATCH] " Jonathan Nieder
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=20101017195914.GA3434@burratino \
--to=jrnieder@gmail.com \
--cc=bert.wesarg@googlemail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=msysgit@googlegroups.com \
--cc=trast@student.ethz.ch \
/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).