projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
GIT 1.3.0-rc2
[git.git]
/
combine-diff.c
diff --git
a/combine-diff.c
b/combine-diff.c
index
a23894d
..
7693884
100644
(file)
--- a/
combine-diff.c
+++ b/
combine-diff.c
@@
-1,5
+1,6
@@
#include "cache.h"
#include "commit.h"
#include "cache.h"
#include "commit.h"
+#include "blob.h"
#include "diff.h"
#include "diffcore.h"
#include "quote.h"
#include "diff.h"
#include "diffcore.h"
#include "quote.h"
@@
-104,7
+105,7
@@
static char *grab_blob(const unsigned char *sha1, unsigned long *size)
return xcalloc(1, 1);
}
blob = read_sha1_file(sha1, type, size);
return xcalloc(1, 1);
}
blob = read_sha1_file(sha1, type, size);
- if (strcmp(type,
"blob"
))
+ if (strcmp(type,
blob_type
))
die("object '%s' is not a blob!", sha1_to_hex(sha1));
return blob;
}
die("object '%s' is not a blob!", sha1_to_hex(sha1));
return blob;
}
@@
-649,7
+650,7
@@
static int show_patch_diff(struct combine_diff_path *elem, int num_parent,
int len = st.st_size;
int cnt = 0;
int len = st.st_size;
int cnt = 0;
- elem->mode =
DIFF_FILE_CANON_MODE
(st.st_mode);
+ elem->mode =
canon_mode
(st.st_mode);
size = len;
result = xmalloc(len + 1);
while (cnt < len) {
size = len;
result = xmalloc(len + 1);
while (cnt < len) {