summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Linus Torvalds <torvalds@ppc970.osdl.org>2005-06-05 23:15:40 -0700
committerLibravatar Linus Torvalds <torvalds@ppc970.osdl.org>2005-06-05 23:15:40 -0700
commit6ee67f2610d0060bee45eee0b83fe42143441589 (patch)
tree3715da8cfe4ed5d0326a6657b0ad0ff73f66691c
parentgit-read-tree: fix up two-way merge (diff)
downloadtgif-6ee67f2610d0060bee45eee0b83fe42143441589.tar.xz
Fix entry.c dependency and compile problem
Bad Linus.
-rw-r--r--Makefile1
-rw-r--r--entry.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index d0f1cfa36c..a85abd6612 100644
--- a/Makefile
+++ b/Makefile
@@ -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
diff --git a/entry.c b/entry.c
index d7824c4f61..874516e174 100644
--- a/entry.c
+++ b/entry.c
@@ -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);