diff --git a/read-tree.c b/read-tree.c
index c25385d79f605c74ae9e9cde06225f0a4c834f00..aa6172b52eeadb4f118e5145c182270342a70bf0 100644 (file)
--- a/read-tree.c
+++ b/read-tree.c
#include <sys/time.h>
#include <signal.h>
#include <sys/time.h>
#include <signal.h>
+static int reset = 0;
static int merge = 0;
static int update = 0;
static int index_only = 0;
static int merge = 0;
static int update = 0;
static int index_only = 0;
return;
errno = 0;
}
return;
errno = 0;
}
+ if (reset) {
+ ce->ce_flags |= htons(CE_UPDATE);
+ return;
+ }
if (errno == ENOENT)
return;
die("Entry '%s' not uptodate. Cannot merge.", ce->name);
if (errno == ENOENT)
return;
die("Entry '%s' not uptodate. Cannot merge.", ce->name);
if (!a) {
invalidate_ce_path(old);
if (!a) {
invalidate_ce_path(old);
- return 0;
+ return deleted_entry(old, NULL);
}
if (old && same(old, a)) {
}
if (old && same(old, a)) {
+ if (reset) {
+ struct stat st;
+ if (lstat(old->name, &st) ||
+ ce_match_stat(old, &st, 1))
+ old->ce_flags |= htons(CE_UPDATE);
+ }
return keep_entry(old);
}
return merged_entry(a, NULL);
return keep_entry(old);
}
return merged_entry(a, NULL);
int main(int argc, char **argv)
{
int main(int argc, char **argv)
{
- int i, newfd, reset, stage = 0;
+ int i, newfd, stage = 0;
unsigned char sha1[20];
merge_fn_t fn = NULL;
unsigned char sha1[20];
merge_fn_t fn = NULL;