Re: [PATCH 2/2] Build-in "git-shell"

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Junio C Hamano schrieb:
> This trivially makes "git-shell" a built-in.  It makes the executable even
> fatter, though.
...
> diff --git a/Makefile b/Makefile
> index 71339e1..1a52f71 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -546,6 +546,7 @@ BUILTIN_OBJS += builtin-rev-parse.o
>  BUILTIN_OBJS += builtin-revert.o
>  BUILTIN_OBJS += builtin-rm.o
>  BUILTIN_OBJS += builtin-send-pack.o
> +BUILTIN_OBJS += builtin-shell.o
>  BUILTIN_OBJS += builtin-shortlog.o
>  BUILTIN_OBJS += builtin-show-branch.o
>  BUILTIN_OBJS += builtin-show-ref.o

You must squash this in:

diff --git a/Makefile b/Makefile
index 57d16cb..fae9b22 100644
--- a/Makefile
+++ b/Makefile
@@ -826,7 +826,6 @@ EXTLIBS += -lz
 ifndef NO_POSIX_ONLY_PROGRAMS
 	PROGRAMS += git-daemon$X
 	PROGRAMS += git-imap-send$X
-	PROGRAMS += git-shell$X
 endif
 ifndef NO_OPENSSL
 	OPENSSL_LIBSSL = -lssl

We removed git-shell from the MinGW build only because of the compat
dependencies. We don't have problems building it as a built-in.

-- Hannes
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux