Remove deprecated commands

PATCH In review John Keeping 4 participants 12 messages Jun 15, 2016

Subsystems (2)

Documentation Kbuild

lore

Share & tools

lore

John Keeping

author

2016-06-15 22:59 UTC #0 lore raw

cover Remove deprecated commands

"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.

John Keeping (4):
repo-config: remove deprecated alias for "git config"
tar-tree: remove deprecated command
lost-found: remove deprecated command
peek-remote: remove deprecated alias of ls-remote

 .gitignore                             |  4 --
 Documentation/git-lost-found.txt       | 74 ------------------------------
 Documentation/git-peek-remote.txt      | 43 ------------------
 Documentation/git-repo-config.txt      | 23 ----------
 Documentation/git-tar-tree.txt         | 82 ----------------------------------
 Makefile                               |  3 --
 builtin.h                              |  1 -
 builtin/config.c                       |  6 ---
 builtin/tar-tree.c                     | 62 -------------------------
 command-list.txt                       |  4 --
 contrib/completion/git-completion.bash |  4 --
 contrib/examples/git-whatchanged.sh    |  4 +-
 git-lost-found.sh                      | 33 --------------
 git.c                                  |  3 --
 t/t4116-apply-reverse.sh               |  4 +-
 t/t5000-tar-tree.sh                    | 16 ++-----
 t/t5001-archive-attr.sh                | 10 -----
 17 files changed, 7 insertions(+), 369 deletions(-)
 delete mode 100644 Documentation/git-lost-found.txt
 delete mode 100644 Documentation/git-peek-remote.txt
 delete mode 100644 Documentation/git-repo-config.txt
 delete mode 100644 Documentation/git-tar-tree.txt
 delete mode 100755 git-lost-found.sh

Signature · 1 line

1.8.5.rc0.170.g772b8ec

John Keeping

author

2016-06-15 22:59 UTC #1 lore raw

PATCH 1/4 repo-config: remove deprecated alias for "git config"

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 <[email protected]>

---
 .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

.gitignore +0 -1

index 66199ed..3bc1b08 100644
@@ -131,7 +131,6 @@
 /git-remote-testsvn
 /git-repack
 /git-replace
-/git-repo-config
 /git-request-pull
 /git-rerere
 /git-reset

Documentation/git-repo-config.txt deleted +0 ~~-23~~

deleted file mode 100644
index 9ec115b..0000000
@@ -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

Makefile +0 -1

index af847f8..4fc2378 100644
@@ -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

builtin.h +0 -1

index b56cf07..d4afbfe 100644
@@ -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);

builtin/config.c +0 -6

index 20e89fe..92ebf23 100644
@@ -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);
-}

command-list.txt +0 -1

index 08b04e2..f2bf684 100644
@@ -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

contrib/completion/git-completion.bash +0 -1

index dba3c15..c6063c9 100644
@@ -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;;

contrib/examples/git-whatchanged.sh +2 -2

index 1fb9feb..2edbdc6 100755
@@ -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" &&

git.c +0 -1

index cb5208d..0c9dde2 100644
@@ -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 },

Signature · 1 line

1.8.5.rc0.170.g772b8ec

John Keeping

author

2016-06-15 22:59 UTC #2 lore raw

PATCH 2/4 tar-tree: remove deprecated command

In reply to 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 <[email protected]>

---
 .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

.gitignore +0 -1

index 3bc1b08..88b313a 100644
@@ -158,7 +158,6 @@
 /git-svn
 /git-symbolic-ref
 /git-tag
-/git-tar-tree
 /git-unpack-file
 /git-unpack-objects
 /git-update-index

Documentation/git-tar-tree.txt deleted +0 ~~-82~~

82 lines not on this page · raw message

builtin/tar-tree.c +0 ~~-62~~

71 lines not on this page · raw message

command-list.txt +0 -1

index f2bf684..f8fc5b8 100644
@@ -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

contrib/completion/git-completion.bash +0 -1

index c6063c9..1081ad1 100644
@@ -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;;

git.c +0 -1

index 0c9dde2..5c9858f 100644
@@ -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 },

t/t4116-apply-reverse.sh +2 -2

index 2298ece..1e4d438 100755
@@ -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 .
 	)

t/t5000-tar-tree.sh +3 ~~-13~~

index c2023b1..11bf0b8 100755
@@ -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

t/t5001-archive-attr.sh +0 ~~-10~~

index f47d871..51dedab 100755
@@ -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

Signature · 1 line

1.8.5.rc0.170.g772b8ec

Jonathan Nieder

2016-06-15 22:59 UTC #3 lore raw

PATCH 1/1 stop installing git-tar-tree link

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 <[email protected]>

---
Hi,

Quoted 1 line · John Keeping

 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%)

Makefile +1 -2

index 504931f..37beb73 100644
@@ -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

builtin/get-tar-commit-id.c renamed from builtin/tar-tree.c +0 -0

similarity index 100%
rename from builtin/tar-tree.c
rename to builtin/get-tar-commit-id.c

Signature · 1 line

1.8.4.1

John Keeping

author

2016-06-15 22:59 UTC #4 lore raw

Re: [PATCH jk/remove-deprecated] stop installing git-tar-tree link

Quoted 15 lines · Jonathan Nieder

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 <[email protected]>

Quoted 8 lines

---
Hi,
Quoted 1 line · John Keeping
 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.

Quoted 39 lines

 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%)

Makefile +1 -2

index 504931f..37beb73 100644
@@ -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

builtin/get-tar-commit-id.c renamed from builtin/tar-tree.c +0 -0

similarity index 100%
rename from builtin/tar-tree.c
rename to builtin/get-tar-commit-id.c

Signature · 1 line

1.8.4.1

Michael J Gruber

2016-06-15 22:59 UTC #5 lore raw

Re: [PATCH jk/remove-deprecated] stop installing git-tar-tree link

In reply to Jonathan Nieder

Jonathan Nieder venit, vidit, dixit 03.12.2013 00:37:

Quoted 11 lines

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 ;)

Quoted 54 lines

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 <[email protected]>

---
Hi,

Quoted 1 line · John Keeping

 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%)

Makefile +1 -2

index 504931f..37beb73 100644
@@ -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

builtin/get-tar-commit-id.c renamed from builtin/tar-tree.c +0 -0

similarity index 100%
rename from builtin/tar-tree.c
rename to builtin/get-tar-commit-id.c

John Keeping

author

2016-06-15 22:59 UTC #6 lore raw

PATCH 3/4 lost-found: remove deprecated command

In reply to 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 <[email protected]>

---
 .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

.gitignore +0 -1

index 88b313a..c141b2a 100644
@@ -75,7 +75,6 @@
 /git-init-db
 /git-instaweb
 /git-log
-/git-lost-found
 /git-ls-files
 /git-ls-remote
 /git-ls-tree

Documentation/git-lost-found.txt deleted +0 ~~-74~~

74 lines not on this page · raw message

Makefile +0 -1

index 4fc2378..7ffd705 100644
@@ -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

command-list.txt +0 -1

index f8fc5b8..7bf2420 100644
@@ -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

contrib/completion/git-completion.bash +0 -1

index 1081ad1..c071614 100644
@@ -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;;

git-lost-found.sh deleted +0 ~~-33~~

deleted file mode 100755
index 0b3e8c7..0000000
@@ -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

Signature · 1 line

1.8.5.rc0.170.g772b8ec

John Keeping

author

2016-06-15 22:59 UTC #7 lore raw

PATCH 4/4 peek-remote: remove deprecated alias of ls-remote

In reply to 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 <[email protected]>

---
 .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

.gitignore +0 -1

index c141b2a..c2ad802 100644
@@ -104,7 +104,6 @@
 /git-pack-refs
 /git-parse-remote
 /git-patch-id
-/git-peek-remote
 /git-prune
 /git-prune-packed
 /git-pull

Documentation/git-peek-remote.txt deleted +0 ~~-43~~

43 lines not on this page · raw message

Makefile +0 -1

index 7ffd705..504931f 100644
@@ -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

command-list.txt +0 -1

index 7bf2420..cf36c3d 100644
@@ -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

contrib/completion/git-completion.bash +0 -1

index c071614..874611d 100644
@@ -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;;

git.c +0 -1

index 5c9858f..727e380 100644
@@ -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 },

Signature · 1 line

1.8.5.rc0.170.g772b8ec

Junio C Hamano

2016-06-15 22:59 UTC #8 lore raw

In reply to John Keeping

Quoted 5 lines · John Keeping

"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.

John Keeping

author

2016-06-15 22:59 UTC #9 lore raw

Quoted 21 lines · Junio C Hamano

Quoted 5 lines · John Keeping
"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

Quoted 4 lines

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.

Jonathan Nieder

2016-06-15 22:59 UTC #10 lore raw

Quoted 5 lines · John Keeping

Quoted 4 lines · Junio C Hamano
Quoted 2 lines · John Keeping
"git repo-config", "git tar-tree", "git lost-found" and "git peek-remote" have all been deprecated since at least Git 1.5.4.

[...]

Quoted 1 line

Quoted 1 line
Probably good material to discuss during the next cycle.

[...]

Quoted 1 line

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

John Keeping

author

2016-06-15 22:59 UTC #11 lore raw

Quoted 11 lines · Jonathan Nieder

Quoted 5 lines · John Keeping
Quoted 4 lines · Junio C Hamano
Quoted 2 lines · John Keeping
"git repo-config", "git tar-tree", "git lost-found" and "git peek-remote" have all been deprecated since at least Git 1.5.4.
[...]
Quoted 1 line
Quoted 1 line
Probably good material to discuss during the next cycle.
[...]
Quoted 1 line
I was assuming these would be queued as a "held until 2.0" branch, but

Quoted 8 lines

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...