projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix git-log-script when HEAD is invalid.
[git.git]
/
cache.h
diff --git
a/cache.h
b/cache.h
index
742378f
..
0dcd2fe
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
/*
@@
-59,7
+58,11
@@
* We accept older names for now but warn.
*/
extern char *gitenv_bc(const char *);
* We accept older names for now but warn.
*/
extern char *gitenv_bc(const char *);
+#ifdef __GNUC__
#define gitenv(e) (getenv(e) ? : gitenv_bc(e))
#define gitenv(e) (getenv(e) ? : gitenv_bc(e))
+#else
+#define gitenv(e) (getenv(e) ? getenv(e) : gitenv_bc(e))
+#endif
/*
* Basic data structures for the directory cache
/*
* Basic data structures for the directory cache
@@
-310,6
+313,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];
};