aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-07-09 09:01:45 -0700
committerJunio C Hamano <gitster@pobox.com>2012-07-09 09:01:45 -0700
commitee02c2ab379dd25451199938788212414bcdf156 (patch)
treee7475299eb1ea64f52d45be64e903d4c8fac92a9 /Makefile
parent3a335ee2da090e435bd771df56860496b570decc (diff)
parent2da7830d5c3b0779fed6ac16008a6e380a99dd2e (diff)
downloadgit-ee02c2ab379dd25451199938788212414bcdf156.tar.gz
git-ee02c2ab379dd25451199938788212414bcdf156.tar.xz
Merge branch 'mm/credential-plumbing'
Expose the credential API to scripted Porcelain writers. * mm/credential-plumbing: git-remote-mediawiki: update comments to reflect credential support git-remote-mediawiki: add credential support git credential fill: output the whole 'struct credential' add 'git credential' plumbing command
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index ae62a50bc..169dda545 100644
--- a/Makefile
+++ b/Makefile
@@ -488,7 +488,6 @@ X =
PROGRAMS += $(patsubst %.o,git-%$X,$(PROGRAM_OBJS))
TEST_PROGRAMS_NEED_X += test-chmtime
-TEST_PROGRAMS_NEED_X += test-credential
TEST_PROGRAMS_NEED_X += test-ctype
TEST_PROGRAMS_NEED_X += test-date
TEST_PROGRAMS_NEED_X += test-delta
@@ -836,6 +835,7 @@ BUILTIN_OBJS += builtin/commit-tree.o
BUILTIN_OBJS += builtin/commit.o
BUILTIN_OBJS += builtin/config.o
BUILTIN_OBJS += builtin/count-objects.o
+BUILTIN_OBJS += builtin/credential.o
BUILTIN_OBJS += builtin/describe.o
BUILTIN_OBJS += builtin/diff-files.o
BUILTIN_OBJS += builtin/diff-index.o