projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make git rebase interactive help match documentation.
[git.git]
/
sha1_file.c
diff --git
a/sha1_file.c
b/sha1_file.c
index
b62d0e3
..
3372ebc
100644
(file)
--- a/
sha1_file.c
+++ b/
sha1_file.c
@@
-13,6
+13,7
@@
#include "commit.h"
#include "tag.h"
#include "tree.h"
#include "commit.h"
#include "tag.h"
#include "tree.h"
+#include <stdint.h>
#ifndef O_NOATIME
#if defined(__linux__) && (defined(__i386__) || defined(__PPC__))
#ifndef O_NOATIME
#if defined(__linux__) && (defined(__i386__) || defined(__PPC__))
@@
-1161,7
+1162,7
@@
int find_pack_entry_one(const unsigned char *sha1,
int mi = (lo + hi) / 2;
int cmp = memcmp(index + 24 * mi + 4, sha1, 20);
if (!cmp) {
int mi = (lo + hi) / 2;
int cmp = memcmp(index + 24 * mi + 4, sha1, 20);
if (!cmp) {
- e->offset = ntohl(*((
int
*)(index + 24 * mi)));
+ e->offset = ntohl(*((
uint32_t
*)(index + 24 * mi)));
memcpy(e->sha1, sha1, 20);
e->p = p;
return 1;
memcpy(e->sha1, sha1, 20);
e->p = p;
return 1;