Re-implement "check_file_directory_conflict()"

diff --git a/Makefile b/Makefile
index 5d5c856a71972c80f8c33732e0fa0b3e526267a2..bf63984bb96c3c1cf709179c4d823cd649842df8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,8 @@ INSTALL=install
 SCRIPTS=git git-apply-patch-script git-merge-one-file-script git-prune-script \
        git-pull-script git-tag-script git-resolve-script git-whatchanged \
        git-deltafy-script git-fetch-script git-status-script git-commit-script \
-       git-log-script git-shortlog
+       git-log-script git-shortlog git-cvsimport-script git-diff-script \
+       git-reset-script git-add-script
 
 PROG=   git-update-cache git-diff-files git-init-db git-write-tree \
        git-read-tree git-commit-tree git-cat-file git-fsck-cache \
@@ -32,7 +33,8 @@ PROG=   git-update-cache git-diff-files git-init-db git-write-tree \
        git-unpack-file git-export git-diff-cache git-convert-cache \
        git-http-pull git-ssh-push git-ssh-pull git-rev-list git-mktag \
        git-diff-helper git-tar-tree git-local-pull git-write-blob \
-       git-get-tar-commit-id git-mkdelta git-apply git-stripspace
+       git-get-tar-commit-id git-mkdelta git-apply git-stripspace \
+       git-cvs2git git-diff-stages git-rev-parse
 
 all: $(PROG)
 
@@ -40,7 +42,8 @@ install: $(PROG) $(SCRIPTS)
        $(INSTALL) $(PROG) $(SCRIPTS) $(dest)$(bin)
 
 LIB_OBJS=read-cache.o sha1_file.o usage.o object.o commit.o tree.o blob.o \
-        tag.o delta.o date.o index.o diff-delta.o patch-delta.o entry.o epoch.o
+        tag.o delta.o date.o index.o diff-delta.o patch-delta.o entry.o \
+        epoch.o refs.o
 LIB_FILE=libgit.a
 LIB_H=cache.h object.h blob.h tree.h commit.h tag.h delta.h epoch.h
 
@@ -114,6 +117,9 @@ git-tar-tree: tar-tree.c
 git-write-blob: write-blob.c
 git-mkdelta: mkdelta.c
 git-stripspace: stripspace.c
+git-cvs2git: cvs2git.c
+git-diff-stages: diff-stages.c
+git-rev-parse: rev-parse.c
 
 git-http-pull: LIBS += -lcurl
 git-rev-list: LIBS += -lssl