Commit 1eefd3561225bfdedfe52a7e9faa6e7c88d7a046
2014-01-29T18:44:29
index: Implement folder-file checks
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162
diff --git a/src/index.c b/src/index.c
index e16529d..aa30f9d 100644
--- a/src/index.c
+++ b/src/index.c
@@ -712,32 +712,29 @@ static git_index_entry *index_entry_dup(const git_index_entry *source_entry)
return entry;
}
-#if 0
static int has_file_name(git_index *index,
- const git_index_entry *entry, int pos, int ok_to_replace)
+ const git_index_entry *entry, size_t pos, int ok_to_replace)
{
int retval = 0;
- int len = ce_namelen(ce);
- int stage = ce_stage(ce);
- const char *name = ce->name;
+ size_t len = strlen(entry->path);
+ int stage = GIT_IDXENTRY_STAGE(entry);
+ const char *name = entry->path;
- while (pos < istate->cache_nr) {
- struct cache_entry *p = istate->cache[pos++];
+ while (pos < index->entries.length) {
+ git_index_entry *p = index->entries.contents[pos++];
- if (len >= ce_namelen(p))
+ if (len >= strlen(p->path))
break;
- if (memcmp(name, p->name, len))
+ if (memcmp(name, p->path, len))
break;
- if (ce_stage(p) != stage)
- continue;
- if (p->name[len] != '/')
+ if (GIT_IDXENTRY_STAGE(p) != stage)
continue;
- if (p->ce_flags & CE_REMOVE)
+ if (p->path[len] != '/')
continue;
retval = -1;
if (!ok_to_replace)
break;
- remove_index_entry_at(istate, --pos);
+ git_vector_remove(&index->entries, --pos);
}
return retval;
}
@@ -750,67 +747,65 @@ static int has_dir_name(git_index *index,
const git_index_entry *entry, int ok_to_replace)
{
int retval = 0;
- int stage = ce_stage(ce);
- const char *name = ce->name;
- const char *slash = name + ce_namelen(ce);
+ int stage = GIT_IDXENTRY_STAGE(entry);
+ const char *name = entry->path;
+ const char *slash = name + strlen(name);
for (;;) {
- int len;
+ size_t len, position;
for (;;) {
if (*--slash == '/')
break;
- if (slash <= ce->name)
+ if (slash <= entry->path)
return retval;
}
len = slash - name;
- pos = index_name_stage_pos(istate, name, len, stage);
- if (pos >= 0) {
- /*
- * Found one, but not so fast. This could
- * be a marker that says "I was here, but
- * I am being removed". Such an entry is
- * not a part of the resulting tree, and
- * it is Ok to have a directory at the same
- * path.
- */
- if (!(istate->cache[pos]->ce_flags & CE_REMOVE)) {
- retval = -1;
- if (!ok_to_replace)
- break;
- remove_index_entry_at(istate, pos);
- continue;
- }
+ if (git_index__find(&position, index, name, len, stage) == 0) {
+ retval = -1;
+ if (!ok_to_replace)
+ break;
+
+ git_vector_remove(&index->entries, position);
+ continue;
}
- else
- pos = -pos-1;
/*
* Trivial optimization: if we find an entry that
* already matches the sub-directory, then we know
* we're ok, and we can exit.
*/
- while (pos < istate->cache_nr) {
- struct cache_entry *p = istate->cache[pos];
- if ((ce_namelen(p) <= len) ||
- (p->name[len] != '/') ||
- memcmp(p->name, name, len))
+ while (position < index->entries.length) {
+ git_index_entry *p = index->entries.contents[position];
+
+ if ((strlen(p->path) <= len) ||
+ (p->path[len] != '/') ||
+ memcmp(p->path, name, len))
break; /* not our subdirectory */
- if (ce_stage(p) == stage && !(p->ce_flags & CE_REMOVE))
- /*
- * p is at the same stage as our entry, and
- * is a subdirectory of what we are looking
- * at, so we cannot have conflicts at our
- * level or anything shorter.
- */
+
+ if (GIT_IDXENTRY_STAGE(p) == stage)
return retval;
- pos++;
+
+ position++;
}
}
return retval;
}
-#endif
+
+static int check_file_directory_conflict(git_index *index,
+ git_index_entry *entry, size_t pos, int ok_to_replace)
+{
+ int retval = has_file_name(index, entry, pos, ok_to_replace);
+ retval = retval + has_dir_name(index, entry, ok_to_replace);
+
+ if (retval) {
+ giterr_set(GITERR_INDEX, "'%s' appears as both a file an a directory", entry->path);
+ return -1;
+ }
+
+ return 0;
+}
static int index_insert(git_index *index, git_index_entry *entry, int replace)
{
@@ -838,6 +833,9 @@ static int index_insert(git_index *index, git_index_entry *entry, int replace)
entry->mode = index_merge_mode(index, *existing, entry->mode);
}
+ if (check_file_directory_conflict(index, entry, position, replace) < 0)
+ return -1;
+
/* if replacing is not requested or no existing entry exists, just
* insert entry at the end; the index is no longer sorted
*/