From: Junio C Hamano <junkio@cox.net>
Date: Mon, 29 Aug 2005 06:02:01 +0000 (-0700)
Subject: Merge refs/heads/portable from http://www.cs.berkeley.edu/~ejr/gits/git.git
X-Git-Tag: v0.99.6~65
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=10d781b9caa4f71495c7b34963bef137216f86a8;p=git.git

Merge refs/heads/portable from cs.berkeley.edu/~ejr/gits/git.git
---

10d781b9caa4f71495c7b34963bef137216f86a8
diff --cc cache.h
index 1478631b,e4f46645..d407f390
--- a/cache.h
+++ b/cache.h
@@@ -309,9 -313,8 +313,9 @@@ struct ref 
  	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];
+ 	char name[];
  };
  
  extern int git_connect(int fd[2], char *url, const char *prog);