aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-07-07 02:17:23 -0700
committerJunio C Hamano <gitster@pobox.com>2008-07-07 02:17:23 -0700
commit17d778e710f9dacc770b5790e792b85cdba75a9d (patch)
tree1a3a97aa0c6d5cd86505e12ab2fc58e4f5bf849f /Makefile
parent5e97f464df082d8f45e163bbf24341dceeafe89d (diff)
parent450f437fb0fe276a6e946c281c768118e39dc9e7 (diff)
downloadgit-17d778e710f9dacc770b5790e792b85cdba75a9d.tar.gz
git-17d778e710f9dacc770b5790e792b85cdba75a9d.tar.xz
Merge branch 'dr/ceiling'
* dr/ceiling: Eliminate an unnecessary chdir("..") Add support for GIT_CEILING_DIRECTORIES Fold test-absolute-path into test-path-utils Implement normalize_absolute_path Conflicts: cache.h setup.c
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index bddd1a7e4..4796565ab 100644
--- a/Makefile
+++ b/Makefile
@@ -1265,7 +1265,7 @@ endif
### Testing rules
-TEST_PROGRAMS = test-chmtime$X test-genrandom$X test-date$X test-delta$X test-sha1$X test-match-trees$X test-absolute-path$X test-parse-options$X
+TEST_PROGRAMS = test-chmtime$X test-genrandom$X test-date$X test-delta$X test-sha1$X test-match-trees$X test-parse-options$X test-path-utils$X
all:: $(TEST_PROGRAMS)