diff options
author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-05 23:15:40 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-05 23:15:40 -0700 |
commit | 6ee67f2610d0060bee45eee0b83fe42143441589 (patch) | |
tree | 3715da8cfe4ed5d0326a6657b0ad0ff73f66691c | |
parent | git-read-tree: fix up two-way merge (diff) | |
download | tgif-6ee67f2610d0060bee45eee0b83fe42143441589.tar.xz |
Fix entry.c dependency and compile problem
Bad Linus.
-rw-r--r-- | Makefile | 1 | ||||
-rw-r--r-- | entry.c | 2 |
2 files changed, 2 insertions, 1 deletions
@@ -128,6 +128,7 @@ sha1_file.o: $(LIB_H) usage.o: $(LIB_H) strbuf.o: $(LIB_H) gitenv.o: $(LIB_H) +entry.o: $(LIB_H) diff.o: $(LIB_H) diffcore.h diffcore-rename.o : $(LIB_H) diffcore.h diffcore-pathspec.o : $(LIB_H) diffcore.h @@ -117,7 +117,7 @@ static int write_entry(struct cache_entry *ce, const char *path, struct checkout return error("git-checkout-cache: unknown file mode for %s", path); } - if (state->update) { + if (state->refresh_cache) { struct stat st; lstat(ce->name, &st); fill_stat_cache_info(ce, &st); |