git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH v2 2/2] merge-file: correctly find files when called in subdir

From
Jonathan Nieder <jrnieder@gmail.com>
Date
Oct 17, 2010, 19:59 UTC
Message-ID
<20101017195914.GA3434@burratino>
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.
Previous: Thomas RastNext: Johannes Sixt
Message 8 of 10 in “merge-file: correctly find files when called in subdir”
  1. merge-file: correctly find files when called in subdirThomas Rast, Oct 16, 2010
  2. Bert WesargOct 16, 2010
  3. Jonathan NiederOct 17, 2010
  4. Thomas RastOct 17, 2010
  5. Jonathan NiederOct 17, 2010
  6. 1/2 prefix_filename(): safely handle the case where pfx_len=0Thomas Rast, Oct 17, 2010
  7. 2/2 merge-file: correctly find files when called in subdirThomas Rast, Oct 17, 2010
  8. Jonathan NiederOct 17, 2010
  9. Johannes SixtOct 18, 2010
  10. Jonathan NiederOct 17, 2010

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.