Deprecate git-lost-found
Subsystems (2)
PATCH 1/1 Deprecate git-lost-found
"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".
---
Maybe we can remove it in another 5 months...
git-lost-found.sh | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
git-lost-found.sh +2 -0
@@ -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
Signature · 1 line
1.5.3.5.1597.g7191
Makes sort of sense. Add deprecation notice to Documentation/ as well, please.
Hi,
Quoted 2 lines · Junio C Hamano
Makes sort of sense. Add deprecation notice to
Documentation/as well, please.
Of course. Will resend in a minute.
Ciao,
Dscho
PATCH v2 1/1 Deprecate git-lost-found
In reply to Junio C Hamano"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".
--- 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(-)
Documentation/RelNotes-1.5.4.txt +3 -0
@@ -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 ------------------
Documentation/git-lost-found.txt +4 -0
@@ -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,
git-lost-found.sh +2 -0
@@ -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
Signature · 1 line
1.5.3.5.1597.g7191
PATCH 1/1 Remove deprecated commands from command list and update manpages
... and remove manpages of commands that no longer exists.
--- 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.
Documentation/cmd-list.perl +0 -5
@@ -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
Documentation/git-local-fetch.txt deleted +0 -66
66 lines not on this page · raw message
Documentation/git-ssh-fetch.txt deleted +0 -52
52 lines not on this page · raw message
Documentation/git-ssh-upload.txt deleted +0 -48
48 lines not on this page · raw message
Documentation/git-tar-tree.txt +1 -1
@@ -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.
Documentation/git-var.txt +2 -1
@@ -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 --------
Signature · 4 lines
1.5.3.5.1623.g4aab495-dirty -- Jonas Fonseca
Re: [PATCH] Remove deprecated commands from command list and update manpages
Quoted 7 lines · Jonas Fonseca
... and remove manpages of commands that no longer exists.
Documentation/git-var.txt +0
-0
Documentation/git-var.txt OPTIONS · line 25
Quoted 7 lines
Documentation/git-var.txt +2
-1@@ -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.
Signature · 3 lines
Andreas Ericsson [email protected] OP5 AB www.op5.se Tel: +46 8-230225 Fax: +46 8-230231
PATCH 1/1 Drop deprecated commands from git(7) and update deprecation notices
Also remove manpages of commands that no longer exist.
--- 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 <[email protected]> wrote Thu, Nov 08, 2007:
Quoted 17 lines
Quoted 7 lines · Jonas Fonseca
... and remove manpages of commands that no longer exists.
Documentation/git-var.txt +0
-0Documentation/git-var.txt OPTIONS · line 25
Quoted 7 lines
Documentation/git-var.txt +2
-1@@ -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).
Documentation/cmd-list.perl +0 -5
@@ -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
Documentation/git-local-fetch.txt deleted +0 -66
66 lines not on this page · raw message
Documentation/git-ssh-fetch.txt deleted +0 -52
52 lines not on this page · raw message
Documentation/git-ssh-upload.txt deleted +0 -48
48 lines not on this page · raw message
Documentation/git-tar-tree.txt +1 -1
@@ -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.
Documentation/git-var.txt +3 -2
@@ -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 --------
Signature · 4 lines
1.5.3.5.1622.g41d10 -- Jonas Fonseca
Re: [PATCH] Drop deprecated commands from git(7) and update deprecation notices
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(-)
Documentation/cmd-list.perl +10 -6
@@ -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
PATCH 1/1 Remove non-existing commands from git(7) and delete their manpages
--- 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 <[email protected]> wrote Thu, Nov 08, 2007:
Quoted 4 lines
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.
Quoted 2 lines
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.
Documentation/cmd-list.perl +0 -3
@@ -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
Documentation/git-local-fetch.txt deleted +0 -66
66 lines not on this page · raw message
Documentation/git-ssh-fetch.txt deleted +0 -52
52 lines not on this page · raw message
Documentation/git-ssh-upload.txt deleted +0 -48
48 lines not on this page · raw message
Signature · 4 lines
1.5.3.5.1623.gabaff-dirty -- Jonas Fonseca
PATCH 1/3 Documentation: lost-found is now deprecated.
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.
---
* Here is what I have been preparing for queuing.
Documentation/cmd-list.perl | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-)
Documentation/cmd-list.perl +10 -6
@@ -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
Signature · 1 line
1.5.3.5.1622.g41d10
Re: [PATCH 1/3] Documentation: lost-found is now deprecated.
Junio C Hamano <[email protected]> wrote Thu, Nov 08, 2007:
Quoted 3 lines
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?
Signature · 1 line
Jonas Fonseca
Re: [PATCH 1/3] Documentation: lost-found is now deprecated.
Quoted 6 lines · Jonas Fonseca
Junio C Hamano <[email protected]> wrote Thu, Nov 08, 2007:
Quoted 3 lines
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.
PATCH 2/3 Make check-docs target detect removed commands
In reply to Jonas FonsecaThe maintainer should remember running "make check-docs" from time to time.
--- Makefile | 30 +++++++++++++++++++++++++++--- 1 files changed, 27 insertions(+), 3 deletions(-)
Makefile +27 -3
@@ -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 #
Signature · 1 line
1.5.3.5.1622.g41d10
PATCH 3/3 Documentation: remove documentation for removed tools.
In reply to Jonas FonsecaOld commit walkers other than http/curl transport have been removed for some time now. Remove their documents.
--- 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
Documentation/cmd-list.perl +0 -3
@@ -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
Documentation/git-local-fetch.txt deleted +0 -66
66 lines not on this page · raw message
Documentation/git-ssh-fetch.txt deleted +0 -52
52 lines not on this page · raw message
Documentation/git-ssh-upload.txt deleted +0 -48
48 lines not on this page · raw message
Signature · 1 line
1.5.3.5.1622.g41d10
PATCH 1/1 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}.
--- 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.
Documentation/core-tutorial.txt +0 -5
@@ -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.
Documentation/git-get-tar-commit-id.txt +2 -3
@@ -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
Re: [PATCH] Documentation: Fix references to deprecated commands
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}.
--- 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 <[email protected]> wrote Mon, Nov 12, 2007:
Documentation/git-get-tar-commit-id.txt SYNOPSIS · line 16
Quoted 9 lines
Documentation/git-get-tar-commit-id.txt +1
-1@@ -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
Documentation/core-tutorial.txt +0 -5
@@ -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.
Documentation/git-get-tar-commit-id.txt +2 -3
@@ -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
Re: [PATCH] Documentation: Fix references to deprecated commands
Quoted 19 lines · Jonas Fonseca
Documentation/git-get-tar-commit-id.txt +2
-3@@ -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. --
Quoted 1 line
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.
Re: [PATCH] Documentation: Fix references to deprecated commands
Junio C Hamano <[email protected]> wrote Mon, Nov 12, 2007:
Quoted 20 lines
Quoted 18 lines · Jonas Fonseca
Documentation/git-get-tar-commit-id.txt +2
-2@@ -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.
Quoted 7 lines
Quoted 2 lines
Documentation/git-get-tar-commit-id.txt +0
-1--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.
Signature · 1 line
Jonas Fonseca
Re: [PATCH] Documentation: Fix references to deprecated commands
In reply to Jonas FonsecaQuoted 4 lines · Jonas Fonseca
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.
Quoted 62 lines
Signed-off-by Jonas Fonseca <[email protected]>--- 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 <[email protected]> wrote Mon, Nov 12, 2007:
Documentation/git-get-tar-commit-id.txt SYNOPSIS · line 16
Quoted 9 lines
Documentation/git-get-tar-commit-id.txt +1
-1@@ -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
Documentation/core-tutorial.txt +0
-5@@ -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.Documentation/git-get-tar-commit-id.txt +2
-3@@ -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 [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] Documentation: Fix references to deprecated commands
J. Bruce Fields <[email protected]> wrote Sun, Nov 18, 2007:
Quoted 9 lines · Jonas Fonseca
Quoted 4 lines
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.
Signature · 1 line
Jonas Fonseca
Re: [PATCH] Remove deprecated commands from command list and update manpages
In reply to Jonas FonsecaHi,
Quoted 5 lines · Jonas Fonseca
... and remove manpages of commands that no longer exists.
Signed-off-by Jonas Fonseca <[email protected]>--- Documentation/cmd-list.perl | 5 ---
Maybe keep git-lost-found?
Quoted 5 lines
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
Re: [PATCH] Remove deprecated commands from command list and update manpages
Hi,
Quoted 10 lines · Johannes Schindelin
Quoted 5 lines · Jonas Fonseca
... and remove manpages of commands that no longer exists.
Signed-off-by Jonas Fonseca <[email protected]>--- Documentation/cmd-list.perl | 5 ---Maybe keep git-lost-found?
Quoted 7 lines
Quoted 5 lines
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