pack-objects: quickfix for permission modes.

diff --git a/read-cache.c b/read-cache.c
index f458f50458299a3f306812f29a33d2b53dcfdcb2..d2f332a6222cc3543bde8fa661c54c5c904cf561 100644 (file)
--- a/read-cache.c
+++ b/read-cache.c
@@ -120,9 +120,9 @@ static int ce_modified_check_fs(struct cache_entry *ce, struct stat *st)
                if (ce_compare_link(ce, xsize_t(st->st_size)))
                        return DATA_CHANGED;
                break;
-       case S_IFDIRLNK:
-               /* No need to do anything, we did the exact compare in "match_stat_basic" */
-               break;
+       case S_IFDIR:
+               if (S_ISDIRLNK(ntohl(ce->ce_mode)))
+                       return 0;
        default:
                return TYPE_CHANGED;
        }
@@ -153,7 +153,7 @@ static int ce_match_stat_basic(struct cache_entry *ce, struct stat *st)
                        changed |= TYPE_CHANGED;
                else if (ce_compare_gitlink(ce))
                        changed |= DATA_CHANGED;
-               break;
+               return changed;
        default:
                die("internal error: ce_mode is %o", ntohl(ce->ce_mode));
        }
@@ -277,9 +277,9 @@ int base_name_compare(const char *name1, int len1, int mode1,
                return cmp;
        c1 = name1[len];
        c2 = name2[len];
-       if (!c1 && (S_ISDIR(mode1) || S_ISDIRLNK(mode1)))
+       if (!c1 && S_ISDIR(mode1))
                c1 = '/';
-       if (!c2 && (S_ISDIR(mode2) || S_ISDIRLNK(mode2)))
+       if (!c2 && S_ISDIR(mode2))
                c2 = '/';
        return (c1 < c2) ? -1 : (c1 > c2) ? 1 : 0;
 }
@@ -365,6 +365,10 @@ int add_file_to_cache(const char *path, int verbose)
                die("%s: can only add regular files, symbolic links or git-directories", path);
 
        namelen = strlen(path);
+       if (S_ISDIR(st.st_mode)) {
+               while (namelen && path[namelen-1] == '/')
+                       namelen--;
+       }
        size = cache_entry_size(namelen);
        ce = xcalloc(1, size);
        memcpy(ce->name, path, namelen);