[5/5] fix unproper comment in Makefile
diff mbox series

Message ID 58035fc61390d42bc97697de54d44f328f110acd.1572753114.git.gitgitgadget@gmail.com
State New
Headers show
Series
  • Teach git annotate to use parse option instead of its own argv
Related show

Commit Message

Johannes Schindelin via GitGitGadget Nov. 3, 2019, 3:51 a.m. UTC
From: Abimbola <craftwordltd@gmail.com>

Signed-off-by: Abimbola <craftwordltd@gmail.com>
---
 Makefile | 1 -
 1 file changed, 1 deletion(-)

Comments

Junio C Hamano Nov. 4, 2019, 4:13 a.m. UTC | #1
"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.

Patch
diff mbox series

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