Merge refs/heads/portable from http://www.cs.berkeley.edu/~ejr/gits/git.git

diff --cc apply.c
Simple merge

diff --cc cache.h
index 1478631b40bf122556e50d19686868b1fb03b712,e4f4664572ae3b6d58f04a87fe57ab8b460dd48f..d407f390010c8db7c9e469675bbd7f5a8ece1fa2
--- 1/cache.h
--- 2/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);

diff --cc connect.c
Simple merge

diff --cc ls-files.c
Simple merge