* [RFC/PATCH 1/4] repo-config: remove deprecated alias for "git config"
2013-11-10 15:47 [RFC/PATCH 0/4] Remove deprecated commands John Keeping
@ 2013-11-10 15:47 ` John Keeping
2013-11-10 15:47 ` [RFC/PATCH 2/4] tar-tree: remove deprecated command John Keeping
` (3 subsequent siblings)
4 siblings, 0 replies; 12+ messages in thread
From: John Keeping @ 2013-11-10 15:47 UTC (permalink / raw)
To: git; +Cc: John Keeping
The release notes for Git 1.5.4 say that "git repo-config" will be
removed in the next feature release. Since Git 2.0 is nearly here,
remove it.
Signed-off-by: John Keeping <john@keeping.me.uk>
---
.gitignore | 1 -
Documentation/git-repo-config.txt | 23 -----------------------
Makefile | 1 -
builtin.h | 1 -
builtin/config.c | 6 ------
command-list.txt | 1 -
contrib/completion/git-completion.bash | 1 -
contrib/examples/git-whatchanged.sh | 4 ++--
git.c | 1 -
9 files changed, 2 insertions(+), 37 deletions(-)
delete mode 100644 Documentation/git-repo-config.txt
diff --git a/.gitignore b/.gitignore
index 66199ed..3bc1b08 100644
--- a/.gitignore
+++ b/.gitignore
@@ -131,7 +131,6 @@
/git-remote-testsvn
/git-repack
/git-replace
-/git-repo-config
/git-request-pull
/git-rerere
/git-reset
diff --git a/Documentation/git-repo-config.txt b/Documentation/git-repo-config.txt
deleted file mode 100644
index 9ec115b..0000000
--- a/Documentation/git-repo-config.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-git-repo-config(1)
-==================
-
-NAME
-----
-git-repo-config - Get and set repository or global options
-
-
-SYNOPSIS
---------
-[verse]
-'git repo-config' ...
-
-
-DESCRIPTION
------------
-
-This is a synonym for linkgit:git-config[1]. Please refer to the
-documentation of that command.
-
-GIT
----
-Part of the linkgit:git[1] suite
diff --git a/Makefile b/Makefile
index af847f8..4fc2378 100644
--- a/Makefile
+++ b/Makefile
@@ -591,7 +591,6 @@ BUILT_INS += git-get-tar-commit-id$X
BUILT_INS += git-init$X
BUILT_INS += git-merge-subtree$X
BUILT_INS += git-peek-remote$X
-BUILT_INS += git-repo-config$X
BUILT_INS += git-show$X
BUILT_INS += git-stage$X
BUILT_INS += git-status$X
diff --git a/builtin.h b/builtin.h
index b56cf07..d4afbfe 100644
--- a/builtin.h
+++ b/builtin.h
@@ -103,7 +103,6 @@ extern int cmd_remote(int argc, const char **argv, const char *prefix);
extern int cmd_remote_ext(int argc, const char **argv, const char *prefix);
extern int cmd_remote_fd(int argc, const char **argv, const char *prefix);
extern int cmd_repack(int argc, const char **argv, const char *prefix);
-extern int cmd_repo_config(int argc, const char **argv, const char *prefix);
extern int cmd_rerere(int argc, const char **argv, const char *prefix);
extern int cmd_reset(int argc, const char **argv, const char *prefix);
extern int cmd_rev_list(int argc, const char **argv, const char *prefix);
diff --git a/builtin/config.c b/builtin/config.c
index 20e89fe..92ebf23 100644
--- a/builtin/config.c
+++ b/builtin/config.c
@@ -671,9 +671,3 @@ int cmd_config(int argc, const char **argv, const char *prefix)
return 0;
}
-
-int cmd_repo_config(int argc, const char **argv, const char *prefix)
-{
- fprintf(stderr, "WARNING: git repo-config is deprecated in favor of git config.\n");
- return cmd_config(argc, argv, prefix);
-}
diff --git a/command-list.txt b/command-list.txt
index 08b04e2..f2bf684 100644
--- a/command-list.txt
+++ b/command-list.txt
@@ -102,7 +102,6 @@ git-relink ancillarymanipulators
git-remote ancillarymanipulators
git-repack ancillarymanipulators
git-replace ancillarymanipulators
-git-repo-config ancillarymanipulators deprecated
git-request-pull foreignscminterface
git-rerere ancillaryinterrogators
git-reset mainporcelain common
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index dba3c15..c6063c9 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -694,7 +694,6 @@ __git_list_porcelain_commands ()
read-tree) : plumbing;;
receive-pack) : plumbing;;
remote-*) : transport;;
- repo-config) : deprecated;;
rerere) : plumbing;;
rev-list) : plumbing;;
rev-parse) : plumbing;;
diff --git a/contrib/examples/git-whatchanged.sh b/contrib/examples/git-whatchanged.sh
index 1fb9feb..2edbdc6 100755
--- a/contrib/examples/git-whatchanged.sh
+++ b/contrib/examples/git-whatchanged.sh
@@ -9,12 +9,12 @@ case "$0" in
*whatchanged)
count=
test -z "$diff_tree_flags" &&
- diff_tree_flags=$(git-repo-config --get whatchanged.difftree)
+ diff_tree_flags=$(git config --get whatchanged.difftree)
diff_tree_default_flags='-c -M --abbrev' ;;
*show)
count=-n1
test -z "$diff_tree_flags" &&
- diff_tree_flags=$(git-repo-config --get show.difftree)
+ diff_tree_flags=$(git config --get show.difftree)
diff_tree_default_flags='--cc --always' ;;
esac
test -z "$diff_tree_flags" &&
diff --git a/git.c b/git.c
index cb5208d..0c9dde2 100644
--- a/git.c
+++ b/git.c
@@ -421,7 +421,6 @@ static void handle_internal_command(int argc, const char **argv)
{ "remote-fd", cmd_remote_fd },
{ "repack", cmd_repack, RUN_SETUP },
{ "replace", cmd_replace, RUN_SETUP },
- { "repo-config", cmd_repo_config, RUN_SETUP_GENTLY },
{ "rerere", cmd_rerere, RUN_SETUP },
{ "reset", cmd_reset, RUN_SETUP },
{ "rev-list", cmd_rev_list, RUN_SETUP },
--
1.8.5.rc0.170.g772b8ec
^ permalink raw reply related [flat|nested] 12+ messages in thread* [RFC/PATCH 2/4] tar-tree: remove deprecated command
2013-11-10 15:47 [RFC/PATCH 0/4] Remove deprecated commands John Keeping
2013-11-10 15:47 ` [RFC/PATCH 1/4] repo-config: remove deprecated alias for "git config" John Keeping
@ 2013-11-10 15:47 ` John Keeping
2013-12-02 23:37 ` [PATCH jk/remove-deprecated] stop installing git-tar-tree link Jonathan Nieder
2013-11-10 15:47 ` [RFC/PATCH 3/4] lost-found: remove deprecated command John Keeping
` (2 subsequent siblings)
4 siblings, 1 reply; 12+ messages in thread
From: John Keeping @ 2013-11-10 15:47 UTC (permalink / raw)
To: git; +Cc: John Keeping
"git tar-tree" has been a thin wrapper around "git archive" since commit
fd88d9c (Remove upload-tar and make git-tar-tree a thin wrapper to
git-archive, 2006-09-24), which also made it print a message indicating
that git-tar-tree is deprecated.
Signed-off-by: John Keeping <john@keeping.me.uk>
---
.gitignore | 1 -
Documentation/git-tar-tree.txt | 82 ----------------------------------
builtin/tar-tree.c | 62 -------------------------
command-list.txt | 1 -
contrib/completion/git-completion.bash | 1 -
git.c | 1 -
t/t4116-apply-reverse.sh | 4 +-
t/t5000-tar-tree.sh | 16 ++-----
t/t5001-archive-attr.sh | 10 -----
9 files changed, 5 insertions(+), 173 deletions(-)
delete mode 100644 Documentation/git-tar-tree.txt
diff --git a/.gitignore b/.gitignore
index 3bc1b08..88b313a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -158,7 +158,6 @@
/git-svn
/git-symbolic-ref
/git-tag
-/git-tar-tree
/git-unpack-file
/git-unpack-objects
/git-update-index
diff --git a/Documentation/git-tar-tree.txt b/Documentation/git-tar-tree.txt
deleted file mode 100644
index f7362dc..0000000
--- a/Documentation/git-tar-tree.txt
+++ /dev/null
@@ -1,82 +0,0 @@
-git-tar-tree(1)
-===============
-
-NAME
-----
-git-tar-tree - Create a tar archive of the files in the named tree object
-
-
-SYNOPSIS
---------
-[verse]
-'git tar-tree' [--remote=<repo>] <tree-ish> [ <base> ]
-
-DESCRIPTION
------------
-THIS COMMAND IS DEPRECATED. Use 'git archive' with `--format=tar`
-option instead (and move the <base> argument to `--prefix=base/`).
-
-Creates a tar archive containing the tree structure for the named tree.
-When <base> is specified it is added as a leading path to the files in the
-generated tar archive.
-
-'git tar-tree' behaves differently when given a tree ID versus when given
-a commit ID or tag ID. In the first case the current time is used as
-modification time of each file in the archive. In the latter case the
-commit time as recorded in the referenced commit object is used instead.
-Additionally the commit ID is stored in a global extended pax header.
-It can be extracted using 'git get-tar-commit-id'.
-
-OPTIONS
--------
-
-<tree-ish>::
- The tree or commit to produce tar archive for. If it is
- the object name of a commit object.
-
-<base>::
- Leading path to the files in the resulting tar archive.
-
---remote=<repo>::
- Instead of making a tar archive from local repository,
- retrieve a tar archive from a remote repository.
-
-CONFIGURATION
--------------
-
-tar.umask::
- This variable can be used to restrict the permission bits of
- tar archive entries. The default is 0002, which turns off the
- world write bit. The special value "user" indicates that the
- archiving user's umask will be used instead. See umask(2) for
- details.
-
-EXAMPLES
---------
-`git tar-tree HEAD junk | (cd /var/tmp/ && tar xf -)`::
-
- Create a tar archive that contains the contents of the
- latest commit on the current branch, and extracts it in
- `/var/tmp/junk` directory.
-
-`git tar-tree v1.4.0 git-1.4.0 | gzip >git-1.4.0.tar.gz`::
-
- Create a tarball for v1.4.0 release.
-
-`git tar-tree v1.4.0^{tree} git-1.4.0 | gzip >git-1.4.0.tar.gz`::
-
- Create a tarball for v1.4.0 release, but without a
- global extended pax header.
-
-`git tar-tree --remote=example.com:git.git v1.4.0 >git-1.4.0.tar`::
-
- Get a tarball v1.4.0 from example.com.
-
-`git tar-tree HEAD:Documentation/ git-docs > git-1.4.0-docs.tar`::
-
- Put everything in the current head's Documentation/ directory
- into 'git-1.4.0-docs.tar', with the prefix 'git-docs/'.
-
-GIT
----
-Part of the linkgit:git[1] suite
diff --git a/builtin/tar-tree.c b/builtin/tar-tree.c
index ba3ffe6..aa72596 100644
--- a/builtin/tar-tree.c
+++ b/builtin/tar-tree.c
@@ -7,71 +7,9 @@
#include "builtin.h"
#include "quote.h"
-static const char tar_tree_usage[] =
-"git tar-tree [--remote=<repo>] <tree-ish> [basedir]\n"
-"*** Note that this command is now deprecated; use \"git archive\" instead.";
-
static const char builtin_get_tar_commit_id_usage[] =
"git get-tar-commit-id < <tarfile>";
-int cmd_tar_tree(int argc, const char **argv, const char *prefix)
-{
- /*
- * "git tar-tree" is now a wrapper around "git archive --format=tar"
- *
- * $0 --remote=<repo> arg... ==>
- * git archive --format=tar --remote=<repo> arg...
- * $0 tree-ish ==>
- * git archive --format=tar tree-ish
- * $0 tree-ish basedir ==>
- * git archive --format-tar --prefix=basedir tree-ish
- */
- const char **nargv = xcalloc(sizeof(*nargv), argc + 3);
- struct strbuf sb = STRBUF_INIT;
- char *basedir_arg;
- int nargc = 0;
-
- nargv[nargc++] = "archive";
- nargv[nargc++] = "--format=tar";
-
- if (2 <= argc && !prefixcmp(argv[1], "--remote=")) {
- nargv[nargc++] = argv[1];
- argv++;
- argc--;
- }
-
- /*
- * Because it's just a compatibility wrapper, tar-tree supports only
- * the old behaviour of reading attributes from the work tree.
- */
- nargv[nargc++] = "--worktree-attributes";
-
- switch (argc) {
- default:
- usage(tar_tree_usage);
- break;
- case 3:
- /* base-path */
- basedir_arg = xmalloc(strlen(argv[2]) + 11);
- sprintf(basedir_arg, "--prefix=%s/", argv[2]);
- nargv[nargc++] = basedir_arg;
- /* fallthru */
- case 2:
- /* tree-ish */
- nargv[nargc++] = argv[1];
- }
- nargv[nargc] = NULL;
-
- fprintf(stderr,
- "*** \"git tar-tree\" is now deprecated.\n"
- "*** Running \"git archive\" instead.\n***");
- sq_quote_argv(&sb, nargv, 0);
- strbuf_addch(&sb, '\n');
- fputs(sb.buf, stderr);
- strbuf_release(&sb);
- return cmd_archive(nargc, nargv, prefix);
-}
-
/* ustar header + extended global header content */
#define RECORDSIZE (512)
#define HEADERSIZE (2 * RECORDSIZE)
diff --git a/command-list.txt b/command-list.txt
index f2bf684..f8fc5b8 100644
--- a/command-list.txt
+++ b/command-list.txt
@@ -126,7 +126,6 @@ git-submodule mainporcelain
git-svn foreignscminterface
git-symbolic-ref plumbingmanipulators
git-tag mainporcelain common
-git-tar-tree plumbinginterrogators deprecated
git-unpack-file plumbinginterrogators
git-unpack-objects plumbingmanipulators
git-update-index plumbingmanipulators
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index c6063c9..1081ad1 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -706,7 +706,6 @@ __git_list_porcelain_commands ()
ssh-*) : transport;;
stripspace) : plumbing;;
symbolic-ref) : plumbing;;
- tar-tree) : deprecated;;
unpack-file) : plumbing;;
unpack-objects) : plumbing;;
update-index) : plumbing;;
diff --git a/git.c b/git.c
index 0c9dde2..5c9858f 100644
--- a/git.c
+++ b/git.c
@@ -437,7 +437,6 @@ static void handle_internal_command(int argc, const char **argv)
{ "stripspace", cmd_stripspace },
{ "symbolic-ref", cmd_symbolic_ref, RUN_SETUP },
{ "tag", cmd_tag, RUN_SETUP },
- { "tar-tree", cmd_tar_tree },
{ "unpack-file", cmd_unpack_file, RUN_SETUP },
{ "unpack-objects", cmd_unpack_objects, RUN_SETUP },
{ "update-index", cmd_update_index, RUN_SETUP },
diff --git a/t/t4116-apply-reverse.sh b/t/t4116-apply-reverse.sh
index 2298ece..1e4d438 100755
--- a/t/t4116-apply-reverse.sh
+++ b/t/t4116-apply-reverse.sh
@@ -48,12 +48,12 @@ test_expect_success 'apply in reverse' '
test_expect_success 'setup separate repository lacking postimage' '
- git tar-tree initial initial | $TAR xf - &&
+ git archive --format=tar --prefix=initial/ initial | $TAR xf - &&
(
cd initial && git init && git add .
) &&
- git tar-tree second second | $TAR xf - &&
+ git archive --format=tar --prefix=second/ second | $TAR xf - &&
(
cd second && git init && git add .
)
diff --git a/t/t5000-tar-tree.sh b/t/t5000-tar-tree.sh
index c2023b1..11bf0b8 100755
--- a/t/t5000-tar-tree.sh
+++ b/t/t5000-tar-tree.sh
@@ -3,7 +3,7 @@
# Copyright (C) 2005 Rene Scharfe
#
-test_description='git tar-tree and git get-tar-commit-id test
+test_description='git archive and git get-tar-commit-id test
This test covers the topics of file contents, commit date handling and
commit id embedding:
@@ -13,11 +13,11 @@ commit id embedding:
binary file (/bin/sh). Only paths shorter than 99 characters are
used.
- git tar-tree applies the commit date to every file in the archive it
+ git archive applies the commit date to every file in the archive it
creates. The test sets the commit date to a specific value and checks
if the tar archive contains that value.
- When giving git tar-tree a commit id (in contrast to a tree id) it
+ When giving git archive a commit id (in contrast to a tree id) it
embeds this commit id into the tar archive as a comment. The test
checks the ability of git get-tar-commit-id to figure it out from the
tar file.
@@ -196,16 +196,6 @@ test_expect_success \
'git get-tar-commit-id <b.tar >b.commitid &&
test_cmp .git/$(git symbolic-ref HEAD) b.commitid'
-test_expect_success 'git tar-tree' '
- git tar-tree HEAD >tar-tree.tar &&
- test_cmp b.tar tar-tree.tar
-'
-
-test_expect_success 'git tar-tree with prefix' '
- git tar-tree HEAD prefix >tar-tree_with_prefix.tar &&
- test_cmp with_prefix.tar tar-tree_with_prefix.tar
-'
-
test_expect_success 'git archive with --output, override inferred format' '
git archive --format=tar --output=d4.zip HEAD &&
test_cmp b.tar d4.zip
diff --git a/t/t5001-archive-attr.sh b/t/t5001-archive-attr.sh
index f47d871..51dedab 100755
--- a/t/t5001-archive-attr.sh
+++ b/t/t5001-archive-attr.sh
@@ -87,14 +87,4 @@ test_expect_success 'export-subst' '
test_cmp substfile2 archive/substfile2
'
-test_expect_success 'git tar-tree vs. git archive with worktree attributes' '
- git tar-tree HEAD >tar-tree.tar &&
- test_cmp worktree.tar tar-tree.tar
-'
-
-test_expect_success 'git tar-tree vs. git archive with worktree attrs, bare' '
- (cd bare && git tar-tree HEAD) >bare-tar-tree.tar &&
- test_cmp bare-worktree.tar bare-tar-tree.tar
-'
-
test_done
--
1.8.5.rc0.170.g772b8ec
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH jk/remove-deprecated] stop installing git-tar-tree link
2013-11-10 15:47 ` [RFC/PATCH 2/4] tar-tree: remove deprecated command John Keeping
@ 2013-12-02 23:37 ` Jonathan Nieder
2013-12-03 20:19 ` John Keeping
2013-12-04 10:23 ` Michael J Gruber
0 siblings, 2 replies; 12+ messages in thread
From: Jonathan Nieder @ 2013-12-02 23:37 UTC (permalink / raw)
To: John Keeping; +Cc: git, Junio C Hamano
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@gmail.com>
---
Hi,
John Keeping wrote:
> builtin/tar-tree.c | 62 -------------------------
Here's a quick fixup on top. Thoughts?
Thanks,
Jonathan
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
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [PATCH jk/remove-deprecated] stop installing git-tar-tree link
2013-12-02 23:37 ` [PATCH jk/remove-deprecated] stop installing git-tar-tree link Jonathan Nieder
@ 2013-12-03 20:19 ` John Keeping
2013-12-04 10:23 ` Michael J Gruber
1 sibling, 0 replies; 12+ messages in thread
From: John Keeping @ 2013-12-03 20:19 UTC (permalink / raw)
To: Jonathan Nieder; +Cc: git, Junio C Hamano
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@gmail.com>
> ---
> 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
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [PATCH jk/remove-deprecated] stop installing git-tar-tree link
2013-12-02 23:37 ` [PATCH jk/remove-deprecated] stop installing git-tar-tree link Jonathan Nieder
2013-12-03 20:19 ` John Keeping
@ 2013-12-04 10:23 ` Michael J Gruber
1 sibling, 0 replies; 12+ messages in thread
From: Michael J Gruber @ 2013-12-04 10:23 UTC (permalink / raw)
To: Jonathan Nieder, John Keeping; +Cc: git, Junio C Hamano
Jonathan Nieder venit, vidit, dixit 03.12.2013 00:37:
> 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".
... "which still resides in builtin/tar-tree.c"
Had me scratch my head quite a bit as is ;)
> 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@gmail.com>
> ---
> Hi,
>
> John Keeping wrote:
>
>> builtin/tar-tree.c | 62 -------------------------
>
> Here's a quick fixup on top. Thoughts?
>
> Thanks,
> Jonathan
>
> 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
>
^ permalink raw reply [flat|nested] 12+ messages in thread
* [RFC/PATCH 3/4] lost-found: remove deprecated command
2013-11-10 15:47 [RFC/PATCH 0/4] Remove deprecated commands John Keeping
2013-11-10 15:47 ` [RFC/PATCH 1/4] repo-config: remove deprecated alias for "git config" John Keeping
2013-11-10 15:47 ` [RFC/PATCH 2/4] tar-tree: remove deprecated command John Keeping
@ 2013-11-10 15:47 ` John Keeping
2013-11-10 15:47 ` [RFC/PATCH 4/4] peek-remote: remove deprecated alias of ls-remote John Keeping
2013-11-11 18:25 ` [RFC/PATCH 0/4] Remove deprecated commands Junio C Hamano
4 siblings, 0 replies; 12+ messages in thread
From: John Keeping @ 2013-11-10 15:47 UTC (permalink / raw)
To: git; +Cc: John Keeping
"git lost-found" has been deprecated since commit fc8b5f0 (Deprecate
git-lost-found, 2007-11-08), included in version 1.5.4.
Signed-off-by: John Keeping <john@keeping.me.uk>
---
.gitignore | 1 -
Documentation/git-lost-found.txt | 74 ----------------------------------
Makefile | 1 -
command-list.txt | 1 -
contrib/completion/git-completion.bash | 1 -
git-lost-found.sh | 33 ---------------
6 files changed, 111 deletions(-)
delete mode 100644 Documentation/git-lost-found.txt
delete mode 100755 git-lost-found.sh
diff --git a/.gitignore b/.gitignore
index 88b313a..c141b2a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -75,7 +75,6 @@
/git-init-db
/git-instaweb
/git-log
-/git-lost-found
/git-ls-files
/git-ls-remote
/git-ls-tree
diff --git a/Documentation/git-lost-found.txt b/Documentation/git-lost-found.txt
deleted file mode 100644
index d549328..0000000
--- a/Documentation/git-lost-found.txt
+++ /dev/null
@@ -1,74 +0,0 @@
-git-lost-found(1)
-=================
-
-NAME
-----
-git-lost-found - Recover lost refs that luckily have not yet been pruned
-
-SYNOPSIS
---------
-[verse]
-'git lost-found'
-
-DESCRIPTION
------------
-
-*NOTE*: this command is deprecated. Use linkgit:git-fsck[1] with
-the option '--lost-found' instead.
-
-Finds dangling commits and tags from the object database, and
-creates refs to them in the .git/lost-found/ directory. Commits and
-tags that dereference to commits are stored in .git/lost-found/commit,
-and other objects are stored in .git/lost-found/other.
-
-
-OUTPUT
-------
-Prints to standard output the object names and one-line descriptions
-of any commits or tags found.
-
-EXAMPLE
--------
-
-Suppose you run 'git tag -f' and mistype the tag to overwrite.
-The ref to your tag is overwritten, but until you run 'git
-prune', the tag itself is still there.
-
-------------
-$ git lost-found
-[1ef2b196d909eed523d4f3c9bf54b78cdd6843c6] GIT 0.99.9c
-...
-------------
-
-Also you can use gitk to browse how any tags found relate to each
-other.
-
-------------
-$ gitk $(cd .git/lost-found/commit && echo ??*)
-------------
-
-After making sure you know which the object is the tag you are looking
-for, you can reconnect it to your regular `refs` hierarchy by using
-the `update-ref` command.
-
-------------
-$ git cat-file -t 1ef2b196
-tag
-$ git cat-file tag 1ef2b196
-object fa41bbce8e38c67a218415de6cfa510c7e50032a
-type commit
-tag v0.99.9c
-tagger Junio C Hamano <junkio@cox.net> 1131059594 -0800
-
-GIT 0.99.9c
-
-This contains the following changes from the "master" branch, since
-...
-$ git update-ref refs/tags/not-lost-anymore 1ef2b196
-$ git rev-parse not-lost-anymore
-1ef2b196d909eed523d4f3c9bf54b78cdd6843c6
-------------
-
-GIT
----
-Part of the linkgit:git[1] suite
diff --git a/Makefile b/Makefile
index 4fc2378..7ffd705 100644
--- a/Makefile
+++ b/Makefile
@@ -452,7 +452,6 @@ SCRIPT_SH += git-am.sh
SCRIPT_SH += git-bisect.sh
SCRIPT_SH += git-difftool--helper.sh
SCRIPT_SH += git-filter-branch.sh
-SCRIPT_SH += git-lost-found.sh
SCRIPT_SH += git-merge-octopus.sh
SCRIPT_SH += git-merge-one-file.sh
SCRIPT_SH += git-merge-resolve.sh
diff --git a/command-list.txt b/command-list.txt
index f8fc5b8..7bf2420 100644
--- a/command-list.txt
+++ b/command-list.txt
@@ -64,7 +64,6 @@ git-init mainporcelain common
git-instaweb ancillaryinterrogators
gitk mainporcelain
git-log mainporcelain common
-git-lost-found ancillarymanipulators deprecated
git-ls-files plumbinginterrogators
git-ls-remote plumbinginterrogators
git-ls-tree plumbinginterrogators
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 1081ad1..c071614 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -673,7 +673,6 @@ __git_list_porcelain_commands ()
index-pack) : plumbing;;
init-db) : deprecated;;
local-fetch) : plumbing;;
- lost-found) : infrequent;;
ls-files) : plumbing;;
ls-remote) : plumbing;;
ls-tree) : plumbing;;
diff --git a/git-lost-found.sh b/git-lost-found.sh
deleted file mode 100755
index 0b3e8c7..0000000
--- a/git-lost-found.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/sh
-
-USAGE=''
-SUBDIRECTORY_OK='Yes'
-OPTIONS_SPEC=
-. git-sh-setup
-
-echo "WARNING: '$0' is deprecated in favor of 'git fsck --lost-found'" >&2
-
-if [ "$#" != "0" ]
-then
- usage
-fi
-
-laf="$GIT_DIR/lost-found"
-rm -fr "$laf" && mkdir -p "$laf/commit" "$laf/other" || exit
-
-git fsck --full --no-reflogs |
-while read dangling type sha1
-do
- case "$dangling" in
- dangling)
- if git rev-parse -q --verify "$sha1^0" >/dev/null
- then
- dir="$laf/commit"
- git show-branch "$sha1"
- else
- dir="$laf/other"
- fi
- echo "$sha1" >"$dir/$sha1"
- ;;
- esac
-done
--
1.8.5.rc0.170.g772b8ec
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [RFC/PATCH 4/4] peek-remote: remove deprecated alias of ls-remote
2013-11-10 15:47 [RFC/PATCH 0/4] Remove deprecated commands John Keeping
` (2 preceding siblings ...)
2013-11-10 15:47 ` [RFC/PATCH 3/4] lost-found: remove deprecated command John Keeping
@ 2013-11-10 15:47 ` John Keeping
2013-11-11 18:25 ` [RFC/PATCH 0/4] Remove deprecated commands Junio C Hamano
4 siblings, 0 replies; 12+ messages in thread
From: John Keeping @ 2013-11-10 15:47 UTC (permalink / raw)
To: git; +Cc: John Keeping
This has been deprecated since commit 87194d2 (Deprecate peek-remote,
2007-11-24), included in version 1.5.4.
Signed-off-by: John Keeping <john@keeping.me.uk>
---
.gitignore | 1 -
Documentation/git-peek-remote.txt | 43 ----------------------------------
Makefile | 1 -
command-list.txt | 1 -
contrib/completion/git-completion.bash | 1 -
git.c | 1 -
6 files changed, 48 deletions(-)
delete mode 100644 Documentation/git-peek-remote.txt
diff --git a/.gitignore b/.gitignore
index c141b2a..c2ad802 100644
--- a/.gitignore
+++ b/.gitignore
@@ -104,7 +104,6 @@
/git-pack-refs
/git-parse-remote
/git-patch-id
-/git-peek-remote
/git-prune
/git-prune-packed
/git-pull
diff --git a/Documentation/git-peek-remote.txt b/Documentation/git-peek-remote.txt
deleted file mode 100644
index 87ea3fb..0000000
--- a/Documentation/git-peek-remote.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-git-peek-remote(1)
-==================
-
-NAME
-----
-git-peek-remote - List the references in a remote repository
-
-
-SYNOPSIS
---------
-[verse]
-'git peek-remote' [--upload-pack=<git-upload-pack>] [<host>:]<directory>
-
-DESCRIPTION
------------
-This command is deprecated; use 'git ls-remote' instead.
-
-OPTIONS
--------
---upload-pack=<git-upload-pack>::
- Use this to specify the path to 'git-upload-pack' on the
- remote side, if it is not found on your $PATH. Some
- installations of sshd ignores the user's environment
- setup scripts for login shells (e.g. .bash_profile) and
- your privately installed git may not be found on the system
- default $PATH. Another workaround suggested is to set
- up your $PATH in ".bashrc", but this flag is for people
- who do not want to pay the overhead for non-interactive
- shells, but prefer having a lean .bashrc file (they set most of
- the things up in .bash_profile).
-
-<host>::
- A remote host that houses the repository. When this
- part is specified, 'git-upload-pack' is invoked via
- ssh.
-
-<directory>::
- The repository to sync from.
-
-
-GIT
----
-Part of the linkgit:git[1] suite
diff --git a/Makefile b/Makefile
index 7ffd705..504931f 100644
--- a/Makefile
+++ b/Makefile
@@ -589,7 +589,6 @@ 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-peek-remote$X
BUILT_INS += git-show$X
BUILT_INS += git-stage$X
BUILT_INS += git-status$X
diff --git a/command-list.txt b/command-list.txt
index 7bf2420..cf36c3d 100644
--- a/command-list.txt
+++ b/command-list.txt
@@ -87,7 +87,6 @@ git-pack-redundant plumbinginterrogators
git-pack-refs ancillarymanipulators
git-parse-remote synchelpers
git-patch-id purehelpers
-git-peek-remote purehelpers deprecated
git-prune ancillarymanipulators
git-prune-packed plumbingmanipulators
git-pull mainporcelain common
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index c071614..874611d 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -686,7 +686,6 @@ __git_list_porcelain_commands ()
pack-refs) : plumbing;;
parse-remote) : plumbing;;
patch-id) : plumbing;;
- peek-remote) : plumbing;;
prune) : plumbing;;
prune-packed) : plumbing;;
quiltimport) : import;;
diff --git a/git.c b/git.c
index 5c9858f..727e380 100644
--- a/git.c
+++ b/git.c
@@ -408,7 +408,6 @@ static void handle_internal_command(int argc, const char **argv)
{ "pack-redundant", cmd_pack_redundant, RUN_SETUP },
{ "pack-refs", cmd_pack_refs, RUN_SETUP },
{ "patch-id", cmd_patch_id },
- { "peek-remote", cmd_ls_remote, RUN_SETUP_GENTLY },
{ "pickaxe", cmd_blame, RUN_SETUP },
{ "prune", cmd_prune, RUN_SETUP },
{ "prune-packed", cmd_prune_packed, RUN_SETUP },
--
1.8.5.rc0.170.g772b8ec
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [RFC/PATCH 0/4] Remove deprecated commands
2013-11-10 15:47 [RFC/PATCH 0/4] Remove deprecated commands John Keeping
` (3 preceding siblings ...)
2013-11-10 15:47 ` [RFC/PATCH 4/4] peek-remote: remove deprecated alias of ls-remote John Keeping
@ 2013-11-11 18:25 ` Junio C Hamano
2013-11-11 18:38 ` John Keeping
4 siblings, 1 reply; 12+ messages in thread
From: Junio C Hamano @ 2013-11-11 18:25 UTC (permalink / raw)
To: John Keeping; +Cc: git
John Keeping <john@keeping.me.uk> writes:
> "git repo-config", "git tar-tree", "git lost-found" and "git
> peek-remote" have all been deprecated since at least Git 1.5.4.
>
> With Git 2.0 approaching, I think that would be a good point to remove
> then completely, which is what this series does.
Probably good material to discuss during the next cycle.
As a totally unscientific sanity check, I asked Google to show these
since Nov 13, 2011:
[git repo-config] vs [git config]: 136 vs 232
[git peek-remote] vs [git ls-remote]: 62 vs 133
[git tar-tree] vs [git archive]: 73 vs 189
[git lost-found] vs [git fsck --lost-found]: 96 vs 83
So I think 1, 2, and 4 are OK to ship in whatever version that comes
after the upcoming 1.8.5, but we might have to hold onto lost-found
a bit longer. The command does show a deprecation warning, so there
is nothing to change at this point.
Thanks.
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [RFC/PATCH 0/4] Remove deprecated commands
2013-11-11 18:25 ` [RFC/PATCH 0/4] Remove deprecated commands Junio C Hamano
@ 2013-11-11 18:38 ` John Keeping
2013-11-11 19:13 ` Jonathan Nieder
0 siblings, 1 reply; 12+ messages in thread
From: John Keeping @ 2013-11-11 18:38 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
On Mon, Nov 11, 2013 at 10:25:51AM -0800, Junio C Hamano wrote:
> John Keeping <john@keeping.me.uk> writes:
>
> > "git repo-config", "git tar-tree", "git lost-found" and "git
> > peek-remote" have all been deprecated since at least Git 1.5.4.
> >
> > With Git 2.0 approaching, I think that would be a good point to remove
> > then completely, which is what this series does.
>
> Probably good material to discuss during the next cycle.
>
> As a totally unscientific sanity check, I asked Google to show these
> since Nov 13, 2011:
>
> [git repo-config] vs [git config]: 136 vs 232
>
> [git peek-remote] vs [git ls-remote]: 62 vs 133
>
> [git tar-tree] vs [git archive]: 73 vs 189
>
> [git lost-found] vs [git fsck --lost-found]: 96 vs 83
>
> So I think 1, 2, and 4 are OK to ship in whatever version that comes
> after the upcoming 1.8.5, but we might have to hold onto lost-found
> a bit longer. The command does show a deprecation warning, so there
> is nothing to change at this point.
I was assuming these would be queued as a "held until 2.0" branch, but
if you think some can go earlier I can re-send this once 1.8.5 is out of
the way.
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [RFC/PATCH 0/4] Remove deprecated commands
2013-11-11 18:38 ` John Keeping
@ 2013-11-11 19:13 ` Jonathan Nieder
2013-11-11 21:10 ` John Keeping
0 siblings, 1 reply; 12+ messages in thread
From: Jonathan Nieder @ 2013-11-11 19:13 UTC (permalink / raw)
To: John Keeping; +Cc: Junio C Hamano, git
John Keeping wrote:
> On Mon, Nov 11, 2013 at 10:25:51AM -0800, Junio C Hamano wrote:
>> John Keeping <john@keeping.me.uk> writes:
>>> "git repo-config", "git tar-tree", "git lost-found" and "git
>>> peek-remote" have all been deprecated since at least Git 1.5.4.
[...]
>> Probably good material to discuss during the next cycle.
[...]
> I was assuming these would be queued as a "held until 2.0" branch, but
Please no. :) We already have a nice set of features for 2.0 and I
hope people have as few excuses not to upgrade as possible. Anything
that actually needs the same kind of treatment that is introduced now
should wait for 3.0.
Removing repo-config, tar-tree, and peek-remote sounds fine to me
(though I haven't thought much about it either way) and I agree that
it wouldn't need to wait for an x.0 release.
Thanks,
Jonathan
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [RFC/PATCH 0/4] Remove deprecated commands
2013-11-11 19:13 ` Jonathan Nieder
@ 2013-11-11 21:10 ` John Keeping
0 siblings, 0 replies; 12+ messages in thread
From: John Keeping @ 2013-11-11 21:10 UTC (permalink / raw)
To: Jonathan Nieder; +Cc: Junio C Hamano, git
On Mon, Nov 11, 2013 at 11:13:45AM -0800, Jonathan Nieder wrote:
> John Keeping wrote:
> > On Mon, Nov 11, 2013 at 10:25:51AM -0800, Junio C Hamano wrote:
> >> John Keeping <john@keeping.me.uk> writes:
>
> >>> "git repo-config", "git tar-tree", "git lost-found" and "git
> >>> peek-remote" have all been deprecated since at least Git 1.5.4.
> [...]
> >> Probably good material to discuss during the next cycle.
> [...]
> > I was assuming these would be queued as a "held until 2.0" branch, but
>
> Please no. :) We already have a nice set of features for 2.0 and I
> hope people have as few excuses not to upgrade as possible. Anything
> that actually needs the same kind of treatment that is introduced now
> should wait for 3.0.
>
> Removing repo-config, tar-tree, and peek-remote sounds fine to me
> (though I haven't thought much about it either way) and I agree that
> it wouldn't need to wait for an x.0 release.
For "git repo-config", the 1.5.4 release notes say that it will "be
removed in the next feature release". I'm not sure what a "feature
release" is, but if 1.6.0 wasn't one, then I think 2.0 will be the next
one.
Although, I now see that howto/maintain-git.txt says a feature release
is numbered vX.Y.Z, so perhaps it should have been removed long before
now...
^ permalink raw reply [flat|nested] 12+ messages in thread