diff mbox series

[v2,2/4] annotate: remove usage of the_repository global

Message ID 2a29d113815015b82d807d94f8d551c3f885cb9c.1727718031.git.gitgitgadget@gmail.com (mailing list archive)
State Superseded
Headers show
Series Remove the_repository global for am, annotate, apply, archive builtins | expand

Commit Message

John Cai Sept. 30, 2024, 5:40 p.m. UTC 
From: John Cai <johncai86@gmail.com>

Remove the the_repository with the repository argument that gets passed
down through the builtin function.

Signed-off-by: John Cai <johncai86@gmail.com>
---
 builtin/annotate.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

Comments

Junio C Hamano Sept. 30, 2024, 7:43 p.m. UTC | #1 
"John Cai via GitGitGadget" <gitgitgadget@gmail.com> writes:

> From: John Cai <johncai86@gmail.com>
>
> Remove the the_repository with the repository argument that gets passed
> down through the builtin function.
>
> Signed-off-by: John Cai <johncai86@gmail.com>
> ---
>  builtin/annotate.c | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/builtin/annotate.c b/builtin/annotate.c
> index a99179fe4dd..ce3dfaafb28 100644
> --- a/builtin/annotate.c
> +++ b/builtin/annotate.c
> @@ -4,7 +4,6 @@
>   * Copyright (C) 2006 Ryan Anderson
>   */
>  
> -#define USE_THE_REPOSITORY_VARIABLE
>  #include "git-compat-util.h"
>  #include "builtin.h"
>  #include "strvec.h"
> @@ -12,7 +11,7 @@
>  int cmd_annotate(int argc,
>  		 const char **argv,
>  		 const char *prefix,
> -		 struct repository *repo UNUSED)
> +		 struct repository *repo)
>  {
>  	struct strvec args = STRVEC_INIT;
>  	int i;
> @@ -23,5 +22,5 @@ int cmd_annotate(int argc,
>  		strvec_push(&args, argv[i]);
>  	}
>  
> -	return cmd_blame(args.nr, args.v, prefix, the_repository);
> +	return cmd_blame(args.nr, args.v, prefix, repo);
>  }

This looks obviously correct.  Nicely done.
diff mbox series

Patch

diff --git a/builtin/annotate.c b/builtin/annotate.c
index a99179fe4dd..ce3dfaafb28 100644
--- a/builtin/annotate.c
+++ b/builtin/annotate.c
@@ -4,7 +4,6 @@ 
  * Copyright (C) 2006 Ryan Anderson
  */
 
-#define USE_THE_REPOSITORY_VARIABLE
 #include "git-compat-util.h"
 #include "builtin.h"
 #include "strvec.h"
@@ -12,7 +11,7 @@ 
 int cmd_annotate(int argc,
 		 const char **argv,
 		 const char *prefix,
-		 struct repository *repo UNUSED)
+		 struct repository *repo)
 {
 	struct strvec args = STRVEC_INIT;
 	int i;
@@ -23,5 +22,5 @@  int cmd_annotate(int argc,
 		strvec_push(&args, argv[i]);
 	}
 
-	return cmd_blame(args.nr, args.v, prefix, the_repository);
+	return cmd_blame(args.nr, args.v, prefix, repo);
 }