Modify match_stat_basic, into one function that handles the
general case, which is the same for all index formats, and
a function that handles the specific parts for each index
file version.
Signed-off-by: Thomas Gummerer <t.gummerer@xxxxxxxxx>
---
read-cache.c | 77 +++++++++++++++++++++++++++++++-----------------------------
1 file changed, 40 insertions(+), 37 deletions(-)
diff --git a/read-cache.c b/read-cache.c
index 3d83f05..6a0af35 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -163,38 +163,10 @@ static int ce_modified_check_fs(struct cache_entry *ce, struct stat *st)
return 0;
}
-static int ce_match_stat_basic(struct cache_entry *ce, struct stat *st)
+static int ce_match_stat_basic_v2(struct cache_entry *ce,
+ struct stat *st,
+ int changed)
{
- unsigned int changed = 0;
-
- if (ce->ce_flags & CE_REMOVE)
- return MODE_CHANGED | DATA_CHANGED | TYPE_CHANGED;
-
- switch (ce->ce_mode & S_IFMT) {
- case S_IFREG:
- changed |= !S_ISREG(st->st_mode) ? TYPE_CHANGED : 0;
- /* We consider only the owner x bit to be relevant for
- * "mode changes"
- */
- if (trust_executable_bit &&
- (0100 & (ce->ce_mode ^ st->st_mode)))
- changed |= MODE_CHANGED;
- break;
- case S_IFLNK:
- if (!S_ISLNK(st->st_mode) &&
- (has_symlinks || !S_ISREG(st->st_mode)))
- changed |= TYPE_CHANGED;
- break;
- case S_IFGITLINK:
- /* We ignore most of the st_xxx fields for gitlinks */
- if (!S_ISDIR(st->st_mode))
- changed |= TYPE_CHANGED;
- else if (ce_compare_gitlink(ce))
- changed |= DATA_CHANGED;
- return changed;
- default:
- die("internal error: ce_mode is %o", ce->ce_mode);
- }
if (ce->ce_mtime.sec != (unsigned int)st->st_mtime)
changed |= MTIME_CHANGED;
if (trust_ctime && ce->ce_ctime.sec != (unsigned int)st->st_ctime)
@@ -235,6 +207,43 @@ static int ce_match_stat_basic(struct cache_entry *ce, struct stat *st)
return changed;
}
+static int ce_match_stat_basic(struct cache_entry *ce, struct stat *st)
+{
+ unsigned int changed = 0;
+
+ if (ce->ce_flags & CE_REMOVE)
+ return MODE_CHANGED | DATA_CHANGED | TYPE_CHANGED;
+
+ switch (ce->ce_mode & S_IFMT) {
+ case S_IFREG:
+ changed |= !S_ISREG(st->st_mode) ? TYPE_CHANGED : 0;
+ /* We consider only the owner x bit to be relevant for
+ * "mode changes"
+ */
+ if (trust_executable_bit &&
+ (0100 & (ce->ce_mode ^ st->st_mode)))
+ changed |= MODE_CHANGED;
+ break;
+ case S_IFLNK:
+ if (!S_ISLNK(st->st_mode) &&
+ (has_symlinks || !S_ISREG(st->st_mode)))
+ changed |= TYPE_CHANGED;
+ break;
+ case S_IFGITLINK:
+ /* We ignore most of the st_xxx fields for gitlinks */
+ if (!S_ISDIR(st->st_mode))
+ changed |= TYPE_CHANGED;
+ else if (ce_compare_gitlink(ce))
+ changed |= DATA_CHANGED;
+ return changed;
+ default:
+ die("internal error: ce_mode is %o", ce->ce_mode);
+ }
+
+ changed = ce_match_stat_basic_v2(ce, st, changed);
+ return changed;
+}
+
static int is_racy_timestamp(const struct index_state *istate, struct cache_entry *ce)
{
return (!S_ISGITLINK(ce->ce_mode) &&
@@ -1443,7 +1452,6 @@ void read_index_v2(struct index_state *istate, void *mmap, int mmap_size)
src_offset += consumed;
}
strbuf_release(&previous_name_buf);
-
while (src_offset <= mmap_size - 20 - 8) {
/* After an array of active_nr index entries,
* there can be arbitrary number of extended
@@ -1500,7 +1508,6 @@ int read_index_from(struct index_state *istate, const char *path)
die("index file smaller than expected");
mmap = xmmap(NULL, mmap_size, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0);
- close(fd);
if (mmap == MAP_FAILED)
die_errno("unable to map index file");
@@ -1512,7 +1519,6 @@ int read_index_from(struct index_state *istate, const char *path)
goto unmap;
read_index_v2(istate, mmap, mmap_size);
-
istate->timestamp.sec = st.st_mtime;
istate->timestamp.nsec = ST_MTIME_NSEC(st);
@@ -1802,9 +1808,6 @@ int write_index(struct index_state *istate, int newfd)
}
}
- if (!istate->version)
- istate->version = INDEX_FORMAT_DEFAULT;
-
/* demote version 3 to version 2 when the latter suffices */
if (istate->version == 3 || istate->version == 2)
istate->version = extended ? 3 : 2;
--
1.7.10.886.gdf6792c.dirty
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html