summaryrefslogtreecommitdiff
path: root/cache.h
diff options
context:
space:
mode:
Diffstat (limited to 'cache.h')
-rw-r--r--cache.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/cache.h b/cache.h
index 427b600267..35f30752c6 100644
--- a/cache.h
+++ b/cache.h
@@ -1009,6 +1009,7 @@ struct ref {
char *symref;
unsigned int force:1,
merge:1,
+ nonfastforward:1,
deletion:1;
enum {
REF_STATUS_NONE = 0,
@@ -1019,10 +1020,6 @@ struct ref {
REF_STATUS_REMOTE_REJECT,
REF_STATUS_EXPECTING_REPORT
} status;
- enum {
- NON_FF_HEAD = 1,
- NON_FF_OTHER
- } nonfastforward;
char *remote_status;
struct ref *peer_ref; /* when renaming */
char name[FLEX_ARRAY]; /* more */