On Tue, Nov 14, 2017 at 10:48 AM, Stefan Beller wrote:
> test_expect_success 'unrelated file/submodule conflict is ignored' '
> (
> cd a_repo &&
> git checkout with_file^0 &&
> git cherry-pick with_sub^0
This makes no sense, yet. Sorry about the noise.
I think you
+cc Ефимов Василий who reported the issue at
https://public-inbox.org/git/743acc29-85bb-3773-b6a0-68d4a0b8f...@ispras.ru/
On Tue, Nov 14, 2017 at 9:31 AM, Elijah Newren wrote:
> The code for a newly added path assumed that the path was a normal file,
> and thus checked for there being a director
The code for a newly added path assumed that the path was a normal file,
and thus checked for there being a directory still being in the way of
the file. Note that since unpack_trees() does path-in-the-way checks
already, the only way for there to be a directory in the way at this
point in the cod
3 matches
Mail list logo
