From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: What's cooking in git.git (Jan 2016, #05; Tue, 26)
Date: Wed, 27 Jan 2016 11:21:29 +0100 (CET) [thread overview]
Message-ID: <alpine.DEB.2.20.1601271120150.2964@virtualbox> (raw)
In-Reply-To: <xmqqr3h3amtk.fsf@gitster.mtv.corp.google.com>
Hi Junio,
On Tue, 26 Jan 2016, Junio C Hamano wrote:
> * js/mingw-tests (2016-01-26) 20 commits
> - mingw: skip a test in t9130 that cannot pass on Windows
> - mingw: do not bother to test funny file names
> - mingw: handle the missing POSIXPERM prereq in t9124
> - mingw: avoid illegal filename in t9118
> - mingw: mark t9100's test cases with appropriate prereqs
> - Avoid absolute path in t0008
> - mingw: work around pwd issues in the tests
> - mingw: fix t9700's assumption about directory separators
> - mingw: skip test in t1508 that fails due to path conversion
> - tests: turn off git-daemon tests if FIFOs are not available
> - mingw: disable mkfifo-based tests
> - mingw: accomodate t0060-path-utils for MSYS2
> - mingw: fix t5601-clone.sh
> - mingw: let lstat() fail with errno == ENOTDIR when appropriate
> - mingw: try to delete target directory before renaming
> - mingw: prepare the TMPDIR environment variable for shell scripts
> - mingw: factor out Windows specific environment setup
> - Git.pm: stop assuming that absolute paths start with a slash
> - mingw: do not trust MSYS2's MinGW gettext.sh
> - mingw: let's use gettext with MSYS2
> (this branch uses js/msys2.)
>
> Updates test scripts to remove assumptions that are not portable
> between Git for POSIX and Git for Windows, or to skip ones with
> expectations that are not satisfiable on Git for Windows.
>
> Looks mostly done, but I had to tweak a few things, so
> Waiting for re-test.
Will re-submit with additional tweaks.
> * js/xmerge-maker-eol (2016-01-26) 2 commits
> - merge-file: ensure that conflict sections match eol style
> - merge-file: let conflict markers match end-of-line style of the context
>
> The low-level merge machinery has been taught to use CRLF line
> termination when inserting conflict markers to merged contents that
> are themselves CRLF line-terminated.
>
> Will merge to 'next'.
There is one more tweak I introduced, and will resubmit: the test case did
not test the intended 3 out of the 4 conflict markers.
Ciao,
Dscho
prev parent reply other threads:[~2016-01-27 10:21 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-27 0:27 What's cooking in git.git (Jan 2016, #05; Tue, 26) Junio C Hamano
2016-01-27 2:54 ` Eric Wong
2016-01-27 6:28 ` Junio C Hamano
2016-01-27 7:03 ` Eric Wong
2016-01-27 10:21 ` Johannes Schindelin [this message]
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=alpine.DEB.2.20.1601271120150.2964@virtualbox \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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).