git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: "Abimbola via GitGitGadget" <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org, Abimbola Olaitan <craftwordltd@gmail.com>
Subject: Re: [PATCH 5/5] fix unproper comment in Makefile
Date: Mon, 04 Nov 2019 13:13:59 +0900	[thread overview]
Message-ID: <xmqqtv7kz3aw.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <58035fc61390d42bc97697de54d44f328f110acd.1572753114.git.gitgitgadget@gmail.com> (Abimbola via GitGitGadget's message of "Sun, 03 Nov 2019 03:51:54 +0000")

"Abimbola via GitGitGadget" <gitgitgadget@gmail.com> writes:

> From: Abimbola <craftwordltd@gmail.com>
>
> Signed-off-by: Abimbola <craftwordltd@gmail.com>
> ---
>  Makefile | 1 -
>  1 file changed, 1 deletion(-)
>
> diff --git a/Makefile b/Makefile
> index a632505ad9..41f0fcb78f 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -1033,7 +1033,6 @@ LIB_OBJS += zlib.o
>  
>  BUILTIN_OBJS += builtin/add.o
>  BUILTIN_OBJS += builtin/am.o
> -// BUILTIN_OBJS += builtin/annotate.o
>  BUILTIN_OBJS += builtin/apply.o
>  BUILTIN_OBJS += builtin/archive.o
>  BUILTIN_OBJS += builtin/bisect--helper.o

If you are ever going to reroll this topic, please clean up your
series before sending it out.  3/5 introduced a bogus line this step
removes; it should have used the right comment char "#" instead, or
better yet, just drop both.  

Find where you are doing "oops, the change done in the previous step
was wrong, and here is a commit to bring it into the right state"
and learn to use "rebase -i" to eliminate such a "oops, another band
aid on top"; it is a useful skill.

Having said that, if the topic is only to remove builtin/annotate.c,
I would expect that it would be a single patch topic (i.e. Makefile,
reference in git.c and builtin/annotate.c all must be modified or
removed at the same time).

Thanks.




      reply	other threads:[~2019-11-04  4:14 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-11-03  3:51 [PATCH 0/5] Teach git annotate to use parse option instead of its own argv Abimbola Olaitan via GitGitGadget
2019-11-03  3:51 ` [PATCH 1/5] remove-annotate: change cmd_annotate to cmd_blame Abimbola via GitGitGadget
2019-11-03 19:59   ` Jakub Narebski
2019-11-04  4:04     ` Junio C Hamano
2019-11-03  3:51 ` [PATCH 2/5] edit the makefile Abimbola via GitGitGadget
2019-11-03  3:51 ` [PATCH 3/5] remove-annotate: comment out annotate BUILDIN_OBJS Abimbola via GitGitGadget
2019-11-03  3:51 ` [PATCH 4/5] remove-annotate: delete builtin annotate file Abimbola via GitGitGadget
2019-11-03  3:51 ` [PATCH 5/5] fix unproper comment in Makefile Abimbola via GitGitGadget
2019-11-04  4:13   ` Junio C Hamano [this message]

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

  List information: http://vger.kernel.org/majordomo-info.html

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

  git send-email \
    --in-reply-to=xmqqtv7kz3aw.fsf@gitster-ct.c.googlers.com \
    --to=gitster@pobox.com \
    --cc=craftwordltd@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitgitgadget@gmail.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.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

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 read-only IMAP folder(s) and NNTP newsgroup(s).