contrib/subtree: fix broken &&-chains and revealed test error

diff --git a/read-cache.c b/read-cache.c
index 8d71860f692ffa5deafe7f23774b1b9ab2f31378..36ff89f29e5f56a5b3dcfd803f12cd139295b8b8 100644 (file)
--- a/read-cache.c
+++ b/read-cache.c
@@ -681,15 +681,18 @@ int add_to_index(struct index_state *istate, const char *path, struct stat *st,
        alias = index_file_exists(istate, ce->name, ce_namelen(ce), ignore_case);
        if (alias && !ce_stage(alias) && !ie_match_stat(istate, alias, st, ce_option)) {
                /* Nothing changed, really */
-               free(ce);
                if (!S_ISGITLINK(alias->ce_mode))
                        ce_mark_uptodate(alias);
                alias->ce_flags |= CE_ADDED;
+
+               free(ce);
                return 0;
        }
        if (!intent_only) {
-               if (index_path(ce->sha1, path, st, HASH_WRITE_OBJECT))
+               if (index_path(ce->sha1, path, st, HASH_WRITE_OBJECT)) {
+                       free(ce);
                        return error("unable to index file %s", path);
+               }
        } else
                set_object_name_for_intent_to_add_entry(ce);
 
@@ -704,9 +707,11 @@ int add_to_index(struct index_state *istate, const char *path, struct stat *st,
                    ce->ce_mode == alias->ce_mode);
 
        if (pretend)
-               ;
-       else if (add_index_entry(istate, ce, add_option))
-               return error("unable to add %s to index",path);
+               free(ce);
+       else if (add_index_entry(istate, ce, add_option)) {
+               free(ce);
+               return error("unable to add %s to index", path);
+       }
        if (verbose && !was_same)
                printf("add '%s'\n", path);
        return 0;
@@ -743,12 +748,9 @@ struct cache_entry *make_cache_entry(unsigned int mode,
        ce->ce_mode = create_ce_mode(mode);
 
        ret = refresh_cache_entry(ce, refresh_options);
-       if (!ret) {
+       if (ret != ce)
                free(ce);
-               return NULL;
-       } else {
-               return ret;
-       }
+       return ret;
 }
 
 int ce_same_name(const struct cache_entry *a, const struct cache_entry *b)
@@ -1486,18 +1488,25 @@ static struct cache_entry *create_from_disk(struct ondisk_cache_entry *ondisk,
        return ce;
 }
 
-static void check_ce_order(struct cache_entry *ce, struct cache_entry *next_ce)
+static void check_ce_order(struct index_state *istate)
 {
-       int name_compare = strcmp(ce->name, next_ce->name);
-       if (0 < name_compare)
-               die("unordered stage entries in index");
-       if (!name_compare) {
-               if (!ce_stage(ce))
-                       die("multiple stage entries for merged file '%s'",
-                               ce->name);
-               if (ce_stage(ce) > ce_stage(next_ce))
-                       die("unordered stage entries for '%s'",
-                               ce->name);
+       unsigned int i;
+
+       for (i = 1; i < istate->cache_nr; i++) {
+               struct cache_entry *ce = istate->cache[i - 1];
+               struct cache_entry *next_ce = istate->cache[i];
+               int name_compare = strcmp(ce->name, next_ce->name);
+
+               if (0 < name_compare)
+                       die("unordered stage entries in index");
+               if (!name_compare) {
+                       if (!ce_stage(ce))
+                               die("multiple stage entries for merged file '%s'",
+                                   ce->name);
+                       if (ce_stage(ce) > ce_stage(next_ce))
+                               die("unordered stage entries for '%s'",
+                                   ce->name);
+               }
        }
 }
 
@@ -1562,9 +1571,6 @@ int do_read_index(struct index_state *istate, const char *path, int must_exist)
                ce = create_from_disk(disk_ce, &consumed, previous_name);
                set_index_entry(istate, i, ce);
 
-               if (i > 0)
-                       check_ce_order(istate->cache[i - 1], ce);
-
                src_offset += consumed;
        }
        strbuf_release(&previous_name_buf);
@@ -1608,11 +1614,10 @@ int read_index_from(struct index_state *istate, const char *path)
 
        ret = do_read_index(istate, path, 0);
        split_index = istate->split_index;
-       if (!split_index)
-               return ret;
-
-       if (is_null_sha1(split_index->base_sha1))
+       if (!split_index || is_null_sha1(split_index->base_sha1)) {
+               check_ce_order(istate);
                return ret;
+       }
 
        if (split_index->base)
                discard_index(split_index->base);
@@ -1628,6 +1633,7 @@ int read_index_from(struct index_state *istate, const char *path)
                                     sha1_to_hex(split_index->base_sha1)),
                    sha1_to_hex(split_index->base->sha1));
        merge_base_index(istate);
+       check_ce_order(istate);
        return ret;
 }