Subject: Re: [PATCH] Documentation: Fix references to deprecated commands

From: "J. Bruce Fields" <[email-masked]>
Date: Sun, 18 Nov 2007 20:54:11 -0500

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 <[email-masked]>
> ---
>  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-masked]> 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 [email-masked]
> More majordomo info at  http://vger.kernel.org/majordomo-info.html