* [PATCH] Deprecate git-lost-found @ 2007-11-07 22:54 Johannes Schindelin 2007-11-08 0:19 ` Junio C Hamano 0 siblings, 1 reply; 22+ messages in thread From: Johannes Schindelin @ 2007-11-07 22:54 UTC (permalink / raw) To: git, gitster "git fsck" learnt the option "--lost-found" in v1.5.3-rc0~5, to make "git lost-found" obsolete. It is time to deprecate "git lost-found". Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> --- Maybe we can remove it in another 5 months... git-lost-found.sh | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/git-lost-found.sh b/git-lost-found.sh index a5a32e7..9cedaf8 100755 --- a/git-lost-found.sh +++ b/git-lost-found.sh @@ -5,6 +5,8 @@ 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 -- 1.5.3.5.1597.g7191 ^ permalink raw reply related [flat|nested] 22+ messages in thread
* Re: [PATCH] Deprecate git-lost-found 2007-11-07 22:54 [PATCH] Deprecate git-lost-found Johannes Schindelin @ 2007-11-08 0:19 ` Junio C Hamano 2007-11-08 0:37 ` Johannes Schindelin 2007-11-08 0:41 ` [PATCH v2] " Johannes Schindelin 0 siblings, 2 replies; 22+ messages in thread From: Junio C Hamano @ 2007-11-08 0:19 UTC (permalink / raw) To: Johannes Schindelin; +Cc: git Makes sort of sense. Add deprecation notice to Documentation/ as well, please. ^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH] Deprecate git-lost-found 2007-11-08 0:19 ` Junio C Hamano @ 2007-11-08 0:37 ` Johannes Schindelin 2007-11-08 0:41 ` [PATCH v2] " Johannes Schindelin 1 sibling, 0 replies; 22+ messages in thread From: Johannes Schindelin @ 2007-11-08 0:37 UTC (permalink / raw) To: Junio C Hamano; +Cc: git Hi, On Wed, 7 Nov 2007, Junio C Hamano wrote: > Makes sort of sense. Add deprecation notice to Documentation/ > as well, please. Of course. Will resend in a minute. Ciao, Dscho ^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH v2] Deprecate git-lost-found 2007-11-08 0:19 ` Junio C Hamano 2007-11-08 0:37 ` Johannes Schindelin @ 2007-11-08 0:41 ` Johannes Schindelin 2007-11-08 14:54 ` [PATCH] Remove deprecated commands from command list and update manpages Jonas Fonseca 1 sibling, 1 reply; 22+ messages in thread From: Johannes Schindelin @ 2007-11-08 0:41 UTC (permalink / raw) To: Junio C Hamano; +Cc: git "git fsck" learnt the option "--lost-found" in v1.5.3-rc0~5, to make "git lost-found" obsolete. It is time to deprecate "git lost-found". Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> --- Documentation/RelNotes-1.5.4.txt | 3 +++ Documentation/git-lost-found.txt | 4 ++++ git-lost-found.sh | 2 ++ 3 files changed, 9 insertions(+), 0 deletions(-) diff --git a/Documentation/RelNotes-1.5.4.txt b/Documentation/RelNotes-1.5.4.txt index 133fa64..65dd1b0 100644 --- a/Documentation/RelNotes-1.5.4.txt +++ b/Documentation/RelNotes-1.5.4.txt @@ -46,6 +46,9 @@ Updates since v1.5.3 * Various Perforce importer updates. + * git-lost-found was deprecated in favor of git-fsck's --lost-found + option. + Fixes since v1.5.3 ------------------ diff --git a/Documentation/git-lost-found.txt b/Documentation/git-lost-found.txt index bc73911..7f808fc 100644 --- a/Documentation/git-lost-found.txt +++ b/Documentation/git-lost-found.txt @@ -11,6 +11,10 @@ SYNOPSIS DESCRIPTION ----------- + +*NOTE*: this command is deprecated. Use gitlink: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, diff --git a/git-lost-found.sh b/git-lost-found.sh index a5a32e7..9cedaf8 100755 --- a/git-lost-found.sh +++ b/git-lost-found.sh @@ -5,6 +5,8 @@ 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 -- 1.5.3.5.1597.g7191 ^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH] Remove deprecated commands from command list and update manpages 2007-11-08 0:41 ` [PATCH v2] " Johannes Schindelin @ 2007-11-08 14:54 ` Jonas Fonseca 2007-11-08 15:00 ` Andreas Ericsson 2007-11-08 15:18 ` [PATCH] Remove deprecated commands from command list and update manpages Johannes Schindelin 0 siblings, 2 replies; 22+ messages in thread From: Jonas Fonseca @ 2007-11-08 14:54 UTC (permalink / raw) To: Johannes Schindelin; +Cc: Junio C Hamano, git ... and remove manpages of commands that no longer exists. Signed-off-by: Jonas Fonseca <fonseca@diku.dk> --- Documentation/cmd-list.perl | 5 --- Documentation/git-local-fetch.txt | 66 ------------------------------------- Documentation/git-ssh-fetch.txt | 52 ----------------------------- Documentation/git-ssh-upload.txt | 48 --------------------------- Documentation/git-tar-tree.txt | 2 +- Documentation/git-var.txt | 3 +- 6 files changed, 3 insertions(+), 173 deletions(-) delete mode 100644 Documentation/git-local-fetch.txt delete mode 100644 Documentation/git-ssh-fetch.txt delete mode 100644 Documentation/git-ssh-upload.txt Although this new version updates the git-lost-found(1) the command is still listed in git(7) which I find misleading. Anyway, it made me investigate the commands we list in git(7) and I found a few that could possibly be cleaned up. diff --git a/Documentation/cmd-list.perl b/Documentation/cmd-list.perl index 8d21d42..7f1f5d2 100755 --- a/Documentation/cmd-list.perl +++ b/Documentation/cmd-list.perl @@ -124,9 +124,7 @@ git-index-pack plumbingmanipulators git-init mainporcelain git-instaweb ancillaryinterrogators gitk mainporcelain -git-local-fetch synchingrepositories git-log mainporcelain -git-lost-found ancillarymanipulators git-ls-files plumbinginterrogators git-ls-remote plumbinginterrogators git-ls-tree plumbinginterrogators @@ -178,8 +176,6 @@ git-show-branch ancillaryinterrogators git-show-index plumbinginterrogators git-show-ref plumbinginterrogators git-sh-setup purehelpers -git-ssh-fetch synchingrepositories -git-ssh-upload synchingrepositories git-stash mainporcelain git-status mainporcelain git-stripspace purehelpers @@ -187,7 +183,6 @@ git-submodule mainporcelain git-svn foreignscminterface git-symbolic-ref plumbingmanipulators git-tag mainporcelain -git-tar-tree plumbinginterrogators git-unpack-file plumbinginterrogators git-unpack-objects plumbingmanipulators git-update-index plumbingmanipulators diff --git a/Documentation/git-local-fetch.txt b/Documentation/git-local-fetch.txt deleted file mode 100644 index e830dee..0000000 --- a/Documentation/git-local-fetch.txt +++ /dev/null @@ -1,66 +0,0 @@ -git-local-fetch(1) -================== - -NAME ----- -git-local-fetch - Duplicate another git repository on a local system - - -SYNOPSIS --------- -[verse] -'git-local-fetch' [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] [-l] [-s] [-n] - commit-id path - -DESCRIPTION ------------ -THIS COMMAND IS DEPRECATED. - -Duplicates another git repository on a local system. - -OPTIONS -------- --c:: - Get the commit objects. --t:: - Get trees associated with the commit objects. --a:: - Get all the objects. --v:: - Report what is downloaded. --s:: - Instead of regular file-to-file copying use symbolic links to the objects - in the remote repository. --l:: - Before attempting symlinks (if -s is specified) or file-to-file copying the - remote objects, try to hardlink the remote objects into the local - repository. --n:: - Never attempt to file-to-file copy remote objects. Only useful with - -s or -l command-line options. - --w <filename>:: - Writes the commit-id into the filename under $GIT_DIR/refs/<filename> on - the local end after the transfer is complete. - ---stdin:: - Instead of a commit id on the command line (which is not expected in this - case), 'git-local-fetch' expects lines on stdin in the format - - <commit-id>['\t'<filename-as-in--w>] - ---recover:: - Verify that everything reachable from target is fetched. Used after - an earlier fetch is interrupted. - -Author ------- -Written by Junio C Hamano <junkio@cox.net> - -Documentation --------------- -Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>. - -GIT ---- -Part of the gitlink:git[7] suite diff --git a/Documentation/git-ssh-fetch.txt b/Documentation/git-ssh-fetch.txt deleted file mode 100644 index 8d3e2ff..0000000 --- a/Documentation/git-ssh-fetch.txt +++ /dev/null @@ -1,52 +0,0 @@ -git-ssh-fetch(1) -================ - -NAME ----- -git-ssh-fetch - Fetch from a remote repository over ssh connection - - - -SYNOPSIS --------- -'git-ssh-fetch' [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] commit-id url - -DESCRIPTION ------------ -THIS COMMAND IS DEPRECATED. - -Pulls from a remote repository over ssh connection, invoking -git-ssh-upload on the other end. It functions identically to -git-ssh-upload, aside from which end you run it on. - - -OPTIONS -------- -commit-id:: - Either the hash or the filename under [URL]/refs/ to - pull. - --c:: - Get the commit objects. --t:: - Get trees associated with the commit objects. --a:: - Get all the objects. --v:: - Report what is downloaded. --w:: - Writes the commit-id into the filename under $GIT_DIR/refs/ on - the local end after the transfer is complete. - - -Author ------- -Written by Daniel Barkalow <barkalow@iabervon.org> - -Documentation --------------- -Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>. - -GIT ---- -Part of the gitlink:git[7] suite diff --git a/Documentation/git-ssh-upload.txt b/Documentation/git-ssh-upload.txt deleted file mode 100644 index 5e2ca8d..0000000 --- a/Documentation/git-ssh-upload.txt +++ /dev/null @@ -1,48 +0,0 @@ -git-ssh-upload(1) -================= - -NAME ----- -git-ssh-upload - Push to a remote repository over ssh connection - - -SYNOPSIS --------- -'git-ssh-upload' [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] commit-id url - -DESCRIPTION ------------ -THIS COMMAND IS DEPRECATED. - -Pushes from a remote repository over ssh connection, invoking -git-ssh-fetch on the other end. It functions identically to -git-ssh-fetch, aside from which end you run it on. - -OPTIONS -------- -commit-id:: - Id of commit to push. - --c:: - Get the commit objects. --t:: - Get tree associated with the requested commit object. --a:: - Get all the objects. --v:: - Report what is uploaded. --w:: - Writes the commit-id into the filename under [URL]/refs/ on - the remote end after the transfer is complete. - -Author ------- -Written by Daniel Barkalow <barkalow@iabervon.org> - -Documentation --------------- -Documentation by Daniel Barkalow - -GIT ---- -Part of the gitlink:git[7] suite diff --git a/Documentation/git-tar-tree.txt b/Documentation/git-tar-tree.txt index 434607b..4aaf813 100644 --- a/Documentation/git-tar-tree.txt +++ b/Documentation/git-tar-tree.txt @@ -12,7 +12,7 @@ SYNOPSIS DESCRIPTION ----------- -THIS COMMAND IS DEPRECATED. Use `git-archive` with `--format=tar` +THIS COMMAND IS DEPRECATED. Use gitlink:git-archive[1] 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. diff --git a/Documentation/git-var.txt b/Documentation/git-var.txt index 8139423..73c37b0 100644 --- a/Documentation/git-var.txt +++ b/Documentation/git-var.txt @@ -20,7 +20,8 @@ OPTIONS Cause the logical variables to be listed. In addition, all the variables of the git configuration file .git/config are listed as well. (However, the configuration variables listing functionality - is deprecated in favor of `git-config -l`.) + is deprecated. Use gitlink:git-config[1] with the option '-l' + instead.) EXAMPLE -------- -- 1.5.3.5.1623.g4aab495-dirty -- Jonas Fonseca ^ permalink raw reply related [flat|nested] 22+ messages in thread
* Re: [PATCH] Remove deprecated commands from command list and update manpages 2007-11-08 14:54 ` [PATCH] Remove deprecated commands from command list and update manpages Jonas Fonseca @ 2007-11-08 15:00 ` Andreas Ericsson 2007-11-08 16:01 ` [PATCH] Drop deprecated commands from git(7) and update deprecation notices Jonas Fonseca 2007-11-08 15:18 ` [PATCH] Remove deprecated commands from command list and update manpages Johannes Schindelin 1 sibling, 1 reply; 22+ messages in thread From: Andreas Ericsson @ 2007-11-08 15:00 UTC (permalink / raw) To: Jonas Fonseca; +Cc: Johannes Schindelin, Junio C Hamano, git Jonas Fonseca wrote: > ... and remove manpages of commands that no longer exists. > > diff --git a/Documentation/git-var.txt b/Documentation/git-var.txt > index 8139423..73c37b0 100644 > --- a/Documentation/git-var.txt > +++ b/Documentation/git-var.txt > @@ -20,7 +20,8 @@ OPTIONS > Cause the logical variables to be listed. In addition, all the > variables of the git configuration file .git/config are listed > as well. (However, the configuration variables listing functionality > - is deprecated in favor of `git-config -l`.) > + is deprecated. Use gitlink:git-config[1] with the option '-l' > + instead.) > Skip the parentheses. It reads better without it. -- Andreas Ericsson andreas.ericsson@op5.se OP5 AB www.op5.se Tel: +46 8-230225 Fax: +46 8-230231 ^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH] Drop deprecated commands from git(7) and update deprecation notices 2007-11-08 15:00 ` Andreas Ericsson @ 2007-11-08 16:01 ` Jonas Fonseca 2007-11-08 21:01 ` Junio C Hamano 0 siblings, 1 reply; 22+ messages in thread From: Jonas Fonseca @ 2007-11-08 16:01 UTC (permalink / raw) To: Andreas Ericsson; +Cc: Johannes Schindelin, Junio C Hamano, git Also remove manpages of commands that no longer exist. Signed-off-by: Jonas Fonseca <fonseca@diku.dk> --- Documentation/cmd-list.perl | 5 --- Documentation/git-local-fetch.txt | 66 ------------------------------------- Documentation/git-ssh-fetch.txt | 52 ----------------------------- Documentation/git-ssh-upload.txt | 48 --------------------------- Documentation/git-tar-tree.txt | 2 +- Documentation/git-var.txt | 5 ++- 6 files changed, 4 insertions(+), 174 deletions(-) delete mode 100644 Documentation/git-local-fetch.txt delete mode 100644 Documentation/git-ssh-fetch.txt delete mode 100644 Documentation/git-ssh-upload.txt Andreas Ericsson <ae@op5.se> wrote Thu, Nov 08, 2007: > Jonas Fonseca wrote: > >... and remove manpages of commands that no longer exists. > > > >diff --git a/Documentation/git-var.txt b/Documentation/git-var.txt > >index 8139423..73c37b0 100644 > >--- a/Documentation/git-var.txt > >+++ b/Documentation/git-var.txt > >@@ -20,7 +20,8 @@ OPTIONS > > Cause the logical variables to be listed. In addition, all the > > variables of the git configuration file .git/config are listed > > as well. (However, the configuration variables listing functionality > >- is deprecated in favor of `git-config -l`.) > >+ is deprecated. Use gitlink:git-config[1] with the option '-l' > >+ instead.) > > > > Skip the parentheses. It reads better without it. Yes, you are right. Also updated the commit message to be less misleading (git-var is not removed but the deprecation notice is updated). diff --git a/Documentation/cmd-list.perl b/Documentation/cmd-list.perl index 8d21d42..7f1f5d2 100755 --- a/Documentation/cmd-list.perl +++ b/Documentation/cmd-list.perl @@ -124,9 +124,7 @@ git-index-pack plumbingmanipulators git-init mainporcelain git-instaweb ancillaryinterrogators gitk mainporcelain -git-local-fetch synchingrepositories git-log mainporcelain -git-lost-found ancillarymanipulators git-ls-files plumbinginterrogators git-ls-remote plumbinginterrogators git-ls-tree plumbinginterrogators @@ -178,8 +176,6 @@ git-show-branch ancillaryinterrogators git-show-index plumbinginterrogators git-show-ref plumbinginterrogators git-sh-setup purehelpers -git-ssh-fetch synchingrepositories -git-ssh-upload synchingrepositories git-stash mainporcelain git-status mainporcelain git-stripspace purehelpers @@ -187,7 +183,6 @@ git-submodule mainporcelain git-svn foreignscminterface git-symbolic-ref plumbingmanipulators git-tag mainporcelain -git-tar-tree plumbinginterrogators git-unpack-file plumbinginterrogators git-unpack-objects plumbingmanipulators git-update-index plumbingmanipulators diff --git a/Documentation/git-local-fetch.txt b/Documentation/git-local-fetch.txt deleted file mode 100644 index e830dee..0000000 --- a/Documentation/git-local-fetch.txt +++ /dev/null @@ -1,66 +0,0 @@ -git-local-fetch(1) -================== - -NAME ----- -git-local-fetch - Duplicate another git repository on a local system - - -SYNOPSIS --------- -[verse] -'git-local-fetch' [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] [-l] [-s] [-n] - commit-id path - -DESCRIPTION ------------ -THIS COMMAND IS DEPRECATED. - -Duplicates another git repository on a local system. - -OPTIONS -------- --c:: - Get the commit objects. --t:: - Get trees associated with the commit objects. --a:: - Get all the objects. --v:: - Report what is downloaded. --s:: - Instead of regular file-to-file copying use symbolic links to the objects - in the remote repository. --l:: - Before attempting symlinks (if -s is specified) or file-to-file copying the - remote objects, try to hardlink the remote objects into the local - repository. --n:: - Never attempt to file-to-file copy remote objects. Only useful with - -s or -l command-line options. - --w <filename>:: - Writes the commit-id into the filename under $GIT_DIR/refs/<filename> on - the local end after the transfer is complete. - ---stdin:: - Instead of a commit id on the command line (which is not expected in this - case), 'git-local-fetch' expects lines on stdin in the format - - <commit-id>['\t'<filename-as-in--w>] - ---recover:: - Verify that everything reachable from target is fetched. Used after - an earlier fetch is interrupted. - -Author ------- -Written by Junio C Hamano <junkio@cox.net> - -Documentation --------------- -Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>. - -GIT ---- -Part of the gitlink:git[7] suite diff --git a/Documentation/git-ssh-fetch.txt b/Documentation/git-ssh-fetch.txt deleted file mode 100644 index 8d3e2ff..0000000 --- a/Documentation/git-ssh-fetch.txt +++ /dev/null @@ -1,52 +0,0 @@ -git-ssh-fetch(1) -================ - -NAME ----- -git-ssh-fetch - Fetch from a remote repository over ssh connection - - - -SYNOPSIS --------- -'git-ssh-fetch' [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] commit-id url - -DESCRIPTION ------------ -THIS COMMAND IS DEPRECATED. - -Pulls from a remote repository over ssh connection, invoking -git-ssh-upload on the other end. It functions identically to -git-ssh-upload, aside from which end you run it on. - - -OPTIONS -------- -commit-id:: - Either the hash or the filename under [URL]/refs/ to - pull. - --c:: - Get the commit objects. --t:: - Get trees associated with the commit objects. --a:: - Get all the objects. --v:: - Report what is downloaded. --w:: - Writes the commit-id into the filename under $GIT_DIR/refs/ on - the local end after the transfer is complete. - - -Author ------- -Written by Daniel Barkalow <barkalow@iabervon.org> - -Documentation --------------- -Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>. - -GIT ---- -Part of the gitlink:git[7] suite diff --git a/Documentation/git-ssh-upload.txt b/Documentation/git-ssh-upload.txt deleted file mode 100644 index 5e2ca8d..0000000 --- a/Documentation/git-ssh-upload.txt +++ /dev/null @@ -1,48 +0,0 @@ -git-ssh-upload(1) -================= - -NAME ----- -git-ssh-upload - Push to a remote repository over ssh connection - - -SYNOPSIS --------- -'git-ssh-upload' [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] commit-id url - -DESCRIPTION ------------ -THIS COMMAND IS DEPRECATED. - -Pushes from a remote repository over ssh connection, invoking -git-ssh-fetch on the other end. It functions identically to -git-ssh-fetch, aside from which end you run it on. - -OPTIONS -------- -commit-id:: - Id of commit to push. - --c:: - Get the commit objects. --t:: - Get tree associated with the requested commit object. --a:: - Get all the objects. --v:: - Report what is uploaded. --w:: - Writes the commit-id into the filename under [URL]/refs/ on - the remote end after the transfer is complete. - -Author ------- -Written by Daniel Barkalow <barkalow@iabervon.org> - -Documentation --------------- -Documentation by Daniel Barkalow - -GIT ---- -Part of the gitlink:git[7] suite diff --git a/Documentation/git-tar-tree.txt b/Documentation/git-tar-tree.txt index 434607b..4aaf813 100644 --- a/Documentation/git-tar-tree.txt +++ b/Documentation/git-tar-tree.txt @@ -12,7 +12,7 @@ SYNOPSIS DESCRIPTION ----------- -THIS COMMAND IS DEPRECATED. Use `git-archive` with `--format=tar` +THIS COMMAND IS DEPRECATED. Use gitlink:git-archive[1] 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. diff --git a/Documentation/git-var.txt b/Documentation/git-var.txt index 8139423..7e90a95 100644 --- a/Documentation/git-var.txt +++ b/Documentation/git-var.txt @@ -19,8 +19,9 @@ OPTIONS -l:: Cause the logical variables to be listed. In addition, all the variables of the git configuration file .git/config are listed - as well. (However, the configuration variables listing functionality - is deprecated in favor of `git-config -l`.) + as well. However, the configuration variables listing functionality + is deprecated. Use gitlink:git-config[1] with the option '-l' + instead. EXAMPLE -------- -- 1.5.3.5.1622.g41d10 -- Jonas Fonseca ^ permalink raw reply related [flat|nested] 22+ messages in thread
* Re: [PATCH] Drop deprecated commands from git(7) and update deprecation notices 2007-11-08 16:01 ` [PATCH] Drop deprecated commands from git(7) and update deprecation notices Jonas Fonseca @ 2007-11-08 21:01 ` Junio C Hamano 2007-11-09 0:20 ` [PATCH] Remove non-existing commands from git(7) and delete their manpages Jonas Fonseca 0 siblings, 1 reply; 22+ messages in thread From: Junio C Hamano @ 2007-11-08 21:01 UTC (permalink / raw) To: Jonas Fonseca; +Cc: Andreas Ericsson, Johannes Schindelin, git Thanks. But lost-found is merely deprecated but not removed yet, so I think it should be kept in the list cmd-list.perl generates. We may want a mechanism to mark it deprecated in the list as well, though. Perhaps ... --- Documentation/cmd-list.perl | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/Documentation/cmd-list.perl b/Documentation/cmd-list.perl index 8d21d42..0066064 100755 --- a/Documentation/cmd-list.perl +++ b/Documentation/cmd-list.perl @@ -3,7 +3,8 @@ use File::Compare qw(compare); sub format_one { - my ($out, $name) = @_; + my ($out, $nameattr) = @_; + my ($name, $attr) = @$nameattr; my ($state, $description); $state = 0; open I, '<', "$name.txt" or die "No such file $name.txt"; @@ -26,8 +27,11 @@ sub format_one { die "No description found in $name.txt"; } if (my ($verify_name, $text) = ($description =~ /^($name) - (.*)/)) { - print $out "gitlink:$name\[1\]::\n"; - print $out "\t$text.\n\n"; + print $out "gitlink:$name\[1\]::\n\t"; + if ($attr) { + print $out "($attr) "; + } + print $out "$text.\n\n"; } else { die "Description does not match $name: $description"; @@ -39,8 +43,8 @@ while (<DATA>) { next if /^#/; chomp; - my ($name, $cat) = /^(\S+)\s+(.*)$/; - push @{$cmds{$cat}}, $name; + my ($name, $cat, $attr) = /^(\S+)\s+(.*?)(?:\s+(.*))?$/; + push @{$cmds{$cat}}, [$name, $attr]; } for my $cat (qw(ancillaryinterrogators @@ -126,7 +130,7 @@ git-instaweb ancillaryinterrogators gitk mainporcelain git-local-fetch synchingrepositories git-log mainporcelain -git-lost-found ancillarymanipulators +git-lost-found ancillarymanipulators deprecated git-ls-files plumbinginterrogators git-ls-remote plumbinginterrogators git-ls-tree plumbinginterrogators ^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH] Remove non-existing commands from git(7) and delete their manpages 2007-11-08 21:01 ` Junio C Hamano @ 2007-11-09 0:20 ` Jonas Fonseca 2007-11-09 1:21 ` [PATCH 1/3] Documentation: lost-found is now deprecated Junio C Hamano ` (2 more replies) 0 siblings, 3 replies; 22+ messages in thread From: Jonas Fonseca @ 2007-11-09 0:20 UTC (permalink / raw) To: Junio C Hamano; +Cc: Andreas Ericsson, Johannes Schindelin, git Signed-off-by: Jonas Fonseca <fonseca@diku.dk> --- Documentation/cmd-list.perl | 3 -- Documentation/git-local-fetch.txt | 66 ------------------------------------- Documentation/git-ssh-fetch.txt | 52 ----------------------------- Documentation/git-ssh-upload.txt | 48 --------------------------- 4 files changed, 0 insertions(+), 169 deletions(-) delete mode 100644 Documentation/git-local-fetch.txt delete mode 100644 Documentation/git-ssh-fetch.txt delete mode 100644 Documentation/git-ssh-upload.txt Junio C Hamano <gitster@pobox.com> wrote Thu, Nov 08, 2007: > Thanks. > > But lost-found is merely deprecated but not removed yet, so I > think it should be kept in the list cmd-list.perl generates. I don't understand why you want to still advertise commands that have been deprecated, but here is a sliced out part of my previous patch, which I hope is acceptible. > We may want a mechanism to mark it deprecated in the list as > well, though. Perhaps ... It might also make sense to put this kind of information in the manpage document header: git-lost-found(1) ================= :Deprecated: Use git-fsck --lost-found instead. And then modify asciidoc.conf to put in a warnings a few places. diff --git a/Documentation/cmd-list.perl b/Documentation/cmd-list.perl index 8d21d42..8a0679a 100755 --- a/Documentation/cmd-list.perl +++ b/Documentation/cmd-list.perl @@ -124,7 +124,6 @@ git-index-pack plumbingmanipulators git-init mainporcelain git-instaweb ancillaryinterrogators gitk mainporcelain -git-local-fetch synchingrepositories git-log mainporcelain git-lost-found ancillarymanipulators git-ls-files plumbinginterrogators @@ -178,8 +177,6 @@ git-show-branch ancillaryinterrogators git-show-index plumbinginterrogators git-show-ref plumbinginterrogators git-sh-setup purehelpers -git-ssh-fetch synchingrepositories -git-ssh-upload synchingrepositories git-stash mainporcelain git-status mainporcelain git-stripspace purehelpers diff --git a/Documentation/git-local-fetch.txt b/Documentation/git-local-fetch.txt deleted file mode 100644 index e830dee..0000000 --- a/Documentation/git-local-fetch.txt +++ /dev/null @@ -1,66 +0,0 @@ -git-local-fetch(1) -================== - -NAME ----- -git-local-fetch - Duplicate another git repository on a local system - - -SYNOPSIS --------- -[verse] -'git-local-fetch' [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] [-l] [-s] [-n] - commit-id path - -DESCRIPTION ------------ -THIS COMMAND IS DEPRECATED. - -Duplicates another git repository on a local system. - -OPTIONS -------- --c:: - Get the commit objects. --t:: - Get trees associated with the commit objects. --a:: - Get all the objects. --v:: - Report what is downloaded. --s:: - Instead of regular file-to-file copying use symbolic links to the objects - in the remote repository. --l:: - Before attempting symlinks (if -s is specified) or file-to-file copying the - remote objects, try to hardlink the remote objects into the local - repository. --n:: - Never attempt to file-to-file copy remote objects. Only useful with - -s or -l command-line options. - --w <filename>:: - Writes the commit-id into the filename under $GIT_DIR/refs/<filename> on - the local end after the transfer is complete. - ---stdin:: - Instead of a commit id on the command line (which is not expected in this - case), 'git-local-fetch' expects lines on stdin in the format - - <commit-id>['\t'<filename-as-in--w>] - ---recover:: - Verify that everything reachable from target is fetched. Used after - an earlier fetch is interrupted. - -Author ------- -Written by Junio C Hamano <junkio@cox.net> - -Documentation --------------- -Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>. - -GIT ---- -Part of the gitlink:git[7] suite diff --git a/Documentation/git-ssh-fetch.txt b/Documentation/git-ssh-fetch.txt deleted file mode 100644 index 8d3e2ff..0000000 --- a/Documentation/git-ssh-fetch.txt +++ /dev/null @@ -1,52 +0,0 @@ -git-ssh-fetch(1) -================ - -NAME ----- -git-ssh-fetch - Fetch from a remote repository over ssh connection - - - -SYNOPSIS --------- -'git-ssh-fetch' [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] commit-id url - -DESCRIPTION ------------ -THIS COMMAND IS DEPRECATED. - -Pulls from a remote repository over ssh connection, invoking -git-ssh-upload on the other end. It functions identically to -git-ssh-upload, aside from which end you run it on. - - -OPTIONS -------- -commit-id:: - Either the hash or the filename under [URL]/refs/ to - pull. - --c:: - Get the commit objects. --t:: - Get trees associated with the commit objects. --a:: - Get all the objects. --v:: - Report what is downloaded. --w:: - Writes the commit-id into the filename under $GIT_DIR/refs/ on - the local end after the transfer is complete. - - -Author ------- -Written by Daniel Barkalow <barkalow@iabervon.org> - -Documentation --------------- -Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>. - -GIT ---- -Part of the gitlink:git[7] suite diff --git a/Documentation/git-ssh-upload.txt b/Documentation/git-ssh-upload.txt deleted file mode 100644 index 5e2ca8d..0000000 --- a/Documentation/git-ssh-upload.txt +++ /dev/null @@ -1,48 +0,0 @@ -git-ssh-upload(1) -================= - -NAME ----- -git-ssh-upload - Push to a remote repository over ssh connection - - -SYNOPSIS --------- -'git-ssh-upload' [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] commit-id url - -DESCRIPTION ------------ -THIS COMMAND IS DEPRECATED. - -Pushes from a remote repository over ssh connection, invoking -git-ssh-fetch on the other end. It functions identically to -git-ssh-fetch, aside from which end you run it on. - -OPTIONS -------- -commit-id:: - Id of commit to push. - --c:: - Get the commit objects. --t:: - Get tree associated with the requested commit object. --a:: - Get all the objects. --v:: - Report what is uploaded. --w:: - Writes the commit-id into the filename under [URL]/refs/ on - the remote end after the transfer is complete. - -Author ------- -Written by Daniel Barkalow <barkalow@iabervon.org> - -Documentation --------------- -Documentation by Daniel Barkalow - -GIT ---- -Part of the gitlink:git[7] suite -- 1.5.3.5.1623.gabaff-dirty -- Jonas Fonseca ^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH 1/3] Documentation: lost-found is now deprecated. 2007-11-09 0:20 ` [PATCH] Remove non-existing commands from git(7) and delete their manpages Jonas Fonseca @ 2007-11-09 1:21 ` Junio C Hamano 2007-11-09 1:27 ` Jonas Fonseca 2007-11-09 1:22 ` [PATCH 3/3] Documentation: remove documentation for removed tools Junio C Hamano 2007-11-09 2:38 ` [PATCH 2/3] Make check-docs target detect removed commands Junio C Hamano 2 siblings, 1 reply; 22+ messages in thread From: Junio C Hamano @ 2007-11-09 1:21 UTC (permalink / raw) To: Jonas Fonseca; +Cc: Andreas Ericsson, Johannes Schindelin, git This makes it possible to mark commands that are deprecated in the command list of the primary manual page git(7), and uses it to mark "git lost-found" as deprecated. Signed-off-by: Junio C Hamano <gitster@pobox.com> --- * Here is what I have been preparing for queuing. Documentation/cmd-list.perl | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/Documentation/cmd-list.perl b/Documentation/cmd-list.perl index 8d21d42..0066064 100755 --- a/Documentation/cmd-list.perl +++ b/Documentation/cmd-list.perl @@ -3,7 +3,8 @@ use File::Compare qw(compare); sub format_one { - my ($out, $name) = @_; + my ($out, $nameattr) = @_; + my ($name, $attr) = @$nameattr; my ($state, $description); $state = 0; open I, '<', "$name.txt" or die "No such file $name.txt"; @@ -26,8 +27,11 @@ sub format_one { die "No description found in $name.txt"; } if (my ($verify_name, $text) = ($description =~ /^($name) - (.*)/)) { - print $out "gitlink:$name\[1\]::\n"; - print $out "\t$text.\n\n"; + print $out "gitlink:$name\[1\]::\n\t"; + if ($attr) { + print $out "($attr) "; + } + print $out "$text.\n\n"; } else { die "Description does not match $name: $description"; @@ -39,8 +43,8 @@ while (<DATA>) { next if /^#/; chomp; - my ($name, $cat) = /^(\S+)\s+(.*)$/; - push @{$cmds{$cat}}, $name; + my ($name, $cat, $attr) = /^(\S+)\s+(.*?)(?:\s+(.*))?$/; + push @{$cmds{$cat}}, [$name, $attr]; } for my $cat (qw(ancillaryinterrogators @@ -126,7 +130,7 @@ git-instaweb ancillaryinterrogators gitk mainporcelain git-local-fetch synchingrepositories git-log mainporcelain -git-lost-found ancillarymanipulators +git-lost-found ancillarymanipulators deprecated git-ls-files plumbinginterrogators git-ls-remote plumbinginterrogators git-ls-tree plumbinginterrogators -- 1.5.3.5.1622.g41d10 ^ permalink raw reply related [flat|nested] 22+ messages in thread
* Re: [PATCH 1/3] Documentation: lost-found is now deprecated. 2007-11-09 1:21 ` [PATCH 1/3] Documentation: lost-found is now deprecated Junio C Hamano @ 2007-11-09 1:27 ` Jonas Fonseca 2007-11-09 1:34 ` Junio C Hamano 0 siblings, 1 reply; 22+ messages in thread From: Jonas Fonseca @ 2007-11-09 1:27 UTC (permalink / raw) To: Junio C Hamano; +Cc: Andreas Ericsson, Johannes Schindelin, git Junio C Hamano <gitster@pobox.com> wrote Thu, Nov 08, 2007: > This makes it possible to mark commands that are deprecated in the > command list of the primary manual page git(7), and uses it to > mark "git lost-found" as deprecated. How about also marking git-tar-tree as deprecated? -- Jonas Fonseca ^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH 1/3] Documentation: lost-found is now deprecated. 2007-11-09 1:27 ` Jonas Fonseca @ 2007-11-09 1:34 ` Junio C Hamano 0 siblings, 0 replies; 22+ messages in thread From: Junio C Hamano @ 2007-11-09 1:34 UTC (permalink / raw) To: Jonas Fonseca; +Cc: Andreas Ericsson, Johannes Schindelin, git Jonas Fonseca <fonseca@diku.dk> writes: > Junio C Hamano <gitster@pobox.com> wrote Thu, Nov 08, 2007: >> This makes it possible to mark commands that are deprecated in the >> command list of the primary manual page git(7), and uses it to >> mark "git lost-found" as deprecated. > > How about also marking git-tar-tree as deprecated? Good eyes -- I missed it from my "git grep DEPRECATED Documentation/" output. Thanks. ^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH 3/3] Documentation: remove documentation for removed tools. 2007-11-09 0:20 ` [PATCH] Remove non-existing commands from git(7) and delete their manpages Jonas Fonseca 2007-11-09 1:21 ` [PATCH 1/3] Documentation: lost-found is now deprecated Junio C Hamano @ 2007-11-09 1:22 ` Junio C Hamano 2007-11-12 0:24 ` [PATCH] Documentation: Fix references to deprecated commands Jonas Fonseca 2007-11-09 2:38 ` [PATCH 2/3] Make check-docs target detect removed commands Junio C Hamano 2 siblings, 1 reply; 22+ messages in thread From: Junio C Hamano @ 2007-11-09 1:22 UTC (permalink / raw) To: Jonas Fonseca; +Cc: Andreas Ericsson, Johannes Schindelin, git Old commit walkers other than http/curl transport have been removed for some time now. Remove their documents. Signed-off-by: Junio C Hamano <gitster@pobox.com> --- Documentation/cmd-list.perl | 3 -- Documentation/git-local-fetch.txt | 66 ------------------------------------- Documentation/git-ssh-fetch.txt | 52 ----------------------------- Documentation/git-ssh-upload.txt | 48 --------------------------- 4 files changed, 0 insertions(+), 169 deletions(-) delete mode 100644 Documentation/git-local-fetch.txt delete mode 100644 Documentation/git-ssh-fetch.txt delete mode 100644 Documentation/git-ssh-upload.txt diff --git a/Documentation/cmd-list.perl b/Documentation/cmd-list.perl index 0066064..964fda3 100755 --- a/Documentation/cmd-list.perl +++ b/Documentation/cmd-list.perl @@ -128,7 +128,6 @@ git-index-pack plumbingmanipulators git-init mainporcelain git-instaweb ancillaryinterrogators gitk mainporcelain -git-local-fetch synchingrepositories git-log mainporcelain git-lost-found ancillarymanipulators deprecated git-ls-files plumbinginterrogators @@ -182,8 +181,6 @@ git-show-branch ancillaryinterrogators git-show-index plumbinginterrogators git-show-ref plumbinginterrogators git-sh-setup purehelpers -git-ssh-fetch synchingrepositories -git-ssh-upload synchingrepositories git-stash mainporcelain git-status mainporcelain git-stripspace purehelpers diff --git a/Documentation/git-local-fetch.txt b/Documentation/git-local-fetch.txt deleted file mode 100644 index e830dee..0000000 --- a/Documentation/git-local-fetch.txt +++ /dev/null @@ -1,66 +0,0 @@ -git-local-fetch(1) -================== - -NAME ----- -git-local-fetch - Duplicate another git repository on a local system - - -SYNOPSIS --------- -[verse] -'git-local-fetch' [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] [-l] [-s] [-n] - commit-id path - -DESCRIPTION ------------ -THIS COMMAND IS DEPRECATED. - -Duplicates another git repository on a local system. - -OPTIONS -------- --c:: - Get the commit objects. --t:: - Get trees associated with the commit objects. --a:: - Get all the objects. --v:: - Report what is downloaded. --s:: - Instead of regular file-to-file copying use symbolic links to the objects - in the remote repository. --l:: - Before attempting symlinks (if -s is specified) or file-to-file copying the - remote objects, try to hardlink the remote objects into the local - repository. --n:: - Never attempt to file-to-file copy remote objects. Only useful with - -s or -l command-line options. - --w <filename>:: - Writes the commit-id into the filename under $GIT_DIR/refs/<filename> on - the local end after the transfer is complete. - ---stdin:: - Instead of a commit id on the command line (which is not expected in this - case), 'git-local-fetch' expects lines on stdin in the format - - <commit-id>['\t'<filename-as-in--w>] - ---recover:: - Verify that everything reachable from target is fetched. Used after - an earlier fetch is interrupted. - -Author ------- -Written by Junio C Hamano <junkio@cox.net> - -Documentation --------------- -Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>. - -GIT ---- -Part of the gitlink:git[7] suite diff --git a/Documentation/git-ssh-fetch.txt b/Documentation/git-ssh-fetch.txt deleted file mode 100644 index 8d3e2ff..0000000 --- a/Documentation/git-ssh-fetch.txt +++ /dev/null @@ -1,52 +0,0 @@ -git-ssh-fetch(1) -================ - -NAME ----- -git-ssh-fetch - Fetch from a remote repository over ssh connection - - - -SYNOPSIS --------- -'git-ssh-fetch' [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] commit-id url - -DESCRIPTION ------------ -THIS COMMAND IS DEPRECATED. - -Pulls from a remote repository over ssh connection, invoking -git-ssh-upload on the other end. It functions identically to -git-ssh-upload, aside from which end you run it on. - - -OPTIONS -------- -commit-id:: - Either the hash or the filename under [URL]/refs/ to - pull. - --c:: - Get the commit objects. --t:: - Get trees associated with the commit objects. --a:: - Get all the objects. --v:: - Report what is downloaded. --w:: - Writes the commit-id into the filename under $GIT_DIR/refs/ on - the local end after the transfer is complete. - - -Author ------- -Written by Daniel Barkalow <barkalow@iabervon.org> - -Documentation --------------- -Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>. - -GIT ---- -Part of the gitlink:git[7] suite diff --git a/Documentation/git-ssh-upload.txt b/Documentation/git-ssh-upload.txt deleted file mode 100644 index 5e2ca8d..0000000 --- a/Documentation/git-ssh-upload.txt +++ /dev/null @@ -1,48 +0,0 @@ -git-ssh-upload(1) -================= - -NAME ----- -git-ssh-upload - Push to a remote repository over ssh connection - - -SYNOPSIS --------- -'git-ssh-upload' [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] commit-id url - -DESCRIPTION ------------ -THIS COMMAND IS DEPRECATED. - -Pushes from a remote repository over ssh connection, invoking -git-ssh-fetch on the other end. It functions identically to -git-ssh-fetch, aside from which end you run it on. - -OPTIONS -------- -commit-id:: - Id of commit to push. - --c:: - Get the commit objects. --t:: - Get tree associated with the requested commit object. --a:: - Get all the objects. --v:: - Report what is uploaded. --w:: - Writes the commit-id into the filename under [URL]/refs/ on - the remote end after the transfer is complete. - -Author ------- -Written by Daniel Barkalow <barkalow@iabervon.org> - -Documentation --------------- -Documentation by Daniel Barkalow - -GIT ---- -Part of the gitlink:git[7] suite -- 1.5.3.5.1622.g41d10 ^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH] Documentation: Fix references to deprecated commands 2007-11-09 1:22 ` [PATCH 3/3] Documentation: remove documentation for removed tools Junio C Hamano @ 2007-11-12 0:24 ` Jonas Fonseca 2007-11-12 0:32 ` Jonas Fonseca 0 siblings, 1 reply; 22+ messages in thread From: Jonas Fonseca @ 2007-11-12 0:24 UTC (permalink / raw) To: Junio C Hamano; +Cc: Andreas Ericsson, Johannes Schindelin, git ... by changing git-tar-tree reference to git-archive and removing seemingly unrelevant footnote about git-ssh-{fetch,upload}. --- Documentation/core-tutorial.txt | 5 ----- Documentation/git-get-tar-commit-id.txt | 4 ++-- 2 files changed, 2 insertions(+), 7 deletions(-) Maybe also fixing these references would be in order. diff --git a/Documentation/core-tutorial.txt b/Documentation/core-tutorial.txt index ebd2492..401d1de 100644 --- a/Documentation/core-tutorial.txt +++ b/Documentation/core-tutorial.txt @@ -1090,11 +1090,6 @@ server like git Native transport does. Any stock HTTP server that does not even support directory index would suffice. But you must prepare your repository with `git-update-server-info` to help dumb transport downloaders. -+ -There are (confusingly enough) `git-ssh-fetch` and `git-ssh-upload` -programs, which are 'commit walkers'; they outlived their -usefulness when git Native and SSH transports were introduced, -and are not used by `git pull` or `git push` scripts. Once you fetch from the remote repository, you `merge` that with your current branch. diff --git a/Documentation/git-get-tar-commit-id.txt b/Documentation/git-get-tar-commit-id.txt index 9b5f86f..ef1b19c 100644 --- a/Documentation/git-get-tar-commit-id.txt +++ b/Documentation/git-get-tar-commit-id.txt @@ -14,12 +14,12 @@ SYNOPSIS DESCRIPTION ----------- Acts as a filter, extracting the commit ID stored in archives created by -git-tar-tree. It reads only the first 1024 bytes of input, thus its +gitlink:git-archive[1]. It reads only the first 1024 bytes of input, thus its runtime is not influenced by the size of <tarfile> very much. If no commit ID is found, git-get-tar-commit-id quietly exists with a return code of 1. This can happen if <tarfile> had not been created -using git-tar-tree or if the first parameter of git-tar-tree had been +using git-archive or if the first parameter of git-tar-tree had been a tree ID instead of a commit ID or tag. -- Jonas Fonseca ^ permalink raw reply related [flat|nested] 22+ messages in thread
* Re: [PATCH] Documentation: Fix references to deprecated commands 2007-11-12 0:24 ` [PATCH] Documentation: Fix references to deprecated commands Jonas Fonseca @ 2007-11-12 0:32 ` Jonas Fonseca 2007-11-12 8:22 ` Junio C Hamano 2007-11-19 1:54 ` J. Bruce Fields 0 siblings, 2 replies; 22+ messages in thread From: Jonas Fonseca @ 2007-11-12 0:32 UTC (permalink / raw) To: Junio C Hamano; +Cc: Andreas Ericsson, Johannes Schindelin, git Subject: [PATCH] Documentation: Fix references to deprecated commands ... by changing git-tar-tree reference to git-archive and removing seemingly unrelevant footnote about git-ssh-{fetch,upload}. Signed-off-by: Jonas Fonseca <fonseca@diku.dk> --- Documentation/core-tutorial.txt | 5 ----- Documentation/git-get-tar-commit-id.txt | 4 ++-- 2 files changed, 2 insertions(+), 7 deletions(-) Now with SOB and ... Jonas Fonseca <fonseca@diku.dk> wrote Mon, Nov 12, 2007: > diff --git a/Documentation/git-get-tar-commit-id.txt b/Documentation/git-get-tar-commit-id.txt > index 9b5f86f..ef1b19c 100644 > --- a/Documentation/git-get-tar-commit-id.txt > +++ b/Documentation/git-get-tar-commit-id.txt > @@ -14,12 +14,12 @@ SYNOPSIS > return code of 1. This can happen if <tarfile> had not been created > -using git-tar-tree or if the first parameter of git-tar-tree had been > +using git-archive or if the first parameter of git-tar-tree had been > a tree ID instead of a commit ID or tag. ... s//g diff --git a/Documentation/core-tutorial.txt b/Documentation/core-tutorial.txt index ebd2492..401d1de 100644 --- a/Documentation/core-tutorial.txt +++ b/Documentation/core-tutorial.txt @@ -1090,11 +1090,6 @@ server like git Native transport does. Any stock HTTP server that does not even support directory index would suffice. But you must prepare your repository with `git-update-server-info` to help dumb transport downloaders. -+ -There are (confusingly enough) `git-ssh-fetch` and `git-ssh-upload` -programs, which are 'commit walkers'; they outlived their -usefulness when git Native and SSH transports were introduced, -and are not used by `git pull` or `git push` scripts. Once you fetch from the remote repository, you `merge` that with your current branch. diff --git a/Documentation/git-get-tar-commit-id.txt b/Documentation/git-get-tar-commit-id.txt index 9b5f86f..ef1b19c 100644 --- a/Documentation/git-get-tar-commit-id.txt +++ b/Documentation/git-get-tar-commit-id.txt @@ -14,12 +14,12 @@ SYNOPSIS DESCRIPTION ----------- Acts as a filter, extracting the commit ID stored in archives created by -git-tar-tree. It reads only the first 1024 bytes of input, thus its +gitlink:git-archive[1]. It reads only the first 1024 bytes of input, thus its runtime is not influenced by the size of <tarfile> very much. If no commit ID is found, git-get-tar-commit-id quietly exists with a return code of 1. This can happen if <tarfile> had not been created -using git-tar-tree or if the first parameter of git-tar-tree had been +using git-archive or if the <treeish> parameter of git-archive had been a tree ID instead of a commit ID or tag. -- Jonas Fonseca ^ permalink raw reply related [flat|nested] 22+ messages in thread
* Re: [PATCH] Documentation: Fix references to deprecated commands 2007-11-12 0:32 ` Jonas Fonseca @ 2007-11-12 8:22 ` Junio C Hamano 2007-11-12 9:37 ` Jonas Fonseca 2007-11-19 1:54 ` J. Bruce Fields 1 sibling, 1 reply; 22+ messages in thread From: Junio C Hamano @ 2007-11-12 8:22 UTC (permalink / raw) To: Jonas Fonseca; +Cc: Andreas Ericsson, Johannes Schindelin, git Jonas Fonseca <fonseca@diku.dk> writes: > diff --git a/Documentation/git-get-tar-commit-id.txt b/Documentation/git-get-tar-commit-id.txt > index 9b5f86f..ef1b19c 100644 > --- a/Documentation/git-get-tar-commit-id.txt > +++ b/Documentation/git-get-tar-commit-id.txt > @@ -14,12 +14,12 @@ SYNOPSIS > DESCRIPTION > ----------- > Acts as a filter, extracting the commit ID stored in archives created by > -git-tar-tree. It reads only the first 1024 bytes of input, thus its > +gitlink:git-archive[1]. It reads only the first 1024 bytes of input, thus its > runtime is not influenced by the size of <tarfile> very much. > > If no commit ID is found, git-get-tar-commit-id quietly exists with a > return code of 1. This can happen if <tarfile> had not been created > -using git-tar-tree or if the first parameter of git-tar-tree had been > +using git-archive or if the <treeish> parameter of git-archive had been > a tree ID instead of a commit ID or tag. > > -- > Jonas Fonseca How did you prepare this hunk? I count 10 lines preimage and postimage, followed by a blank line and the signature separator "-- " you added in your MUA, but the header claims to have 12 lines. ^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH] Documentation: Fix references to deprecated commands 2007-11-12 8:22 ` Junio C Hamano @ 2007-11-12 9:37 ` Jonas Fonseca 0 siblings, 0 replies; 22+ messages in thread From: Jonas Fonseca @ 2007-11-12 9:37 UTC (permalink / raw) To: Junio C Hamano; +Cc: Andreas Ericsson, Johannes Schindelin, git Junio C Hamano <gitster@pobox.com> wrote Mon, Nov 12, 2007: > Jonas Fonseca <fonseca@diku.dk> writes: > > > diff --git a/Documentation/git-get-tar-commit-id.txt b/Documentation/git-get-tar-commit-id.txt > > index 9b5f86f..ef1b19c 100644 > > --- a/Documentation/git-get-tar-commit-id.txt > > +++ b/Documentation/git-get-tar-commit-id.txt > > @@ -14,12 +14,12 @@ SYNOPSIS > > DESCRIPTION > > ----------- > > Acts as a filter, extracting the commit ID stored in archives created by > > -git-tar-tree. It reads only the first 1024 bytes of input, thus its > > +gitlink:git-archive[1]. It reads only the first 1024 bytes of input, thus its > > runtime is not influenced by the size of <tarfile> very much. > > > > If no commit ID is found, git-get-tar-commit-id quietly exists with a > > return code of 1. This can happen if <tarfile> had not been created > > -using git-tar-tree or if the first parameter of git-tar-tree had been > > +using git-archive or if the <treeish> parameter of git-archive had been > > a tree ID instead of a commit ID or tag. > > > > -- > > Jonas Fonseca > > How did you prepare this hunk? I count 10 lines preimage and > postimage, followed by a blank line and the signature separator > "-- " you added in your MUA, but the header claims to have 12 > lines. I am sorry to cause you this kind of problems. Usually I keep the patch ending inserted by format-patch, but yesterday I deleted it for some unknown reason. Maybe I should learn to use git-send-email. -- Jonas Fonseca ^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH] Documentation: Fix references to deprecated commands 2007-11-12 0:32 ` Jonas Fonseca 2007-11-12 8:22 ` Junio C Hamano @ 2007-11-19 1:54 ` J. Bruce Fields 2007-11-19 7:44 ` Jonas Fonseca 1 sibling, 1 reply; 22+ messages in thread From: J. Bruce Fields @ 2007-11-19 1:54 UTC (permalink / raw) To: Jonas Fonseca; +Cc: Junio C Hamano, Andreas Ericsson, Johannes Schindelin, git On Mon, Nov 12, 2007 at 01:32:51AM +0100, Jonas Fonseca wrote: > Subject: [PATCH] Documentation: Fix references to deprecated commands > > ... by changing git-tar-tree reference to git-archive and removing > seemingly unrelevant footnote about git-ssh-{fetch,upload}. Makes sense to me, but for some reason git-am complains about a corrupt patch when I feed it this email. I reconstructed it by hand, fixed up one more reference to git-tar-tree, and applied to my tree. --b. > > Signed-off-by: Jonas Fonseca <fonseca@diku.dk> > --- > Documentation/core-tutorial.txt | 5 ----- > Documentation/git-get-tar-commit-id.txt | 4 ++-- > 2 files changed, 2 insertions(+), 7 deletions(-) > > Now with SOB and ... > > Jonas Fonseca <fonseca@diku.dk> wrote Mon, Nov 12, 2007: > > diff --git a/Documentation/git-get-tar-commit-id.txt b/Documentation/git-get-tar-commit-id.txt > > index 9b5f86f..ef1b19c 100644 > > --- a/Documentation/git-get-tar-commit-id.txt > > +++ b/Documentation/git-get-tar-commit-id.txt > > @@ -14,12 +14,12 @@ SYNOPSIS > > return code of 1. This can happen if <tarfile> had not been created > > -using git-tar-tree or if the first parameter of git-tar-tree had been > > +using git-archive or if the first parameter of git-tar-tree had been > > a tree ID instead of a commit ID or tag. > > ... s//g > > diff --git a/Documentation/core-tutorial.txt b/Documentation/core-tutorial.txt > index ebd2492..401d1de 100644 > --- a/Documentation/core-tutorial.txt > +++ b/Documentation/core-tutorial.txt > @@ -1090,11 +1090,6 @@ server like git Native transport does. Any stock HTTP server > that does not even support directory index would suffice. But > you must prepare your repository with `git-update-server-info` > to help dumb transport downloaders. > -+ > -There are (confusingly enough) `git-ssh-fetch` and `git-ssh-upload` > -programs, which are 'commit walkers'; they outlived their > -usefulness when git Native and SSH transports were introduced, > -and are not used by `git pull` or `git push` scripts. > > Once you fetch from the remote repository, you `merge` that > with your current branch. > diff --git a/Documentation/git-get-tar-commit-id.txt b/Documentation/git-get-tar-commit-id.txt > index 9b5f86f..ef1b19c 100644 > --- a/Documentation/git-get-tar-commit-id.txt > +++ b/Documentation/git-get-tar-commit-id.txt > @@ -14,12 +14,12 @@ SYNOPSIS > DESCRIPTION > ----------- > Acts as a filter, extracting the commit ID stored in archives created by > -git-tar-tree. It reads only the first 1024 bytes of input, thus its > +gitlink:git-archive[1]. It reads only the first 1024 bytes of input, thus its > runtime is not influenced by the size of <tarfile> very much. > > If no commit ID is found, git-get-tar-commit-id quietly exists with a > return code of 1. This can happen if <tarfile> had not been created > -using git-tar-tree or if the first parameter of git-tar-tree had been > +using git-archive or if the <treeish> parameter of git-archive had been > a tree ID instead of a commit ID or tag. > > -- > Jonas Fonseca > - > To unsubscribe from this list: send the line "unsubscribe git" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH] Documentation: Fix references to deprecated commands 2007-11-19 1:54 ` J. Bruce Fields @ 2007-11-19 7:44 ` Jonas Fonseca 0 siblings, 0 replies; 22+ messages in thread From: Jonas Fonseca @ 2007-11-19 7:44 UTC (permalink / raw) To: J. Bruce Fields Cc: Junio C Hamano, Andreas Ericsson, Johannes Schindelin, git J. Bruce Fields <bfields@fieldses.org> wrote Sun, Nov 18, 2007: > On Mon, Nov 12, 2007 at 01:32:51AM +0100, Jonas Fonseca wrote: > > Subject: [PATCH] Documentation: Fix references to deprecated commands > > > > ... by changing git-tar-tree reference to git-archive and removing > > seemingly unrelevant footnote about git-ssh-{fetch,upload}. > > Makes sense to me, but for some reason git-am complains about a corrupt > patch when I feed it this email. I reconstructed it by hand, fixed up > one more reference to git-tar-tree, and applied to my tree. It should have been merged in a4e57e75c95c66c32da6b106313bc847110794ba. And yes, as Junio also pointed out, I deleted some context lines at the end of the patch. -- Jonas Fonseca ^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH 2/3] Make check-docs target detect removed commands 2007-11-09 0:20 ` [PATCH] Remove non-existing commands from git(7) and delete their manpages Jonas Fonseca 2007-11-09 1:21 ` [PATCH 1/3] Documentation: lost-found is now deprecated Junio C Hamano 2007-11-09 1:22 ` [PATCH 3/3] Documentation: remove documentation for removed tools Junio C Hamano @ 2007-11-09 2:38 ` Junio C Hamano 2 siblings, 0 replies; 22+ messages in thread From: Junio C Hamano @ 2007-11-09 2:38 UTC (permalink / raw) To: Jonas Fonseca; +Cc: Andreas Ericsson, Johannes Schindelin, git The maintainer should remember running "make check-docs" from time to time. Signed-off-by: Junio C Hamano <gitster@pobox.com> --- Makefile | 30 +++++++++++++++++++++++++++--- 1 files changed, 27 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 0d5590f..d5445ea 100644 --- a/Makefile +++ b/Makefile @@ -1125,12 +1125,13 @@ endif ### Check documentation # check-docs:: - @for v in $(ALL_PROGRAMS) $(BUILT_INS) git$X gitk; \ + @(for v in $(ALL_PROGRAMS) $(BUILT_INS) git gitk; \ do \ case "$$v" in \ git-merge-octopus | git-merge-ours | git-merge-recursive | \ - git-merge-resolve | git-merge-stupid | \ + git-merge-resolve | git-merge-stupid | git-merge-subtree | \ git-add--interactive | git-fsck-objects | git-init-db | \ + git-rebase--interactive | \ git-repo-config | git-fetch--tool ) continue ;; \ esac ; \ test -f "Documentation/$$v.txt" || \ @@ -1141,7 +1142,30 @@ check-docs:: git) ;; \ *) echo "no link: $$v";; \ esac ; \ - done | sort + done; \ + ( \ + sed -e '1,/^__DATA__/d' \ + -e 's/[ ].*//' \ + -e 's/^/listed /' Documentation/cmd-list.perl; \ + ls -1 Documentation/git*txt | \ + sed -e 's|Documentation/|documented |' \ + -e 's/\.txt//'; \ + ) | while read how cmd; \ + do \ + case "$$how,$$cmd" in \ + *,git-citool | \ + *,git-gui | \ + documented,gitattributes | \ + documented,gitignore | \ + documented,gitmodules | \ + documented,git-tools | \ + sentinel,not,matching,is,ok ) continue ;; \ + esac; \ + case " $(ALL_PROGRAMS) $(BUILT_INS) git gitk " in \ + *" $$cmd "*) ;; \ + *) echo "removed but $$how: $$cmd" ;; \ + esac; \ + done ) | sort ### Make sure built-ins do not have dups and listed in git.c # -- 1.5.3.5.1622.g41d10 ^ permalink raw reply related [flat|nested] 22+ messages in thread
* Re: [PATCH] Remove deprecated commands from command list and update manpages 2007-11-08 14:54 ` [PATCH] Remove deprecated commands from command list and update manpages Jonas Fonseca 2007-11-08 15:00 ` Andreas Ericsson @ 2007-11-08 15:18 ` Johannes Schindelin 2007-11-08 15:19 ` Johannes Schindelin 1 sibling, 1 reply; 22+ messages in thread From: Johannes Schindelin @ 2007-11-08 15:18 UTC (permalink / raw) To: Jonas Fonseca; +Cc: Junio C Hamano, git Hi, On Thu, 8 Nov 2007, Jonas Fonseca wrote: > ... and remove manpages of commands that no longer exists. > > Signed-off-by: Jonas Fonseca <fonseca@diku.dk> > --- > Documentation/cmd-list.perl | 5 --- Maybe keep git-lost-found? > Documentation/git-local-fetch.txt | 66 ------------------------------------- > Documentation/git-ssh-fetch.txt | 52 ----------------------------- > Documentation/git-ssh-upload.txt | 48 --------------------------- > Documentation/git-tar-tree.txt | 2 +- > Documentation/git-var.txt | 3 +- Last time I checked, git-var was still alive. Ciao, Dscho ^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH] Remove deprecated commands from command list and update manpages 2007-11-08 15:18 ` [PATCH] Remove deprecated commands from command list and update manpages Johannes Schindelin @ 2007-11-08 15:19 ` Johannes Schindelin 0 siblings, 0 replies; 22+ messages in thread From: Johannes Schindelin @ 2007-11-08 15:19 UTC (permalink / raw) To: Jonas Fonseca; +Cc: Junio C Hamano, git Hi, On Thu, 8 Nov 2007, Johannes Schindelin wrote: > On Thu, 8 Nov 2007, Jonas Fonseca wrote: > > > ... and remove manpages of commands that no longer exists. > > > > Signed-off-by: Jonas Fonseca <fonseca@diku.dk> > > --- > > Documentation/cmd-list.perl | 5 --- > > Maybe keep git-lost-found? > > > Documentation/git-local-fetch.txt | 66 ------------------------------------- > > Documentation/git-ssh-fetch.txt | 52 ----------------------------- > > Documentation/git-ssh-upload.txt | 48 --------------------------- > > Documentation/git-tar-tree.txt | 2 +- > > Documentation/git-var.txt | 3 +- > > Last time I checked, git-var was still alive. Oops. Please ignore that one. Ciao, Dscho ^ permalink raw reply [flat|nested] 22+ messages in thread
end of thread, other threads:[~2007-11-19 7:44 UTC | newest] Thread overview: 22+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2007-11-07 22:54 [PATCH] Deprecate git-lost-found Johannes Schindelin 2007-11-08 0:19 ` Junio C Hamano 2007-11-08 0:37 ` Johannes Schindelin 2007-11-08 0:41 ` [PATCH v2] " Johannes Schindelin 2007-11-08 14:54 ` [PATCH] Remove deprecated commands from command list and update manpages Jonas Fonseca 2007-11-08 15:00 ` Andreas Ericsson 2007-11-08 16:01 ` [PATCH] Drop deprecated commands from git(7) and update deprecation notices Jonas Fonseca 2007-11-08 21:01 ` Junio C Hamano 2007-11-09 0:20 ` [PATCH] Remove non-existing commands from git(7) and delete their manpages Jonas Fonseca 2007-11-09 1:21 ` [PATCH 1/3] Documentation: lost-found is now deprecated Junio C Hamano 2007-11-09 1:27 ` Jonas Fonseca 2007-11-09 1:34 ` Junio C Hamano 2007-11-09 1:22 ` [PATCH 3/3] Documentation: remove documentation for removed tools Junio C Hamano 2007-11-12 0:24 ` [PATCH] Documentation: Fix references to deprecated commands Jonas Fonseca 2007-11-12 0:32 ` Jonas Fonseca 2007-11-12 8:22 ` Junio C Hamano 2007-11-12 9:37 ` Jonas Fonseca 2007-11-19 1:54 ` J. Bruce Fields 2007-11-19 7:44 ` Jonas Fonseca 2007-11-09 2:38 ` [PATCH 2/3] Make check-docs target detect removed commands Junio C Hamano 2007-11-08 15:18 ` [PATCH] Remove deprecated commands from command list and update manpages Johannes Schindelin 2007-11-08 15:19 ` Johannes Schindelin
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).