git-apply: creatign empty files is nonfatal

diff --git a/read-cache.c b/read-cache.c
index b3eec846731b3c3b8b61f94ba0dff3e80fc1407d..0d949f691d598905b1774821965439f96e3348ce 100644 (file)
--- a/read-cache.c
+++ b/read-cache.c
@@ -3,7 +3,6 @@
  *
  * Copyright (C) Linus Torvalds, 2005
  */
-#include <stdarg.h>
 #include "cache.h"
 
 struct cache_entry **active_cache = NULL;
@@ -18,7 +17,7 @@ void fill_stat_cache_info(struct cache_entry *ce, struct stat *st)
 {
        ce->ce_ctime.sec = htonl(st->st_ctime);
        ce->ce_mtime.sec = htonl(st->st_mtime);
-#ifdef NSEC
+#ifdef USE_NSEC
        ce->ce_ctime.nsec = htonl(st->st_ctim.tv_nsec);
        ce->ce_mtime.nsec = htonl(st->st_mtim.tv_nsec);
 #endif
@@ -51,7 +50,7 @@ int ce_match_stat(struct cache_entry *ce, struct stat *st)
        if (ce->ce_ctime.sec != htonl(st->st_ctime))
                changed |= CTIME_CHANGED;
 
-#ifdef NSEC
+#ifdef USE_NSEC
        /*
         * nsec seems unreliable - not all filesystems support it, so
         * as long as it is in the inode cache you get right nsec
@@ -66,9 +65,19 @@ int ce_match_stat(struct cache_entry *ce, struct stat *st)
        if (ce->ce_uid != htonl(st->st_uid) ||
            ce->ce_gid != htonl(st->st_gid))
                changed |= OWNER_CHANGED;
-       if (ce->ce_dev != htonl(st->st_dev) ||
-           ce->ce_ino != htonl(st->st_ino))
+       if (ce->ce_ino != htonl(st->st_ino))
                changed |= INODE_CHANGED;
+
+#ifdef USE_STDEV
+       /*
+        * st_dev breaks on network filesystems where different
+        * clients will have different views of what "device"
+        * the filesystem is on
+        */
+       if (ce->ce_dev != htonl(st->st_dev))
+               changed |= INODE_CHANGED;
+#endif
+
        if (ce->ce_size != htonl(st->st_size))
                changed |= DATA_CHANGED;
        return changed;
@@ -123,7 +132,7 @@ int cache_name_pos(const char *name, int namelen)
        while (last > first) {
                int next = (last + first) >> 1;
                struct cache_entry *ce = active_cache[next];
-               int cmp = cache_name_compare(name, namelen, ce->name, htons(ce->ce_flags));
+               int cmp = cache_name_compare(name, namelen, ce->name, ntohs(ce->ce_flags));
                if (!cmp)
                        return next;
                if (cmp < 0) {
@@ -191,11 +200,13 @@ static int check_file_directory_conflict(const struct cache_entry *ce,
        cp = pathbuf;
        while (1) {
                char *ep = strchr(cp, '/');
+               int len;
                if (!ep)
                        break;
                *ep = 0;    /* first cut it at slash */
+               len = ep - pathbuf;
                pos = cache_name_pos(pathbuf,
-                                    htons(create_ce_flags(ep-cp, stage)));
+                                    ntohs(create_ce_flags(len, stage)));
                if (0 <= pos) {
                        /* Our leading path component is registered as a file,
                         * and we are trying to make it a directory.  This is
@@ -219,7 +230,7 @@ static int check_file_directory_conflict(const struct cache_entry *ce,
         * a directory there?
         */
        pos = cache_name_pos(path,
-                            htons(create_ce_flags(namelen, stage)));
+                            ntohs(create_ce_flags(namelen, stage)));
 
        /* (0 <= pos) cannot happen because add_cache_entry()
         * should have taken care of that case.
@@ -268,7 +279,7 @@ int add_cache_entry(struct cache_entry *ce, int option)
        int pos;
        int ok_to_add = option & ADD_CACHE_OK_TO_ADD;
        int ok_to_replace = option & ADD_CACHE_OK_TO_REPLACE;
-       pos = cache_name_pos(ce->name, htons(ce->ce_flags));
+       pos = cache_name_pos(ce->name, ntohs(ce->ce_flags));
 
        /* existing match? Just replace it */
        if (pos >= 0) {
@@ -296,7 +307,7 @@ int add_cache_entry(struct cache_entry *ce, int option)
        if (check_file_directory_conflict(ce, ok_to_replace)) {
                if (!ok_to_replace)
                        return -1;
-               pos = cache_name_pos(ce->name, htons(ce->ce_flags));
+               pos = cache_name_pos(ce->name, ntohs(ce->ce_flags));
                pos = -pos-1;
        }