git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Petr Baudis <pasky@suse.cz>
To: Matthieu Moy <Matthieu.Moy@imag.fr>
Cc: gitster@pobox.com, git@vger.kernel.org
Subject: Re: [PATCH] Mention the fact that 'git annotate' is only for backward compatibility.
Date: Thu, 4 Sep 2008 14:30:47 +0200	[thread overview]
Message-ID: <20080904123046.GX10544@machine.or.cz> (raw)
In-Reply-To: <1220529652-24050-1-git-send-email-Matthieu.Moy@imag.fr>

On Thu, Sep 04, 2008 at 02:00:52PM +0200, Matthieu Moy wrote:
> 
> Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
> ---
>  Documentation/git-annotate.txt |    3 +++
>  1 files changed, 3 insertions(+), 0 deletions(-)
> 
> diff --git a/Documentation/git-annotate.txt b/Documentation/git-annotate.txt
> index 8b6b56a..6e05825 100644
> --- a/Documentation/git-annotate.txt
> +++ b/Documentation/git-annotate.txt
> @@ -14,6 +14,9 @@ DESCRIPTION
>  Annotates each line in the given file with information from the commit
>  which introduced the line. Optionally annotate from a given revision.
>  
> +This command exists for backward compatibility. For regular use, you
> +should use linkgit:git-blame[1] instead.
> +
>  OPTIONS
>  -------
>  include::blame-options.txt[]

Can you please also mark it deprecated in the bash completion and
command-list.txt?

Will we still keep it around indefinitely or do we have any phase-out
plan? If the latter, we should also start printing warning when
executing it.

I'm also curious about

                if (suspect->commit->object.flags & UNINTERESTING) {
                        if (blank_boundary)
                                memset(hex, ' ', length);
                        else if (!cmd_is_annotate) {
                                length--;
                                putchar('^');
                        }
                }

in builtin-blame.c. Junio, you introduced this in e68989a739d - why
do you use a separate flag instead of OUTPUT_ANNOTATE_COMPAT? The fact
that git annotate == git blame -c does not hold true because of this
(admittedly obscure case).

-- 
				Petr "Pasky" Baudis
The next generation of interesting software will be done
on the Macintosh, not the IBM PC.  -- Bill Gates

  reply	other threads:[~2008-09-04 12:32 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-09-03 16:43 blame vs annotate? Jonathan del Strother
2008-09-03 17:49 ` Miklos Vajna
2008-09-03 17:54   ` Petr Baudis
2008-09-03 18:10 ` Junio C Hamano
2008-09-04  9:09   ` Matthieu Moy
2008-09-04  9:16     ` Sverre Rabbelier
2008-09-04 12:00       ` [PATCH] Mention the fact that 'git annotate' is only for backward compatibility Matthieu Moy
2008-09-04 12:30         ` Petr Baudis [this message]
2008-09-04 13:03           ` Matthieu Moy
2008-09-04 19:12           ` Junio C Hamano
2008-09-04 19:17           ` Junio C Hamano
2008-09-05  6:31             ` Matthieu Moy
2008-09-05  7:29               ` Junio C Hamano
2008-09-05  8:07                 ` Petr Baudis
2008-09-05 12:06                   ` Matthieu Moy
2008-09-05  7:56           ` Junio C Hamano
2008-09-03 18:11 ` blame vs annotate? Jakub Narebski

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20080904123046.GX10544@machine.or.cz \
    --to=pasky@suse.cz \
    --cc=Matthieu.Moy@imag.fr \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).