apply: use preimage as the checkout baseline

Use the preimage as the checkout's baseline.  This allows us to support
applying patches to files that are modified in the working directory
(those that differ from the HEAD and index).  Without this, files will
be reported as (checkout) conflicts.  With this, we expect the on-disk
data when we began the patch application (the "preimage") to be on-disk
during checkout.

We could have also simply used the `FORCE` flag to checkout to
accomplish a similar mechanism.  However, `FORCE` ignores all
differences, while providing a preimage ensures that we will only
overwrite the file contents that we actually read.

Modify the reader interface to provide the OID to support this.

1 files changed, 2 insertions, 1 deletions

diff --git a/src/reader.h b/src/reader.h
index 18c7f59ee..7bb60e144 100644
--- a/src/reader.h
+++ b/src/reader.h
@@ -22,7 +22,7 @@ typedef struct git_reader git_reader;
  * reader after disposing the underlying object that it reads.
  */
 struct git_reader {
-	int (*read)(git_buf *out, git_reader *reader, const char *filename);
+	int (*read)(git_buf *out, git_oid *out_oid, git_reader *reader, const char *filename);
 	void (*free)(git_reader *reader);
 };
 
@@ -89,6 +89,7 @@ extern int git_reader_for_workdir(
  */
 extern int git_reader_read(
 	git_buf *out,
+	git_oid *out_id,
 	git_reader *reader,
 	const char *filename);