projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Plug leak in Daniel's read-tree.
[git.git]
/
cache.h
diff --git
a/cache.h
b/cache.h
index
742378f
..
dcfcbbc
100644
(file)
--- a/
cache.h
+++ b/
cache.h
@@
-38,10
+38,9
@@
#define NORETURN __attribute__((__noreturn__))
#else
#define NORETURN
#define NORETURN __attribute__((__noreturn__))
#else
#define NORETURN
-#endif
-
#ifndef __attribute__
#ifndef __attribute__
-#define __attribute(x)
+#define __attribute__(x)
+#endif
#endif
/*
#endif
/*
@@
-55,13
+54,6
@@
#define DEFAULT_GIT_PORT 9418
/*
#define DEFAULT_GIT_PORT 9418
/*
- * Environment variables transition.
- * We accept older names for now but warn.
- */
-extern char *gitenv_bc(const char *);
-#define gitenv(e) (getenv(e) ? : gitenv_bc(e))
-
-/*
* Basic data structures for the directory cache
*/
* Basic data structures for the directory cache
*/
@@
-310,6
+302,7
@@
struct ref {
struct ref *next;
unsigned char old_sha1[20];
unsigned char new_sha1[20];
struct ref *next;
unsigned char old_sha1[20];
unsigned char new_sha1[20];
+ unsigned char force;
struct ref *peer_ref; /* when renaming */
char name[0];
};
struct ref *peer_ref; /* when renaming */
char name[0];
};
@@
-323,7
+316,7
@@
extern int get_ack(int fd, unsigned char *result_sha1);
extern struct ref **get_remote_heads(int in, struct ref **list, int nr_match, char **match);
extern struct packed_git *parse_pack_index(unsigned char *sha1);
extern struct ref **get_remote_heads(int in, struct ref **list, int nr_match, char **match);
extern struct packed_git *parse_pack_index(unsigned char *sha1);
-extern struct packed_git *parse_pack_index_file(
unsigned char *sha1,
+extern struct packed_git *parse_pack_index_file(
const unsigned char *sha1,
char *idx_path);
extern void prepare_packed_git(void);
char *idx_path);
extern void prepare_packed_git(void);