projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge with master.kernel.org:/pub/scm/git/git.git
[git.git]
/
diff.c
diff --git
a/diff.c
b/diff.c
index
9bded28
..
7d06b03
100644
(file)
--- a/
diff.c
+++ b/
diff.c
@@
-10,7
+10,6
@@
#include "diffcore.h"
static const char *diff_opts = "-pu";
#include "diffcore.h"
static const char *diff_opts = "-pu";
-static unsigned char null_sha1[20] = { 0, };
static int use_size_cache;
static int use_size_cache;
@@
-414,7
+413,7
@@
void diff_free_filespec_data(struct diff_filespec *s)
static void prep_temp_blob(struct diff_tempfile *temp,
void *blob,
unsigned long size,
static void prep_temp_blob(struct diff_tempfile *temp,
void *blob,
unsigned long size,
- unsigned char *sha1,
+
const
unsigned char *sha1,
int mode)
{
int fd;
int mode)
{
int fd;