On Mon, Dec 02, 2013 at 03:37:10PM -0800, Jonathan Nieder wrote:
> When the built-in "git tar-tree" command (a thin wrapper around "git
> archive") was removed in 925ceccf (tar-tree: remove deprecated
> command, 2013-11-10), the build continued to install a non-functioning
> git-tar-tree command in gitexecdir by mistake:
>
> $ PATH=$(git --exec-path):$PATH
> $ git-tar-tree -h
> fatal: cannot handle tar-tree internally
>
> The list of links in gitexecdir is populated from BUILTIN_OBJS, which
> includes builtin/tar-tree.o to implement "git get-tar-commit-id".
> Rename the get-tar-commit-id source file to builtin/get-tar-commit-id.c
> to reflect its purpose and fix 'make install'.
>
> Signed-off-by: Jonathan Nieder <jrnieder@xxxxxxxxx>
> ---
> Hi,
>
> John Keeping wrote:
>
> > builtin/tar-tree.c | 62 -------------------------
>
> Here's a quick fixup on top. Thoughts?
This is the obvious tidy-up on top of my series. I avoided doing it
because I thought it would just add unnecessary noise, but I had not
realised that the names of the built-in object files was important, so
it's not just noise but a part of doing the job properly.
> Makefile | 3 +--
> builtin/{tar-tree.c => get-tar-commit-id.c} | 0
> 2 files changed, 1 insertion(+), 2 deletions(-)
> rename builtin/{tar-tree.c => get-tar-commit-id.c} (100%)
>
> diff --git a/Makefile b/Makefile
> index 504931f..37beb73 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -586,7 +586,6 @@ BUILT_INS += git-cherry$X
> BUILT_INS += git-cherry-pick$X
> BUILT_INS += git-format-patch$X
> BUILT_INS += git-fsck-objects$X
> -BUILT_INS += git-get-tar-commit-id$X
> BUILT_INS += git-init$X
> BUILT_INS += git-merge-subtree$X
> BUILT_INS += git-show$X
> @@ -929,6 +928,7 @@ BUILTIN_OBJS += builtin/fmt-merge-msg.o
> BUILTIN_OBJS += builtin/for-each-ref.o
> BUILTIN_OBJS += builtin/fsck.o
> BUILTIN_OBJS += builtin/gc.o
> +BUILTIN_OBJS += builtin/get-tar-commit-id.o
> BUILTIN_OBJS += builtin/grep.o
> BUILTIN_OBJS += builtin/hash-object.o
> BUILTIN_OBJS += builtin/help.o
> @@ -980,7 +980,6 @@ BUILTIN_OBJS += builtin/show-ref.o
> BUILTIN_OBJS += builtin/stripspace.o
> BUILTIN_OBJS += builtin/symbolic-ref.o
> BUILTIN_OBJS += builtin/tag.o
> -BUILTIN_OBJS += builtin/tar-tree.o
> BUILTIN_OBJS += builtin/unpack-file.o
> BUILTIN_OBJS += builtin/unpack-objects.o
> BUILTIN_OBJS += builtin/update-index.o
> diff --git a/builtin/tar-tree.c b/builtin/get-tar-commit-id.c
> similarity index 100%
> rename from builtin/tar-tree.c
> rename to builtin/get-tar-commit-id.c
> --
> 1.8.4.1
--
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