When we added caching, this meant that calling `can_be_resolved_in_ui?` didn't
always call `lines`, which meant that we didn't get the benefit of the
side-effect from that, where it forced the conflict data itself to UTF-8.

To fix that, make this explicit by separating the `raw_content` (any encoding)
from the `content` (which is either UTF-8, or an exception is raised).

Before we were using a "plumbing" Gitlab::Git method that does not go
through Gitaly migration checking.

They were probably added to compensate for tests shortcomings, but now
they don't complain.

Closes gitaly#1095

Split repository search result on \n instead of $ to prevent the items of the array to start with a newline. Remove the strip from parsing the search result to keep result endlines.

Prevents `.gitattributes` blob lookup being repeated for every file checked at a given ref

Part of: gitlab-org/gitaly#476

Part of: gitlab-org/gitaly#476

Part of: gitlab-org/gitlab-ce!17561

Part of: gitlab-org/gitaly#540

Part of: gitlab-org/gitaly#546

Part of: gitlab-org/gitaly#779

Part of: gitlab-org/gitaly#541

Part of gitlab-org/gitaly#324

Part of gitlab-org/gitaly#616

Fixes gitaly#1057

The old code was calling LastCommitForPath to extract a commit ID _then_
call FindCommit to get a commit it already had in the first place!

By default, --prune is added to the command-line of a `git fetch` operation,
but for repositories with many references this can take a long time to run. We
shouldn't need to run --prune the first time we fetch a new repository.

Closes gitaly#1046

Part of the migration as tracked in: gitlab-org/gitaly#1026

These are obscuring the real error, which is confusing for everyone.

Adds a test where a branch name is also a valid commit id. Git, the
binary should create an error message which is difficult to parse and
leading to errors later, as seen in: gitlab-org/gitlab-ce#43222

To catch these cases in the future,
gitlab-test@1942eed5cc108b19c7405106e81fa96125d0be22 was created. Which
a branch name matching the commit

We need to ignore the names for renamed files when configuring with sparse
checkout.

The tracking issue if this causes problems is
https://gitlab.com/gitlab-org/gitaly/issues/1028

When the applied diff contains UTF-8 or some other encoded data, the diff
returned back from the git process may be in ASCII-8BIT format. Writing this
data to stdin may fail if the data because stdin expects this data to be in
UTF-8. By switching the output to binmode, we ensure that the diff will
always be written as-is.

Closes gitlab-org/gitlab-ee#4960

		    #	modified:   lib/gitlab/git/commit.rb