kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity
Browse Source

make credential helpers builtins 

There's no real reason for credential helpers to be separate binaries. I
did them this way originally under the notion that helper don't _need_
to be part of Git, and so can be built totally separately (and indeed,
the ones in contrib/credential are). But the ones in our main Makefile
build on libgit.a, and the resulting binaries are reasonably large.

We can slim down our total disk footprint by just making them builtins.
This reduces the size of:

  make strip install

from 29MB to 24MB on my Debian system.

Note that credential-cache can't operate without support for Unix
sockets. Currently we just don't build it at all when NO_UNIX_SOCKETS is
set. We could continue that with conditionals in the Makefile and our
list of builtins. But instead, let's build a dummy implementation that
dies with an informative message. That has two advantages:

  - it's simpler, because the conditional bits are all kept inside
    the credential-cache source

  - a user who is expecting it to exist will be told _why_ they can't
    use it, rather than getting the "credential-cache is not a git
    command" error which makes it look like the Git install is broken.

Note that our dummy implementation does still respond to "-h" in order
to appease t0012 (and this may be a little friendlier for users, as
well).

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Jeff King 5 years ago committed by Junio C Hamano
parent
a04f653109
commit
b5dd96b70a
7 changed files with 63 additions and 35 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      Makefile
  2. 3
      builtin.h
  3. 29
      builtin/credential-cache--daemon.c
  4. 29
      builtin/credential-cache.c
  5. 6
      builtin/credential-store.c
  6. 20
      contrib/buildsystems/CMakeLists.txt
  7. 3
      git.c

8
Makefile
Unescape View File

@ -672,7 +672,6 @@ EXTRA_PROGRAMS =
PROGRAMS += $(EXTRA_PROGRAMS) PROGRAMS += $(EXTRA_PROGRAMS)


PROGRAM_OBJS += bugreport.o PROGRAM_OBJS += bugreport.o
PROGRAM_OBJS += credential-store.o
PROGRAM_OBJS += daemon.o PROGRAM_OBJS += daemon.o
PROGRAM_OBJS += fast-import.o PROGRAM_OBJS += fast-import.o
PROGRAM_OBJS += http-backend.o PROGRAM_OBJS += http-backend.o
@ -1052,6 +1051,9 @@ BUILTIN_OBJS += builtin/checkout-index.o
BUILTIN_OBJS += builtin/checkout.o BUILTIN_OBJS += builtin/checkout.o
BUILTIN_OBJS += builtin/clean.o BUILTIN_OBJS += builtin/clean.o
BUILTIN_OBJS += builtin/clone.o BUILTIN_OBJS += builtin/clone.o
BUILTIN_OBJS += builtin/credential-cache.o
BUILTIN_OBJS += builtin/credential-cache--daemon.o
BUILTIN_OBJS += builtin/credential-store.o
BUILTIN_OBJS += builtin/column.o BUILTIN_OBJS += builtin/column.o
BUILTIN_OBJS += builtin/commit-graph.o BUILTIN_OBJS += builtin/commit-graph.o
BUILTIN_OBJS += builtin/commit-tree.o BUILTIN_OBJS += builtin/commit-tree.o
@ -1634,11 +1636,8 @@ ifdef NO_INET_PTON
endif endif
ifdef NO_UNIX_SOCKETS ifdef NO_UNIX_SOCKETS
BASIC_CFLAGS += -DNO_UNIX_SOCKETS BASIC_CFLAGS += -DNO_UNIX_SOCKETS
EXCLUDED_PROGRAMS += git-credential-cache git-credential-cache--daemon
else else
LIB_OBJS += unix-socket.o LIB_OBJS += unix-socket.o
PROGRAM_OBJS += credential-cache.o
PROGRAM_OBJS += credential-cache--daemon.o
endif endif


ifdef NO_ICONV ifdef NO_ICONV
@ -2901,7 +2900,6 @@ ifdef MSVC
# because it is just a copy/hardlink of git.exe, rather than a unique binary. # because it is just a copy/hardlink of git.exe, rather than a unique binary.
$(INSTALL) git.pdb '$(DESTDIR_SQ)$(bindir_SQ)' $(INSTALL) git.pdb '$(DESTDIR_SQ)$(bindir_SQ)'
$(INSTALL) git-shell.pdb '$(DESTDIR_SQ)$(bindir_SQ)' $(INSTALL) git-shell.pdb '$(DESTDIR_SQ)$(bindir_SQ)'
$(INSTALL) git-credential-store.pdb '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
$(INSTALL) git-daemon.pdb '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' $(INSTALL) git-daemon.pdb '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
$(INSTALL) git-fast-import.pdb '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' $(INSTALL) git-fast-import.pdb '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
$(INSTALL) git-http-backend.pdb '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' $(INSTALL) git-http-backend.pdb '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'

3
builtin.h
Unescape View File

@ -138,6 +138,9 @@ int cmd_commit_tree(int argc, const char **argv, const char *prefix);
int cmd_config(int argc, const char **argv, const char *prefix); int cmd_config(int argc, const char **argv, const char *prefix);
int cmd_count_objects(int argc, const char **argv, const char *prefix); int cmd_count_objects(int argc, const char **argv, const char *prefix);
int cmd_credential(int argc, const char **argv, const char *prefix); int cmd_credential(int argc, const char **argv, const char *prefix);
int cmd_credential_cache(int argc, const char **argv, const char *prefix);
int cmd_credential_cache_daemon(int argc, const char **argv, const char *prefix);
int cmd_credential_store(int argc, const char **argv, const char *prefix);
int cmd_describe(int argc, const char **argv, const char *prefix); int cmd_describe(int argc, const char **argv, const char *prefix);
int cmd_diff_files(int argc, const char **argv, const char *prefix); int cmd_diff_files(int argc, const char **argv, const char *prefix);
int cmd_diff_index(int argc, const char **argv, const char *prefix); int cmd_diff_index(int argc, const char **argv, const char *prefix);

29
credential-cache--daemon.c → builtin/credential-cache--daemon.c
Unescape View File

@ -1,9 +1,12 @@
#include "cache.h" #include "builtin.h"
#include "parse-options.h"

#ifndef NO_UNIX_SOCKETS

#include "config.h" #include "config.h"
#include "tempfile.h" #include "tempfile.h"
#include "credential.h" #include "credential.h"
#include "unix-socket.h" #include "unix-socket.h"
#include "parse-options.h"


struct credential_cache_entry { struct credential_cache_entry {
struct credential item; struct credential item;
@ -257,7 +260,7 @@ static void init_socket_directory(const char *path)
free(path_copy); free(path_copy);
} }


int cmd_main(int argc, const char **argv) int cmd_credential_cache_daemon(int argc, const char **argv, const char *prefix)
{ {
struct tempfile *socket_file; struct tempfile *socket_file;
const char *socket_path; const char *socket_path;
@ -275,7 +278,7 @@ int cmd_main(int argc, const char **argv)


git_config_get_bool("credentialcache.ignoresighup", &ignore_sighup); git_config_get_bool("credentialcache.ignoresighup", &ignore_sighup);


argc = parse_options(argc, argv, NULL, options, usage, 0); argc = parse_options(argc, argv, prefix, options, usage, 0);
socket_path = argv[0]; socket_path = argv[0];


if (!socket_path) if (!socket_path)
@ -295,3 +298,21 @@ int cmd_main(int argc, const char **argv)


return 0; return 0;
} }

#else

int cmd_credential_cache_daemon(int argc, const char **argv, const char *prefix)
{
const char * const usage[] = {
"git credential-cache--daemon [options] <action>",
"",
"credential-cache--daemon is disabled in this build of Git",
NULL
};
struct option options[] = { OPT_END() };

argc = parse_options(argc, argv, prefix, options, usage, 0);
die(_("credential-cache--daemon unavailable; no unix socket support"));
}

#endif /* NO_UNIX_SOCKET */

29
credential-cache.c → builtin/credential-cache.c
Unescape View File

@ -1,7 +1,10 @@
#include "cache.h" #include "builtin.h"
#include "parse-options.h"

#ifndef NO_UNIX_SOCKETS

#include "credential.h" #include "credential.h"
#include "string-list.h" #include "string-list.h"
#include "parse-options.h"
#include "unix-socket.h" #include "unix-socket.h"
#include "run-command.h" #include "run-command.h"


@ -96,7 +99,7 @@ static char *get_socket_path(void)
return socket; return socket;
} }


int cmd_main(int argc, const char **argv) int cmd_credential_cache(int argc, const char **argv, const char *prefix)
{ {
char *socket_path = NULL; char *socket_path = NULL;
int timeout = 900; int timeout = 900;
@ -113,7 +116,7 @@ int cmd_main(int argc, const char **argv)
OPT_END() OPT_END()
}; };


argc = parse_options(argc, argv, NULL, options, usage, 0); argc = parse_options(argc, argv, prefix, options, usage, 0);
if (!argc) if (!argc)
usage_with_options(usage, options); usage_with_options(usage, options);
op = argv[0]; op = argv[0];
@ -134,3 +137,21 @@ int cmd_main(int argc, const char **argv)


return 0; return 0;
} }

#else

int cmd_credential_cache(int argc, const char **argv, const char *prefix)
{
const char * const usage[] = {
"git credential-cache [options] <action>",
"",
"credential-cache is disabled in this build of Git",
NULL
};
struct option options[] = { OPT_END() };

argc = parse_options(argc, argv, prefix, options, usage, 0);
die(_("credential-cache unavailable; no unix socket support"));
}

#endif /* NO_UNIX_SOCKETS */

6
credential-store.c → builtin/credential-store.c
Unescape View File

@ -1,4 +1,4 @@
#include "cache.h" #include "builtin.h"
#include "lockfile.h" #include "lockfile.h"
#include "credential.h" #include "credential.h"
#include "string-list.h" #include "string-list.h"
@ -143,7 +143,7 @@ static void lookup_credential(const struct string_list *fns, struct credential *
return; /* Found credential */ return; /* Found credential */
} }


int cmd_main(int argc, const char **argv) int cmd_credential_store(int argc, const char **argv, const char *prefix)
{ {
const char * const usage[] = { const char * const usage[] = {
"git credential-store [<options>] <action>", "git credential-store [<options>] <action>",
@ -161,7 +161,7 @@ int cmd_main(int argc, const char **argv)


umask(077); umask(077);


argc = parse_options(argc, (const char **)argv, NULL, options, usage, 0); argc = parse_options(argc, (const char **)argv, prefix, options, usage, 0);
if (argc != 1) if (argc != 1)
usage_with_options(usage, options); usage_with_options(usage, options);
op = argv[0]; op = argv[0];

20
contrib/buildsystems/CMakeLists.txt
Unescape View File

@ -501,15 +501,9 @@ unset(CMAKE_REQUIRED_INCLUDES)


#programs #programs
set(PROGRAMS_BUILT set(PROGRAMS_BUILT
git git-bugreport git-credential-store git-daemon git-fast-import git-http-backend git-sh-i18n--envsubst git git-bugreport git-daemon git-fast-import git-http-backend git-sh-i18n--envsubst
git-shell git-remote-testsvn) git-shell git-remote-testsvn)


if(NO_UNIX_SOCKETS)
list(APPEND excluded_progs git-credential-cache git-credential-cache--daemon)
else()
list(APPEND PROGRAMS_BUILT git-credential-cache git-credential-cache--daemon)
endif()

if(NOT CURL_FOUND) if(NOT CURL_FOUND)
list(APPEND excluded_progs git-http-fetch git-http-push) list(APPEND excluded_progs git-http-fetch git-http-push)
add_compile_definitions(NO_CURL) add_compile_definitions(NO_CURL)
@ -633,9 +627,6 @@ target_link_libraries(git common-main)
add_executable(git-bugreport ${CMAKE_SOURCE_DIR}/bugreport.c) add_executable(git-bugreport ${CMAKE_SOURCE_DIR}/bugreport.c)
target_link_libraries(git-bugreport common-main) target_link_libraries(git-bugreport common-main)


add_executable(git-credential-store ${CMAKE_SOURCE_DIR}/credential-store.c)
target_link_libraries(git-credential-store common-main)

add_executable(git-daemon ${CMAKE_SOURCE_DIR}/daemon.c) add_executable(git-daemon ${CMAKE_SOURCE_DIR}/daemon.c)
target_link_libraries(git-daemon common-main) target_link_libraries(git-daemon common-main)


@ -672,15 +663,6 @@ endif()
add_executable(git-remote-testsvn ${CMAKE_SOURCE_DIR}/remote-testsvn.c) add_executable(git-remote-testsvn ${CMAKE_SOURCE_DIR}/remote-testsvn.c)
target_link_libraries(git-remote-testsvn common-main vcs-svn) target_link_libraries(git-remote-testsvn common-main vcs-svn)


if(NOT NO_UNIX_SOCKETS)
add_executable(git-credential-cache ${CMAKE_SOURCE_DIR}/credential-cache.c)
target_link_libraries(git-credential-cache common-main)

add_executable(git-credential-cache--daemon ${CMAKE_SOURCE_DIR}/credential-cache--daemon.c)
target_link_libraries(git-credential-cache--daemon common-main)
endif()


set(git_builtin_extra set(git_builtin_extra
cherry cherry-pick format-patch fsck-objects cherry cherry-pick format-patch fsck-objects
init merge-subtree restore show init merge-subtree restore show

3
git.c
Unescape View File

@ -499,6 +499,9 @@ static struct cmd_struct commands[] = {
{ "config", cmd_config, RUN_SETUP_GENTLY | DELAY_PAGER_CONFIG }, { "config", cmd_config, RUN_SETUP_GENTLY | DELAY_PAGER_CONFIG },
{ "count-objects", cmd_count_objects, RUN_SETUP }, { "count-objects", cmd_count_objects, RUN_SETUP },
{ "credential", cmd_credential, RUN_SETUP_GENTLY | NO_PARSEOPT }, { "credential", cmd_credential, RUN_SETUP_GENTLY | NO_PARSEOPT },
{ "credential-cache", cmd_credential_cache },
{ "credential-cache--daemon", cmd_credential_cache_daemon },
{ "credential-store", cmd_credential_store },
{ "describe", cmd_describe, RUN_SETUP }, { "describe", cmd_describe, RUN_SETUP },
{ "diff", cmd_diff, NO_PARSEOPT }, { "diff", cmd_diff, NO_PARSEOPT },
{ "diff-files", cmd_diff_files, RUN_SETUP | NEED_WORK_TREE | NO_PARSEOPT }, { "diff-files", cmd_diff_files, RUN_SETUP | NEED_WORK_TREE | NO_PARSEOPT },

Write Preview
Loading…
Cancel
Save